From b7f08b9632f80bf7b80f413885d0883528aaf5d3 Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 10:24:05 -0500 Subject: [PATCH 01/20] updated requirements.txt based on a fresh conda environment that successfully runs tox for Python 3.6 and 3.7 #53 --- requirements.txt | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index ae0fc7c..f3b1331 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,30 +1,37 @@ absl-py==0.9.0 -astor==0.7.1 +astor==0.8.1 attrs==19.2.0 backcall==0.1.0 bleach==3.1.0 boto3==1.11.9 botocore==1.14.9 +cachetools==4.0.0 certifi==2019.11.28 chardet==3.0.4 contextlib2==0.6.0 -cvdata==0.0.6 +-e git+https://github.com/monocongo/cvdata@cb95eefbe926ee0bfdcff244e110c01134d33d5a#egg=cvdata cycler==0.10.0 Cython==0.29.13 decorator==4.4.0 defusedxml==0.6.0 docutils==0.15.2 entrypoints==0.3 +filelock==3.0.10 gast==0.2.2 +google-auth==1.11.0 +google-auth-oauthlib==0.4.1 google-pasta==0.1.7 -grpcio==1.23.0 +grpcio==1.26.0 h5py==2.10.0 idna==2.8 ImageHash==4.0 +importlib-metadata==0.23 +inflect==4.0.0 ipykernel==5.1.2 ipython==7.8.0 ipython-genutils==0.2.0 ipywidgets==7.5.1 +jaraco.itertools==5.0.0 jedi==0.15.1 jmespath==0.9.4 jsonschema==3.0.2 @@ -40,22 +47,29 @@ Markdown==3.1.1 MarkupSafe==1.1.1 matplotlib==3.1.1 mistune==0.8.4 +more-itertools==8.1.0 nbconvert==5.6.0 nbformat==4.4.0 notebook==6.0.1 numpy==1.17.2 +oauthlib==3.1.0 opencv-python==4.1.2.30 opt-einsum==3.1.0 -pandas==1.0.0rc0 +packaging==20.1 +pandas==0.25.3 pandocfilters==1.4.2 parso==0.5.1 pexpect==4.7.0 pickleshare==0.7.5 Pillow==6.2.0 +pluggy==0.12.0 prometheus-client==0.7.1 prompt-toolkit==2.0.10 protobuf==3.10.0 ptyprocess==0.6.0 +py==1.8.1 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 Pygments==2.4.2 pyparsing==2.4.2 pyrsistent==0.15.4 @@ -65,23 +79,28 @@ PyWavelets==1.1.1 pyzmq==18.1.0 qtconsole==4.5.5 requests==2.22.0 +requests-oauthlib==1.3.0 +rsa==4.0 s3transfer==0.3.2 scipy==1.4.1 Send2Trash==1.5.0 six==1.12.0 -tensorboard==2.0.0 -tensorflow==2.0.0 +tensorboard==2.1.0 +tensorflow==2.1.0 tensorflow-cpu==1.15.0rc2 -tensorflow-estimator==2.0.0 +tensorflow-estimator==2.1.0 termcolor==1.1.0 terminado==0.8.2 testpath==0.4.2 +toml==0.10.0 tornado==6.0.3 tqdm==4.42.0 traitlets==4.3.3 urllib3==1.25.8 +virtualenv==16.7.5 wcwidth==0.1.7 webencodings==0.5.1 Werkzeug==0.16.0 widgetsnbextension==3.5.1 wrapt==1.11.2 +zipp==2.1.0 From c5176f1e252e1a92ce81a3e993045587ee39306f Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 10:24:58 -0500 Subject: [PATCH 02/20] initial (boilerplate) CircleCI config file #53 --- .circleci/config.yml | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..4ceed0f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,55 @@ +# Python CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-python/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` + - image: circleci/python:3.6.1 + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/postgres:9.4 + + working_directory: ~/repo + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "requirements.txt" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: + name: install dependencies + command: | + python3 -m venv venv + . venv/bin/activate + pip install -r requirements.txt + + - save_cache: + paths: + - ./venv + key: v1-dependencies-{{ checksum "requirements.txt" }} + + # run tests! + # this example uses Django's built-in test-runner + # other common Python testing frameworks include pytest and nose + # https://pytest.org + # https://nose.readthedocs.io + - run: + name: run tests + command: | + . venv/bin/activate + python manage.py test + + - store_artifacts: + path: test-reports + destination: test-reports From a8e75dea0b721fc9db5ff284a1e130b2d39d8160 Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 10:36:48 -0500 Subject: [PATCH 03/20] updated the CircleCI config file to instal lthe project code as an editable package, install tox, and run tox for tests #53 --- .circleci/config.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ceed0f..9ffda44 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,13 +7,9 @@ jobs: build: docker: # specify the version you desire here - # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` - - image: circleci/python:3.6.1 - - # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - # - image: circleci/postgres:9.4 + - image: circleci/python:3.6.1 working_directory: ~/repo @@ -32,7 +28,8 @@ jobs: command: | python3 -m venv venv . venv/bin/activate - pip install -r requirements.txt + pip install -e . + pip install tox - save_cache: paths: @@ -48,7 +45,7 @@ jobs: name: run tests command: | . venv/bin/activate - python manage.py test + tox - store_artifacts: path: test-reports From 6ced28c2d7410500dc56ea63b7c9470e24ec5a1e Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 10:43:32 -0500 Subject: [PATCH 04/20] updated the CircleCI config file to use Python version 3.7 #53 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ffda44..86e38d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: # 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.6.1 + - image: circleci/python:3.7 working_directory: ~/repo From 08659825c8f3f9ae1117c8fddc6e8c72c1e962aa Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 10:50:58 -0500 Subject: [PATCH 05/20] updated the CircleCI config file to use conda for virtual environment #53 --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86e38d6..86d1743 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,8 +26,9 @@ jobs: - run: name: install dependencies command: | - python3 -m venv venv - . venv/bin/activate +# python3 -m venv venv +# . venv/bin/activate + conda activate pip install -e . pip install tox From 649ead3489670f25a0eefe67969b01785c492229 Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 11:05:12 -0500 Subject: [PATCH 06/20] updated the CircleCI config file to use Python version 3, in case this will help get both the 3.6 and 3.7 environments to pass with tox #53 --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86d1743..f350865 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: # 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 + - image: circleci/python:3 working_directory: ~/repo @@ -26,9 +26,8 @@ jobs: - run: name: install dependencies command: | -# python3 -m venv venv -# . venv/bin/activate - conda activate + python3 -m venv venv + . venv/bin/activate pip install -e . pip install tox From f247ee008735001f45ff4b754a49417040732521 Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 13:48:37 -0500 Subject: [PATCH 07/20] updated the CircleCI config file to try a different approach for tox #53 --- .circleci/config.yml | 116 ++++++++++++++++++++++++++----------------- 1 file changed, 70 insertions(+), 46 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f350865..5f71106 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,49 +4,73 @@ # version: 2 jobs: - build: - 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 - - working_directory: ~/repo - - steps: - - checkout - - # Download and cache dependencies - - restore_cache: - keys: - - v1-dependencies-{{ checksum "requirements.txt" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- - - - run: - name: install dependencies - command: | - python3 -m venv venv - . venv/bin/activate - pip install -e . - pip install tox - - - save_cache: - paths: - - ./venv - key: v1-dependencies-{{ checksum "requirements.txt" }} - - # run tests! - # this example uses Django's built-in test-runner - # other common Python testing frameworks include pytest and nose - # https://pytest.org - # https://nose.readthedocs.io - - run: - name: run tests - command: | - . venv/bin/activate - tox - - - store_artifacts: - path: test-reports - destination: test-reports + + # using tox + toxify: + + docker: + - image: python:3.7 + + steps: + + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "requirements.txt" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: pip install tox && tox + +workflows: + version: 2 + + myproj: + jobs: + - toxify + +#jobs: +# build: +# 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 +# +# steps: +# - checkout +# +# # Download and cache dependencies +# - restore_cache: +# keys: +# - v1-dependencies-{{ checksum "requirements.txt" }} +# # fallback to using the latest cache if no exact match is found +# - v1-dependencies- +# +# - run: +# name: install dependencies +# command: | +# python3 -m venv venv +# . venv/bin/activate +# pip install -e . +# pip install tox +# +# - save_cache: +# paths: +# - ./venv +# key: v1-dependencies-{{ checksum "requirements.txt" }} +# +# # run tests with tox +# - run: +# name: run tests +# command: | +# . venv/bin/activate +# tox +# +# - store_artifacts: +# path: test-reports +# destination: test-reports From 2fc477b9e83a3d73da480d162b3ad8f055791bdb Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 29 Jan 2020 14:03:25 -0500 Subject: [PATCH 08/20] minor edits for formatting etc. #53 --- .circleci/config.yml | 36 +++++++++++++++++------------------- tox.ini | 3 ++- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f71106..b518487 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,31 +5,29 @@ version: 2 jobs: - # using tox - toxify: + # using tox + toxify: - docker: - - image: python:3.7 + docker: + - image: circleci/python:3.7 - steps: + steps: + - checkout + # download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "requirements.txt" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- - - checkout - - # Download and cache dependencies - - restore_cache: - keys: - - v1-dependencies-{{ checksum "requirements.txt" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- - - - run: pip install tox && tox + - run: pip install tox && tox workflows: - version: 2 + version: 2 - myproj: - jobs: - - toxify + cvdata: + jobs: + - toxify #jobs: # build: diff --git a/tox.ini b/tox.ini index 7776e89..287bfae 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{36,37,},coverage +envlist = py36,py37,coverage # Define the minimal tox version required to run; if the host # tox is less than this the tool with create an environment and @@ -21,4 +21,5 @@ deps = commands = python setup.py check -m -s py.test tests {posargs} + coverage From fdc3bcfbc4dcb4a020e105f2bdeae14e2c7cbc80 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 30 Jan 2020 09:01:58 -0500 Subject: [PATCH 09/20] updated the formatting of the CircleCI config file; added codecov to the tox configuration #53 --- .circleci/config.yml | 111 ++++++++++++++++++++++--------------------- tox.ini | 5 +- 2 files changed, 60 insertions(+), 56 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b518487..7069028 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,73 +2,76 @@ # # Check https://circleci.com/docs/2.0/language-python/ for more details # -version: 2 -jobs: - # using tox - toxify: +# ------ WORKFLOW VERSION ------ +#version: 2 +#jobs: +# +# # using tox +# toxify: +# +# docker: +# - image: circleci/python:3.7 +# +# steps: +# - checkout +# # download and cache dependencies +# - restore_cache: +# keys: +# - v1-dependencies-{{ checksum "requirements.txt" }} +# # fallback to using the latest cache if no exact match is found +# - v1-dependencies- +# +# - run: pip install tox && tox +# +#workflows: +# version: 2 +# +# cvdata: +# jobs: +# - toxify +# ------ NON-WORKFLOW VERSION ------ +jobs: + build: 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 + steps: - checkout - # download and cache dependencies + + # Download and cache dependencies - restore_cache: keys: - v1-dependencies-{{ checksum "requirements.txt" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- - - run: pip install tox && tox + - run: + name: install dependencies + command: | + python3 -m venv venv + . venv/bin/activate + # pip install -e . + pip install tox -workflows: - version: 2 + - save_cache: + paths: + - ./venv + key: v1-dependencies-{{ checksum "requirements.txt" }} - cvdata: - jobs: - - toxify + # run tests with tox + - run: + name: run tests + command: | + . venv/bin/activate + tox -#jobs: -# build: -# 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 -# -# steps: -# - checkout -# -# # Download and cache dependencies -# - restore_cache: -# keys: -# - v1-dependencies-{{ checksum "requirements.txt" }} -# # fallback to using the latest cache if no exact match is found -# - v1-dependencies- -# -# - run: -# name: install dependencies -# command: | -# python3 -m venv venv -# . venv/bin/activate -# pip install -e . -# pip install tox -# -# - save_cache: -# paths: -# - ./venv -# key: v1-dependencies-{{ checksum "requirements.txt" }} -# -# # run tests with tox -# - run: -# name: run tests -# command: | -# . venv/bin/activate -# tox -# -# - store_artifacts: -# path: test-reports -# destination: test-reports + - store_artifacts: + path: test-reports + destination: test-reports diff --git a/tox.ini b/tox.ini index 287bfae..2c52966 100644 --- a/tox.ini +++ b/tox.ini @@ -13,13 +13,14 @@ minversion = 3.3.0 isolated_build = true [testenv] +passenv = CI CIRCLECI CIRCLECI_* deps = - coverage + codecov opencv-python pytest scikit-image commands = python setup.py check -m -s py.test tests {posargs} - coverage + codecov From 4c51fbaf686ce92fdc3bc043da3cb67985c55e2c Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 30 Jan 2020 09:09:06 -0500 Subject: [PATCH 10/20] updated the CircleCI config to fix a formatting error #53 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7069028..2474763 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,8 +69,8 @@ jobs: - run: name: run tests command: | - . venv/bin/activate - tox + . venv/bin/activate + tox - store_artifacts: path: test-reports From 137a986b5527b023e166449782df1040c082c2b8 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 30 Jan 2020 09:13:07 -0500 Subject: [PATCH 11/20] fixed tox.ini to use correct CircleCI variables #53 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 2c52966..eaedeb8 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ minversion = 3.3.0 isolated_build = true [testenv] -passenv = CI CIRCLECI CIRCLECI_* +passenv = CI CIRCLECI CIRCLE_* deps = codecov opencv-python From af2f7139d7101a9f59f642ea06d610da2b047e07 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 30 Jan 2020 09:14:31 -0500 Subject: [PATCH 12/20] updated the tox config file to remove Python 3.6 environment and coverage #354 --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index eaedeb8..cc3903b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] -envlist = py36,py37,coverage +envlist = py37 +;envlist = py36,py37,coverage # Define the minimal tox version required to run; if the host # tox is less than this the tool with create an environment and @@ -23,4 +24,3 @@ commands = python setup.py check -m -s py.test tests {posargs} codecov - From 6436db3513560fa284dfbbb39091e5fe2dab6e7d Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 30 Jan 2020 09:25:25 -0500 Subject: [PATCH 13/20] updated the CircleCI config file to have a store test results step #53 --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2474763..b0b5732 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,6 +72,10 @@ jobs: . venv/bin/activate tox + # store artifacts (for example logs, binaries, etc) + # to be available in the web app or through the API - store_artifacts: path: test-reports - destination: test-reports + + - store_test_results: + path: test-results From 5849ef8521c3c3a67270efebaafc839b243fedd1 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 30 Jan 2020 09:29:32 -0500 Subject: [PATCH 14/20] updated the CircleCI config file to install the package #53 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0b5732..3bb3f93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,7 @@ jobs: command: | python3 -m venv venv . venv/bin/activate - # pip install -e . + pip install -e . pip install tox - save_cache: From 29a5aa41d783bbdbac2b15dd6f511aed06951d96 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 30 Jan 2020 18:12:10 -0500 Subject: [PATCH 15/20] updated the CircleCI and tox config files for coverage/codecov #53 --- .circleci/config.yml | 3 +++ tox.ini | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bb3f93..5ac321d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,6 +58,8 @@ jobs: python3 -m venv venv . venv/bin/activate pip install -e . + pip install codecov + pip install coverage pip install tox - save_cache: @@ -71,6 +73,7 @@ jobs: command: | . venv/bin/activate tox + coverage run tests # store artifacts (for example logs, binaries, etc) # to be available in the web app or through the API diff --git a/tox.ini b/tox.ini index cc3903b..3e40011 100644 --- a/tox.ini +++ b/tox.ini @@ -14,13 +14,15 @@ minversion = 3.3.0 isolated_build = true [testenv] -passenv = CI CIRCLECI CIRCLE_* +passenv = CI CIRCLECI CIRCLE_* CODECOV_TOKEN deps = codecov + coverage opencv-python pytest scikit-image commands = python setup.py check -m -s py.test tests {posargs} + coverage xml -i codecov From 5b4b7bd8a58c7cdb4a963b6d8e215a5d481228cc Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 31 Jan 2020 10:12:08 -0500 Subject: [PATCH 16/20] updated the CircleCI and tox config files to see if it fixes the multiple Python versions issue #53 --- .circleci/config.yml | 3 ++- tox.ini | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ac321d..53432b2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,8 @@ jobs: # 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 + - image: circleci/python:3-stretch + # - image: circleci/python:3.7 working_directory: ~/repo diff --git a/tox.ini b/tox.ini index 3e40011..78eb59c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37 +envlist = py36,py37 ;envlist = py36,py37,coverage # Define the minimal tox version required to run; if the host From 359cfb8ede5dec0a930eac20d8a847959b0c1a5d Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 31 Jan 2020 11:05:13 -0500 Subject: [PATCH 17/20] updated the CircleCI config file to use machine instead of Docker #53 --- .circleci/config.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53432b2..9b100b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,12 +34,13 @@ # ------ NON-WORKFLOW VERSION ------ jobs: build: - 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-stretch - # - image: circleci/python:3.7 + 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 working_directory: ~/repo From 0b49533b64c57fba75adc2802fef9d4dcbcbe2e2 Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 31 Jan 2020 11:06:47 -0500 Subject: [PATCH 18/20] removed a dash that is probably causing a parsing error #53 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b100b4..816c37f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,7 @@ jobs: build: machine: - - image: ubuntu-1604:201903-01 + image: ubuntu-1604:201903-01 # docker: # # specify the version you desire here # # CircleCI maintains a library of pre-built images From 4265ff74e70b9d3eb3e36ad49dfe6614cf910df5 Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 31 Jan 2020 11:55:15 -0500 Subject: [PATCH 19/20] another attempt at a working config for tox/CircleCI/codecov #53 --- .circleci/config.yml | 18 ++++++++---------- tox.ini | 8 ++++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 816c37f..a86532d 100644 --- 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 index 78eb59c..8bced78 100644 --- 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 From b64dadd6e7f083dda993fa6815481cff7eab1471 Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 31 Jan 2020 12:13:54 -0500 Subject: [PATCH 20/20] removed commented-out lines from the (now working) tox and CircleCI config files #53 --- .circleci/config.yml | 34 ---------------------------------- tox.ini | 2 -- 2 files changed, 36 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a86532d..dcc52b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,36 +2,6 @@ # # Check https://circleci.com/docs/2.0/language-python/ for more details # - -# ------ WORKFLOW VERSION ------ -#version: 2 -#jobs: -# -# # using tox -# toxify: -# -# docker: -# - image: circleci/python:3.7 -# -# steps: -# - checkout -# # download and cache dependencies -# - restore_cache: -# keys: -# - v1-dependencies-{{ checksum "requirements.txt" }} -# # fallback to using the latest cache if no exact match is found -# - v1-dependencies- -# -# - run: pip install tox && tox -# -#workflows: -# version: 2 -# -# cvdata: -# jobs: -# - toxify - -# ------ NON-WORKFLOW VERSION ------ jobs: build: docker: @@ -73,12 +43,8 @@ jobs: command: | . venv/bin/activate tox -# 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 diff --git a/tox.ini b/tox.ini index 8bced78..a16b831 100644 --- a/tox.ini +++ b/tox.ini @@ -23,6 +23,4 @@ deps = commands = python setup.py check -m -s coverage run -m pytest tests {posargs} -; py.test tests {posargs} -; coverage xml -i codecov