another attempt at a working config for tox/CircleCI/codecov

#53
monocongo · Jan 31, 2020 · 4265ff7 · 4265ff7
1 parent 0b49533
commit 4265ff7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,13 +34,11 @@
 # ------ NON-WORKFLOW VERSION ------
 jobs:
     build:
-        machine:
-            image: ubuntu-1604:201903-01
-#        docker:
-#            # specify the version you desire here
-#            # CircleCI maintains a library of pre-built images
-#            # documented at https://circleci.com/docs/2.0/circleci-images/
-#            - image: circleci/python:3.7
+        docker:
+            # specify the version you desire here
+            # CircleCI maintains a library of pre-built images
+            # documented at https://circleci.com/docs/2.0/circleci-images/
+            - image: circleci/python:3.7
 
         working_directory: ~/repo
 
@@ -75,12 +73,12 @@ jobs:
                 command: |
                     . venv/bin/activate
                     tox
-                    coverage run tests
+#                    coverage run tests
 
             # store artifacts (for example logs, binaries, etc)
             # to be available in the web app or through the API
             - store_artifacts:
                 path: test-reports
 
-            - store_test_results:
-                path: test-results
+#            - store_test_results:
+#                path: test-results
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
-envlist = py36,py37
-;envlist = py36,py37,coverage
+envlist = py37
 
 # Define the minimal tox version required to run; if the host
 # tox is less than this the tool with create an environment and
@@ -23,6 +22,7 @@ deps =
     scikit-image
 commands =
     python setup.py check -m -s
-    py.test tests {posargs}
-    coverage xml -i
+    coverage run -m pytest tests {posargs}
+;    py.test tests {posargs}
+;    coverage xml -i
     codecov