Merge pull request #140 from ZLLentz/rel-3.3.5

ENH: pcds-3.3.5 and CI cleanup

.travis.yml

@@ -10,107 +10,220 @@ addons:
       - herbstluftwm
       - libxkbcommon-x11-0
 
-matrix:
+jobs:
   fast_finish: true
-  include:
-    - name: Latest Env
-      env:
-      - VARIANT=yaml
-      - PY_VER=3.6
-    - name: py3.6 Newest Tags
-      env:
-      - VARIANT=tag
-      - PY_VER=3.6
-    - name: py3.6 Master Branch
-      env:
-      - VARIANT=dev
-      - PY_VER=3.6
-    - name: py3.7 Newest Tags
-      env:
-      - VARIANT=tag
-      - PY_VER=3.7
-    - name: py3.7 Master Branch
-      env:
-      - VARIANT=dev
-      - PY_VER=3.7
-    - name: py3.8 Newest Tags
-      env:
-      - VARIANT=tag
-      - PY_VER=3.8
-    - name: py3.8 Master Branch
-      env:
-      - VARIANT=dev
-      - PY_VER=3.8
+
   allow_failures:
-    - name: py3.6 Newest Tags
-      env:
-      - VARIANT=tag
-      - PY_VER=3.6
-    - name: py3.6 Master Branch
-      env:
-      - VARIANT=dev
-      - PY_VER=3.6
-    - name: py3.7 Newest Tags
-      env:
-      - VARIANT=tag
-      - PY_VER=3.7
-    - name: py3.7 Master Branch
-      env:
-      - VARIANT=dev
-      - PY_VER=3.7
-    - name: py3.8 Newest Tags
-      env:
-      - VARIANT=tag
-      - PY_VER=3.8
-    - name: py3.8 Master Branch
-      env:
-      - VARIANT=dev
-      - PY_VER=3.8
-
-install:
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - source "$HOME/miniconda/etc/profile.d/conda.sh"
-  - conda activate
-  - hash -r
-  # Use our condarc
-  - cp condarc ~/.condarc
-  - conda config --set always_yes yes --set changeps1 no
-  - conda install conda-build anaconda-client packaging
-  # Reboot conda after updating conda to avoid subtle path bugs
-  - conda deactivate
-  - conda activate
-  # Useful for debugging any issues with conda
-  - conda info -a
-  - |
-    if [ "$VARIANT" = "yaml" ]; then
-      # Create the environment from yaml
-      conda env create -q -n pcds-test -f envs/pcds/env.yaml
-    else
-      if [ "$VARIANT" = "dev" ]; then
-        # Add the dev channel to be first channel
-        conda config --add channels pcds-dev
-      fi
-      pushd scripts
-      python update_tags.py pcds
-      timeout 10m ./create_base_env.sh test pcds "$PY_VER"
-      popd
-    fi
-  - conda activate pcds-test
-  # Check out the tests for all of our packages
-  - |
-    if [ "$VARIANT" = "dev" ]; then
-      python scripts/test_setup.py pcds
-    else
-      python scripts/test_setup.py pcds --tag
-    fi
-  # Show us which test scripts exist
-  - readlink -f */run_tests.py
+    - name: "Python 3.6 Next Env"
+    - name: "Python 3.6 Dev Env"
+    - name: "Python 3.7 Next Env"
+    - name: "Python 3.8 Next Env"
+    - name: "Python 3.6 Next Env Unit Tests"
+    - name: "Python 3.6 Master Branch Unit Tests"
+    - name: "Python 3.7 Next Env Unit Tests"
+    - name: "Python 3.8 Next Env Unit Tests"
+
+  include:
+    - stage: "Main Build"
+      name: "Create Base Env from YAML"
+      workspaces:
+        create:
+          name: conda_base
+          paths:
+            - miniconda
+      install:
+        - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+        - bash miniconda.sh -b -p miniconda
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate
+        - hash -r
+        # Use our condarc
+        - cp condarc miniconda/.condarc
+        - conda config --set always_yes yes --set changeps1 no
+        - conda install conda-build anaconda-client packaging
+        # Reboot conda after updating conda to avoid subtle path bugs
+        - conda deactivate
+        - conda activate
+        # Useful for debugging any issues with conda
+        - conda info -a
+        - which python
+      script:
+        # Always create the environment from yaml
+        - conda env create -q -n pcds-test -f envs/pcds/env.yaml
+
+    - stage: "Main Test"
+      name: "Current Env Unit Tests"
+      workspaces:
+        use:
+        - conda_base
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate pcds-test
+        - conda info -a
+        - which python
+        - cd scripts
+        - python test_setup.py pcds --tag
+      before_script:
+        # Run windows manager
+        - "herbstluftwm &"
+        - sleep 1
+      script:
+        - ./run_all_tests.sh pcds
+
+    - stage: "Extra Builds"
+      name: "Python 3.6 Next Env"
+      workspaces:
+        use: conda_base
+        create:
+          name: py36
+          paths:
+            - miniconda
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate
+        - python scripts/update_tags.py pcds --debug
+        - conda info -a
+        - which python
+      script:
+        - pushd scripts
+        - timeout 10m ./update_env.sh pcds-test pcds 3.6 && popd
+        - pwd
+
+    - stage: "Extra Builds"
+      name: "Python 3.6 Dev Env"
+      workspaces:
+        use: conda_base
+        create:
+          name: py36-dev
+          paths:
+            - miniconda
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate
+        - conda config --add channels pcds-dev
+        - python scripts/update_tags.py pcds --debug
+        - conda info -a
+        - which python
+      script:
+        - pushd scripts
+        - timeout 10m ./update_env.sh pcds-test pcds 3.6 && popd
+        - pwd
+
+    - stage: "Extra Builds"
+      name: "Python 3.7 Next Env"
+      workspaces:
+        use: conda_base
+        create:
+          name: py37
+          paths:
+            - miniconda
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate
+        - python scripts/update_tags.py pcds --debug
+        - conda info -a
+        - which python
+      script:
+        - pushd scripts
+        - timeout 10m ./update_env.sh pcds-test pcds 3.7 && popd
+        - pwd
+
+    - stage: "Extra Builds"
+      name: "Python 3.8 Next Env"
+      workspaces:
+        use: conda_base
+        create:
+          name: py38
+          paths:
+            - miniconda
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate
+        - python scripts/update_tags.py pcds --debug
+        - conda info -a
+        - which python
+      script:
+        - pushd scripts
+        - timeout 10m ./update_env.sh pcds-test pcds 3.8 && popd
+        - pwd
+
+    - stage: "Extra Tests"
+      name: "Python 3.6 Next Env Unit Tests"
+      workspaces:
+        use:
+        - py36
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate pcds-test
+        - conda info -a
+        - which python
+        - cd scripts
+        - python test_setup.py pcds --tag
+      before_script:
+        # Run windows manager
+        - "herbstluftwm &"
+        - sleep 1
+      script:
+        - ./run_all_tests.sh pcds
+
+    - stage: "Extra Tests"
+      name: "Python 3.6 Master Branch Unit Tests"
+      workspaces:
+        use:
+        - py36-dev
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate pcds-test
+        - conda info -a
+        - which python
+        - cd scripts
+        - python test_setup.py pcds
+        - |
+          for repo in *
+          do
+            export PYTHONPATH="$PYTHONPATH:$(readlink -f $repo)"
+          done
+      before_script:
+        # Run windows manager
+        - "herbstluftwm &"
+        - sleep 1
+      script:
+        - ./run_all_tests.sh pcds
 
