#23 - Enforce psutil min requirement (#29)

#23 - Enforce psutil min requirement. Additional pipeline for testing against pytest 6+
CFMTech · Nov 20, 2020 · 99cdbe1 · 99cdbe1
1 parent 9c0919f
commit 99cdbe1
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ shared: &shared
             command: |
                 conda create -n ci ${CI_PYTHON} -c https://conda.anaconda.org/conda-forge -c defaults -c anaconda -y
                 conda install -n ci ${CI_PYTEST} -c https://conda.anaconda.org/conda-forge -c defaults -c anaconda -y
-                conda install -n ci wheel psutil memory_profiler -c https://conda.anaconda.org/conda-forge -c defaults -c anaconda -y
+                conda install -n ci --file requirements.txt -c https://conda.anaconda.org/conda-forge -c defaults -c anaconda -y
                 conda init bash
         - run:
             name: "Prepare Project"
@@ -69,6 +69,14 @@ workflows:
                   filters:
                       tags:
                           only: /.*/
+            - pytestmonitor-py36-pytest60:
+                  filters:
+                      tags:
+                          only: /.*/
+            - pytestmonitor-py36-pytest61:
+                  filters:
+                      tags:
+                          only: /.*/
             - pytestmonitor-py37-pytest44:
                 filters:
                     tags:
@@ -101,6 +109,14 @@ workflows:
                   filters:
                       tags:
                           only: /.*/
+            - pytestmonitor-py37-pytest60:
+                  filters:
+                      tags:
+                          only: /.*/
+            - pytestmonitor-py37-pytest61:
+                  filters:
+                      tags:
+                          only: /.*/
             - pytestmonitor-py38-pytest46:
                 filters:
                     tags:
@@ -117,6 +133,14 @@ workflows:
                   filters:
                       tags:
                           only: /.*/
+            - pytestmonitor-py38-pytest60:
+                  filters:
+                      tags:
+                          only: /.*/
+            - pytestmonitor-py38-pytest61:
+                  filters:
+                      tags:
+                          only: /.*/
             - deploy:
                 requires:
                     - pytestmonitor-py36-pytest44
@@ -127,6 +151,8 @@ workflows:
                     - pytestmonitor-py36-pytest52
                     - pytestmonitor-py36-pytest53
                     - pytestmonitor-py36-pytest54
+                    - pytestmonitor-py36-pytest60
+                    - pytestmonitor-py36-pytest61
                     - pytestmonitor-py37-pytest44
                     - pytestmonitor-py37-pytest45
                     - pytestmonitor-py37-pytest46
@@ -135,10 +161,14 @@ workflows:
                     - pytestmonitor-py37-pytest52
                     - pytestmonitor-py37-pytest53
                     - pytestmonitor-py37-pytest54
+                    - pytestmonitor-py37-pytest60
+                    - pytestmonitor-py37-pytest61
                     - pytestmonitor-py38-pytest46
                     - pytestmonitor-py38-pytest52
                     - pytestmonitor-py38-pytest53
                     - pytestmonitor-py38-pytest54
+                    - pytestmonitor-py38-pytest60
+                    - pytestmonitor-py38-pytest61
                 filters:
                     tags:
                         only: /^[a-zA-Z].*/
@@ -197,6 +227,16 @@ jobs:
             CI_PYTHON: 'python=3.6'
             CI_PYTEST: 'pytest=5.4'
         <<: *shared
+    pytestmonitor-py36-pytest60:
+        environment:
+            CI_PYTHON: 'python=3.6'
+            CI_PYTEST: 'pytest=6.0'
+        <<: *shared
+    pytestmonitor-py36-pytest61:
+        environment:
+            CI_PYTHON: 'python=3.6'
+            CI_PYTEST: 'pytest=6.1'
+        <<: *shared
     pytestmonitor-py37-pytest44:
         environment:
             CI_PYTHON: 'python=3.7'
@@ -237,6 +277,16 @@ jobs:
             CI_PYTHON: 'python=3.7'
             CI_PYTEST: 'pytest=5.4'
         <<: *shared
+    pytestmonitor-py37-pytest60:
+        environment:
+            CI_PYTHON: 'python=3.7'
+            CI_PYTEST: 'pytest=6.0'
+        <<: *shared
+    pytestmonitor-py37-pytest61:
+        environment:
+            CI_PYTHON: 'python=3.7'
+            CI_PYTEST: 'pytest=6.1'
+        <<: *shared
     pytestmonitor-py38-pytest46:
         environment:
             CI_PYTHON: 'python=3.8'
@@ -257,6 +307,16 @@ jobs:
             CI_PYTHON: 'python=3.8'
             CI_PYTEST: 'pytest=5.4'
         <<: *shared
+    pytestmonitor-py38-pytest60:
+        environment:
+            CI_PYTHON: 'python=3.8'
+            CI_PYTEST: 'pytest=6.0'
+        <<: *shared
+    pytestmonitor-py38-pytest61:
+        environment:
+            CI_PYTHON: 'python=3.8'
+            CI_PYTEST: 'pytest=6.1'
+        <<: *shared
     nightly_build:
         environment:
             CI_PYTHON: 'python'

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-psutil
+psutil >= 5.1.0
 memory_profiler >= 0.58
 pytest
 requests