From d8542feca53fbbf0e1f95073be68350e89101d15 Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Sun, 1 Apr 2018 16:13:34 +0200 Subject: [PATCH 1/7] First try at codecov --- .coveragerc | 3 +++ appveyor.yml | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..bb6a9d5 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,3 @@ +[run] +branch = True +include = cadquery/* \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 9a40176..5b707aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,3 @@ -build: false shallow_clone: true platform: @@ -13,9 +12,14 @@ install: - set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%" - conda config --set always_yes yes - conda update -q conda - - conda create --quiet --name cqtest -c freecad -c conda-forge python=%PYTHON_VERSION% freecad=0.17=py36_vc14_13 occt=7.2.0 python=3.6 pyparsing mock + - conda create --quiet --name cqtest -c freecad -c conda-forge python=%PYTHON_VERSION% freecad=0.17=py36_vc14_13 occt=7.2.0 python=3.6 pyparsing mock coverage codecov - activate cqtest - python setup.py install +build: false + test_script: - - python runtests.py + - runtests.py + +on_success: + - codecov From d99e23de60d4b5553a02a63e7c4707cda6b435fc Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Sun, 1 Apr 2018 17:27:32 +0200 Subject: [PATCH 2/7] Fixed errors in appveyor + better coveragerc --- .coveragerc | 7 ++++++- appveyor.yml | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index bb6a9d5..6353eb3 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,3 +1,8 @@ [run] branch = True -include = cadquery/* \ No newline at end of file +include = cadquery/* +omit = cadquery/cq_directive.py + + +[xml] +output = coverage.xml \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 5b707aa..1d97956 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,8 @@ install: build: false test_script: - - runtests.py + - coverage run runtests.py on_success: + - coverage xml - codecov From a0457570b22e482117e98b1c688172d9559ee1da Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Sun, 1 Apr 2018 17:43:40 +0200 Subject: [PATCH 3/7] Specified coverage report to upload --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1d97956..464027c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,4 +23,4 @@ test_script: on_success: - coverage xml - - codecov + - codecov --file coverage.xml From cb9077dd496d6228acc5bd769721c53c033f8011 Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Mon, 2 Apr 2018 12:10:33 +0200 Subject: [PATCH 4/7] Removed branch coverage to mimic coveralls setup --- .coveragerc | 1 - appveyor.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index 6353eb3..9da08a7 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,4 @@ [run] -branch = True include = cadquery/* omit = cadquery/cq_directive.py diff --git a/appveyor.yml b/appveyor.yml index 464027c..27d7f2e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,4 +23,4 @@ test_script: on_success: - coverage xml - - codecov --file coverage.xml + - codecov -X gcov --file coverage.xml From f4ba7d6183b0bbe81aa9193a27a69445e7f11487 Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Mon, 2 Apr 2018 13:21:07 +0200 Subject: [PATCH 5/7] Use codecov in travis too --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8afcb06..cd6259c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: conda config --set always_yes yes --set changeps1 no; conda update -q conda; conda info -a; - conda create -y -q -n freecad_cq3 -c freecad -c conda-forge freecad=0.17=py36_11 occt=7.2.0=occt7.2.0_0 python=3.6 pyparsing conda mock; + conda create -y -q -n freecad_cq3 -c freecad -c conda-forge freecad=0.17=py36_11 occt=7.2.0=occt7.2.0_0 python=3.6 pyparsing conda mock coverage codecov; source ~/miniconda/bin/activate freecad_cq3; else sudo add-apt-repository -y ppa:freecad-maintainers/freecad-stable; @@ -29,11 +29,14 @@ install: - python setup.py install; script: +- coverage run runtests.py - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then - coverage run --source=cadquery --omit=cadquery/cq_directive.py ./runtests.py; travis-sphinx build --nowarn --source=doc; fi -- python runtests.py + +after_success: +- coverage xml +- codecov -X gcov --file coverage.xml after_script: - coveralls @@ -43,6 +46,7 @@ branches: except: - pythonocc - 2_0_branch + deploy: provider: pypi user: dcowden From 2153fbfbba4b2d1752715c26830ee4605a320db8 Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Mon, 2 Apr 2018 13:37:40 +0200 Subject: [PATCH 6/7] Added codecov to dev requirements --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index ea86d57..e5b3ec9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,3 +5,4 @@ coverage coveralls pyparsing mock +codecov From c82aaedf6d79e2d19543c9e2f364df275db8dca9 Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Sun, 8 Apr 2018 20:47:10 +0200 Subject: [PATCH 7/7] Added freecad/label/broken to conda channels in CI --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd6259c..d61778e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: conda config --set always_yes yes --set changeps1 no; conda update -q conda; conda info -a; - conda create -y -q -n freecad_cq3 -c freecad -c conda-forge freecad=0.17=py36_11 occt=7.2.0=occt7.2.0_0 python=3.6 pyparsing conda mock coverage codecov; + conda create -y -q -n freecad_cq3 -c freecad -c freecad/label/broken -c conda-forge freecad=0.17=py36_11 occt=7.2.0=occt7.2.0_0 python=3.6 pyparsing conda mock coverage codecov; source ~/miniconda/bin/activate freecad_cq3; else sudo add-apt-repository -y ppa:freecad-maintainers/freecad-stable; diff --git a/appveyor.yml b/appveyor.yml index 27d7f2e..892835b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ install: - set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%" - conda config --set always_yes yes - conda update -q conda - - conda create --quiet --name cqtest -c freecad -c conda-forge python=%PYTHON_VERSION% freecad=0.17=py36_vc14_13 occt=7.2.0 python=3.6 pyparsing mock coverage codecov + - conda create --quiet --name cqtest -c freecad -c freecad/label/broken -c conda-forge python=%PYTHON_VERSION% freecad=0.17=py36_vc14_13 occt=7.2.0 python=3.6 pyparsing mock coverage codecov - activate cqtest - python setup.py install