Merge pull request #111 from European-XFEL/dev

Release 0.8.1

.travis.yml

@@ -1,71 +1,100 @@
-dist: xenial
-sudo: required
 language: cpp
 
+stages:
+  - name: basic
+    if: branch != master
+  - name: full linux
+    if: branch = master
+  - name: singularity build push
+    if: branch = master OR tag IS present
+
+env:
+  global:
+    - DISPLAY=":99.0"
+
 services:
   - xvfb
 
-matrix:
+jobs:
+  allow_failures:
+    - stage: singularity build push
   include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-      env: COMPILER=gcc GCC=6
-    - os: linux
-      if: branch = master
+    - stage: basic
+      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="7"
+    - stage: full linux
+      os: linux
+      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="7"
+    - stage: full linux
+      os: linux
+      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="6"
+    - stage: full linux
+      os: linux
+      env: PYTHON_VERSION="3.6.9" COMPILER="gcc" GCCv="7"
+    - stage: full linux
+      os: linux
+      env: PYTHON_VERSION="3.6.9" COMPILER="gcc" GCCv="6"
+    - stage: singularity build push
+      env: PYTHON_VERSION="3.7.5"
+      language: go
+      go: "1.13"
+      git: { submodules: false, depth: 1 }
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env: COMPILER=gcc GCC=7
-
-env:
-  global:
-    - DISPLAY=":99.0"
-    - MINCONDA_VERSION="latest"
-    - MINCONDA_LINUX="Linux-x86_64"
+          packages: [ flawfinder, squashfs-tools, uuid-dev, libuuid1, libffi-dev, libssl-dev, libssl1.0.0, libarchive-dev, libgpgme11-dev, libseccomp-dev ]
+        homebrew: { packages: [ squashfs ], update: true }
+      before_install: skip
+      install:
+        - SINGULARITY_BASE="${GOPATH}/src/github.com/sylabs/singularity"
+        - export PATH="${GOPATH}/bin:${PATH}"
+        - mkdir -p "${GOPATH}/src/github.com/sylabs"
+        - cd "${GOPATH}/src/github.com/sylabs"
+        - git clone -b v3.5.0 https://github.com/sylabs/singularity
+        - cd singularity
+        - ./mconfig -v -p /usr/local
+        - make -j `nproc 2>/dev/null || echo 1` -C ./builddir all
+        - sudo make -C ./builddir install
+      before_script:
+          #  token used for push commnad
+        - echo -e "$SYLABS_TOKEN" > token
+        - singularity remote login --tokenfile ./token || exit 1
+          #  key used for image signing
+          #  for travis ci pgp key block you must replace newline with '\\n', and replace spaces with '\ '
+        - echo -e "$SINGULARITY_KEY" > skey
+        - head -n 4 ./skey
+        - echo $SINGULARITY_KEY_PW | singularity key import ./skey || exit 1
+      script:
+        - cd $TRAVIS_BUILD_DIR
+        - export SINGULARITYENV_PYTHON_VERSION=$PYTHON_VERSION
+        - export SINGULARITYENV_GIT_COMMIT_HASH=$TRAVIS_COMMIT
+        - sudo singularity build ./extra-foam.sif extra-foam.def
+      after_script:
+        - echo $SINGULARITY_KEY_PW | singularity sign ./extra-foam.sif
+        - singularity push ./extra-foam.sif library://robert.rosca/default/extra-foam:$TRAVIS_BRANCH
 
 before_install:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      if [[ "$COMPILER" == "gcc" ]]; then
-        export CXX=g++-$GCC CC=gcc-$GCC;
-      fi
-    fi
-
-install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      MINCONDA_OS=$MINCONDA_LINUX;
-    fi
-  - wget "http://repo.continuum.io/miniconda/Miniconda3-$MINCONDA_VERSION-$MINCONDA_OS.sh" -O miniconda.sh
+  - export GXX="g++-$GCCv" GCC="gcc-$GCCv"
+  - sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+  - sudo apt-get -q update
+  - sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install libxkbcommon-x11-0 $GXX
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/$GXX 0
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/$GCC 0
+  - g++ --version
+  - gcc --version
+  - wget "http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh" -O miniconda.sh
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
+install:
+  - conda install -y python=$PYTHON_VERSION
+  - echo $PYTHON_VERSION
   - conda install -y cmake -c conda-forge
-  - which python
-  - python --version
-  - which pip
-  - pip --version
-  # QT_DEBUG_PLUGINS
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      sudo apt install -y libxkbcommon-x11-0;
-      pip install -e .[test];
-    fi
-
+  - pip install -e .[test]
 before_script:
   - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1400x900x24
   - sleep 3
-
 script:
   # test parallel version
   - python setup.py build_ext --with-tests
   - python setup.py test -v
-  - python setup.py benchmark -v
 
   # test series version
   - export FOAM_WITH_TBB=0
@@ -74,4 +103,3 @@ script:
   - export XTENSOR_WITH_XSIMD=0
   - python setup.py build_ext --with-tests
   - python setup.py test -v
-  - python setup.py benchmark -v

README.md

@@ -4,9 +4,9 @@ EXtra-foam
 [![Build Status](https://travis-ci.org/European-XFEL/EXtra-foam.svg?branch=master)](https://travis-ci.org/European-XFEL/EXtra-foam)
 
 
-*EXtra-foam* (previously known as *[karaboFAI](https://in.xfel.eu/readthedocs/docs/karabofai/en/latest/)*) is an application  that provides 
-super fast on-line (real-time) and off-line data analysis and visualization for experiments at European XFEL that using 2D 
-detectors, namely AGIPD, DSSC, LPD, FastCCD, JungFrau, etc., together with other 1D detectors (e.g.
-XGM, digitizer, etc.) and various control data.
+*EXtra-foam* (previously known as *[karaboFAI](https://in.xfel.eu/readthedocs/docs/karabofai/en/latest/)*) is a 
+framework that provides super fast on-line (real-time) and off-line data analysis and visualization for 
+experiments at European XFEL that using 2D detectors (e.g. AGIPD, DSSC, LPD, ePix100, FastCCD, JungFrau, 
+etc.), together with other 1D detectors (e.g. XGM, digitizer, etc.) and various control data.
 
 [Documentation](https://extra-foam.readthedocs.io/en/latest/)