Merge pull request #73 from brittonsmith/cifix

Update python versions and prevent use of latest matplotlib.
grackle-project · Aug 12, 2020 · ab8e816 · ab8e816
2 parents e5d80cd + b1a9502
commit ab8e816
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,7 +27,8 @@ commands:
             pip install --upgrade wheel
             pip install --upgrade setuptools
             pip install Cython numpy
-            pip install h5py matplotlib fastcache flake8 pytest yt
+            pip install 'matplotlib<3.3.0'
+            pip install h5py fastcache flake8 pytest yt
 
   lint:
     description: "Lint."
@@ -151,13 +152,13 @@ jobs:
 
       - restore_cache:
           name: "Restore dependencies cache."
-          key: dependencies-python-<< parameters.tag >>-v2
+          key: dependencies-python-<< parameters.tag >>-v3
 
       - install-dependencies
 
       - save_cache:
           name: "Save dependencies cache"
-          key: dependencies-python-<< parameters.tag >>-v2
+          key: dependencies-python-<< parameters.tag >>-v3
           paths:
             - ~/.cache/pip
             - ~/venv
@@ -200,16 +201,16 @@ workflows:
    tests:
      jobs:
        - test-suite:
-           name: "Python 3.5 tests"
-           tag: "3.5.9"
+           name: "Python 3.6 tests"
+           tag: "3.6.11"
 
        - test-suite:
            name: "Python 3.8 tests"
-           tag: "3.8.2"
+           tag: "3.8.5"
 
        - docs-build:
            name: "Docs build"
-           tag: "3.8.2"
+           tag: "3.8.5"
 
    weekly:
      triggers:
@@ -220,22 +221,18 @@ workflows:
               only:
                 - master
      jobs:
-       - test-suite:
-           name: "Python 3.5 tests"
-           tag: "3.5.9"
-
        - test-suite:
            name: "Python 3.6 tests"
-           tag: "3.6.10"
+           tag: "3.6.11"
 
        - test-suite:
            name: "Python 3.7 tests"
-           tag: "3.7.7"
+           tag: "3.7.8"
 
        - test-suite:
            name: "Python 3.8 tests"
-           tag: "3.8.2"
+           tag: "3.8.5"
 
        - docs-build:
            name: "Docs build"
-           tag: "3.8.2"
+           tag: "3.8.5"
diff --git a/src/python/setup.py b/src/python/setup.py
@@ -65,5 +65,6 @@ def configuration(parent_package='', top_path=None):
     ],
     cmdclass={'build_ext': build_ext},
     license="BSD 3-clause",
-    ext_modules=cython_extensions
+    ext_modules=cython_extensions,
+    python_requires='>=3.6'
 )