-before_script:
-  # Run windows manager
-  - "herbstluftwm &"
-  - sleep 1
+    - stage: "Extra Tests"
+      name: "Python 3.7 Next Env Unit Tests"
+      workspaces:
+        use:
+        - py37
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate pcds-test
+        - conda info -a
+        - which python
+        - cd scripts
+        - python test_setup.py pcds --tag
+      before_script:
+        # Run windows manager
+        - "herbstluftwm &"
+        - sleep 1
+      script:
+        - ./run_all_tests.sh pcds
 
-script:
-  - scripts/run_all_tests.sh pcds
+    - stage: "Extra Tests"
+      name: "Python 3.8 Next Env Unit Tests"
+      workspaces:
+        use:
+        - py38
+      install:
+        - source miniconda/etc/profile.d/conda.sh
+        - conda activate pcds-test
+        - conda info -a
+        - which python
+        - cd scripts
+        - python test_setup.py pcds --tag
+      before_script:
+        # Run windows manager
+        - "herbstluftwm &"
+        - sleep 1
+      script:
+        - ./run_all_tests.sh pcds

envs/pcds/conda-packages.txt

@@ -1,5 +1,5 @@
 anaconda-client
-bluesky=1.6.1
+bluesky>=1.6.6
 bokeh>=1.0.1
 caproto>=0.6.0
 coloredlogs
@@ -14,37 +14,37 @@ elog>=0.1.2
 epicscorelibs=7.0.3.99.1.0
 flake8
 h5py
-happi>=1.7.1
+happi>=1.7.2
 holoviews>=1.10.9
-hutch-python>=1.4.0
+hutch-python>=1.5.0
 hxrsnd>=0.1.7
 ipython>=7.1
 jupyter
 lightpath>=0.6.5
 line_profiler
-lucid>=0.7.0
+lucid>=0.7.1
 lxml
 mysqlclient
 numpy>=1.14
 opencv
-ophyd>=1.5.2
+ophyd>=1.5.3
 pandas
 panel
 papermill
 pcaspy
-pcdsdaq>=2.2.6
-pcdsdevices>=2.10.0
-pcdsutils>=0.3.0
-pcdswidgets>=0.4.1
+pcdsdaq>=2.2.7
+pcdsdevices>=2.11.0
+pcdsutils>=0.3.1
+pcdswidgets>=0.4.2
 periodictable
 pmgr>=1.1.2
 pre-commit
 psdm_qs_cli>=0.3.1
 pswalker>=1.0.5
 pyaudio
 pyca>=3.1.1
-pydm>=1.10.3
-pyepics>=3.4.2
+pydm>=1.10.4
+pyepics>=3.4.3
 pyfiglet
 pymongo
 pytables
@@ -53,7 +53,7 @@ pytest-benchmark
 pytest-qt
 pytest-timeout
 python-graphviz
-pytmc>=2.7.1
+pytmc>=2.7.5
 qdarkstyle
 scikit-image
 scikit-learn
@@ -63,7 +63,6 @@ simplejson
 sphinx
 sphinx_rtd_theme
 timechart>=1.2.3
-tornado<5.0.0
 transfocate>=0.3.3
 typhos>=1.1.1
 versioneer