Merge pull request #305 from neutrons/reinstate_py27

Reinstate Py2.7 in CI/CD
neutrons · Sep 11, 2020 · f490436 · f490436
2 parents a93ea8c + df3cb61
commit f490436
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,8 @@ cache:
 
 matrix:
   include:
+  - os: linux
+    env: CONDA=2.7
   - os: linux
     env: CONDA=3.6.7
 
@@ -34,14 +36,10 @@ install:
   - conda config --set always_yes yes --set changeps1 no --set anaconda_upload no
   - conda config --add channels conda-forge --add channels marshallmcdonnell --add channels mantid --add channels mantid/label/nightly
 
-    # Install mamba
-  - conda install mamba -c conda-forge
-  - mamba update mamba -c conda-forge
-
 script:
     # TEST: Create test environment
-  - mamba create -q -n addie_test python=$CONDA mantid-workbench>=4.2 --file requirements.txt --file requirements-dev.txt
-  - mamba info --envs
+  - conda create -q -n addie_test python=$CONDA mantid-workbench>=4.2 --file requirements.txt --file requirements-dev.txt
+  - conda info --envs
   - conda activate addie_test
   - python --version
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,3 +4,4 @@ pytest
 pytest-mpl
 pytest-qt
 simplejson
+typing