From 2a6a35ff36f878f30e5eef2bf655a2b506d03f25 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 13:56:54 -0600 Subject: [PATCH 01/15] Delete .codecov.yml --- .codecov.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .codecov.yml diff --git a/.codecov.yml b/.codecov.yml deleted file mode 100644 index 9c13f181d..000000000 --- a/.codecov.yml +++ /dev/null @@ -1,17 +0,0 @@ -coverage: - precision: 2 - round: down - range: "70...100" - - status: - project: - default: - # TODO(texasaggie97) - target lowered when adding system test coverage. Raise as coverage rises. - target: 85% - threshhold: 5 - patch: - default: - target: 70% - threshhold: 5 - - From b89b8d94bd68ea636a1fb3fcf469da02ff4c7a16 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 13:57:05 -0600 Subject: [PATCH 02/15] Add coveralls config files --- .coveralls-jenkins.yml | 4 ++++ .coveralls-travis.yml | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 .coveralls-jenkins.yml create mode 100644 .coveralls-travis.yml diff --git a/.coveralls-jenkins.yml b/.coveralls-jenkins.yml new file mode 100644 index 000000000..f2cc2707b --- /dev/null +++ b/.coveralls-jenkins.yml @@ -0,0 +1,4 @@ +repo_token: AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte +service_name: jenkins +parallel: true + diff --git a/.coveralls-travis.yml b/.coveralls-travis.yml new file mode 100644 index 000000000..66a1cb0e2 --- /dev/null +++ b/.coveralls-travis.yml @@ -0,0 +1,4 @@ +repo_token: AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte +service_name: travis +parallel: true + From b9279448b1e87641e771859870044f5aeb48ba11 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 13:57:57 -0600 Subject: [PATCH 03/15] Switch to reporting to coveralls instead of codecov --- .travis.yml | 8 +++----- build/templates/tox-system_tests.ini.mako | 11 ++++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51ed66318..3b708c057 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,14 +28,12 @@ matrix: install: - travis_retry sudo apt-get -y install python3-pip - travis_retry pip install --upgrade pip - - travis_retry pip install --upgrade tox tox-travis codecov + - travis_retry pip install --upgrade tox tox-travis python-coveralls + script: - tox -c tox-travis.ini after_success: - - travis_retry codecov --flags codegenunittests --file codegen.xml - - travis_retry codecov --flags nifakeunittests --file nifakeunittest.xml - - travis_retry codecov --flags nimodinstunittests --file nimodinstunittest.xml - - travis_retry codecov --flags nitclkunittests --file nitclkunittest.xml + - travis_retry coveralls --coveralls_yaml .coveralls-travis.yml --config_file tools/coverage_unit_tests.rc diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 2873e9bb0..0d7f9e185 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -38,28 +38,28 @@ changedir = commands = % if config['supports_nitclk']: ${module_name}-nitclk_wheel: python.exe setup.py bdist_wheel --universal + % endif - ${module_name}-system_tests: python --version # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now ${module_name}-system_tests: python -m pip install --disable-pip-version-check --upgrade pip % if config['supports_nitclk']: ${module_name}-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../.. % endif - ${module_name}-system_tests: python -c "import platform; print(platform.architecture())" ${module_name}-system_tests: python -c "import ${module_name}; ${module_name}.print_diagnostic_information()" ${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m py.test ../../src/${module_name}/examples --junitxml=../../generated/junit/junit-${module_name}-{envname}-{env:BITNESS:64}.xml {posargs} ${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m py.test ../../src/${module_name}/system_tests --junitxml=../../generated/junit/junit-${module_name}-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5 + ${module_name}-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./ # Create the report to upload ${module_name}-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results ${module_name}-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - # token is from codecov - ${module_name}-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags ${module_name}systemtests --name ${module_name} --root ../.. --file ../../generated/${module_name}/coverage.xml + ${module_name}-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc deps = % if config['supports_nitclk']: ${module_name}-nitclk_wheel: packaging + % endif ${module_name}-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' ${module_name}-system_tests: pytest;platform_python_implementation=='CPython' @@ -67,8 +67,9 @@ deps = ${module_name}-system_tests: numpy ${module_name}-system_tests: scipy ${module_name}-system_tests: fasteners + ${module_name}-coverage: coverage - ${module_name}-coverage: codecov + ${module_name}-coverage: python-coveralls depends = ${module_name}-coverage: py{35,36,37,38,py3}-${module_name}-system_tests From ce7b25b0866f35e0a4598f9bf9531c47ef1b9771 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 13:58:05 -0600 Subject: [PATCH 04/15] Update generated files --- generated/examples/nidigital_examples.zip | Bin 6394 -> 6394 bytes generated/nidcpower/tox-system_tests.ini | 9 ++++----- generated/nidigital/tox-system_tests.ini | 11 ++++++----- generated/nidmm/tox-system_tests.ini | 9 ++++----- generated/nifake/tox-system_tests.ini | 11 ++++++----- generated/nifgen/tox-system_tests.ini | 11 ++++++----- generated/nimodinst/tox-system_tests.ini | 9 ++++----- generated/niscope/tox-system_tests.ini | 11 ++++++----- generated/nise/tox-system_tests.ini | 9 ++++----- generated/niswitch/tox-system_tests.ini | 9 ++++----- generated/nitclk/tox-system_tests.ini | 9 ++++----- 11 files changed, 48 insertions(+), 50 deletions(-) diff --git a/generated/examples/nidigital_examples.zip b/generated/examples/nidigital_examples.zip index 1c3fda6e1455ba47ff7d4749f38984a5e481677c..3e2d56db2639a7b86660566fa86c7c07dfaeaac8 100644 GIT binary patch delta 378 zcmexm_{)$tz?+$civa|z6a6Ogs zW-zhMTue`x!Ga%IZQz0?Y?2U_0qmx5!5;QGOkkDTT-I>GT&_}x%BS3L!O7}8_rVG| zc}?I7U3e=Y_8btffD8T?$b;xE5YmMUE)nv9*z;M$lo{xm$pvCEVB@?*15x;UMO{$% p%3@w9{C+WK6#f@6PZWN(u|W{ zW-zhMTue`x!Ga%IZQz0?Y?2U_0qmx5!5;QGOkkDTT-I>GT&_}x%BS3L!O7}8_rVG| zc}?I7U3e=Y_8btffD8T?$YW&Atu>!qAf(G)E36flxzl#@5+NUmJ)cEPnSq{}Tp%U` zHqJ{l5QV>2)CGmFEarv6?-z4M;eQeHMB&Gaqw-IQJE6$yNw~rJAV*G Date: Fri, 14 Feb 2020 14:33:22 -0600 Subject: [PATCH 05/15] Can't use config file --- .coveralls-jenkins.yml | 4 ---- .coveralls-travis.yml | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 .coveralls-jenkins.yml delete mode 100644 .coveralls-travis.yml diff --git a/.coveralls-jenkins.yml b/.coveralls-jenkins.yml deleted file mode 100644 index f2cc2707b..000000000 --- a/.coveralls-jenkins.yml +++ /dev/null @@ -1,4 +0,0 @@ -repo_token: AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte -service_name: jenkins -parallel: true - diff --git a/.coveralls-travis.yml b/.coveralls-travis.yml deleted file mode 100644 index 66a1cb0e2..000000000 --- a/.coveralls-travis.yml +++ /dev/null @@ -1,4 +0,0 @@ -repo_token: AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte -service_name: travis -parallel: true - From ca83cc656e00e9f7d7af2cd2af146b113ebddc5c Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 14:33:48 -0600 Subject: [PATCH 06/15] Switch reporting tool - set config on command line --- .travis.yml | 4 ++-- build/templates/tox-system_tests.ini.mako | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b708c057..fdb72a991 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,12 +28,12 @@ matrix: install: - travis_retry sudo apt-get -y install python3-pip - travis_retry pip install --upgrade pip - - travis_retry pip install --upgrade tox tox-travis python-coveralls + - travis_retry pip install --upgrade tox tox-travis coveralls script: - tox -c tox-travis.ini after_success: - - travis_retry coveralls --coveralls_yaml .coveralls-travis.yml --config_file tools/coverage_unit_tests.rc + - travis_retry COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=tools/coverage_unit_tests.rc diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 0d7f9e185..5a39780b6 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -54,7 +54,7 @@ commands = ${module_name}-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results ${module_name}-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - ${module_name}-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + ${module_name}-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = % if config['supports_nitclk']: @@ -69,7 +69,7 @@ deps = ${module_name}-system_tests: fasteners ${module_name}-coverage: coverage - ${module_name}-coverage: python-coveralls + ${module_name}-coverage: coveralls depends = ${module_name}-coverage: py{35,36,37,38,py3}-${module_name}-system_tests @@ -84,6 +84,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 From f5dbae4ebee04b744fa1b04f62e507cef4a1ded3 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 14:34:11 -0600 Subject: [PATCH 07/15] Update generated files --- generated/nidcpower/tox-system_tests.ini | 6 ++++-- generated/nidigital/tox-system_tests.ini | 6 ++++-- generated/nidmm/tox-system_tests.ini | 6 ++++-- generated/nifake/tox-system_tests.ini | 6 ++++-- generated/nifgen/tox-system_tests.ini | 6 ++++-- generated/nimodinst/tox-system_tests.ini | 6 ++++-- generated/niscope/tox-system_tests.ini | 6 ++++-- generated/nise/tox-system_tests.ini | 6 ++++-- generated/niswitch/tox-system_tests.ini | 6 ++++-- generated/nitclk/tox-system_tests.ini | 6 ++++-- 10 files changed, 40 insertions(+), 20 deletions(-) diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index c67a22985..66c3863d7 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidcpower-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidcpower-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidcpower-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nidcpower-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidcpower-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -41,7 +41,7 @@ deps = nidcpower-system_tests: fasteners nidcpower-coverage: coverage - nidcpower-coverage: python-coveralls + nidcpower-coverage: coveralls depends = nidcpower-coverage: py{35,36,37,38,py3}-nidcpower-system_tests @@ -53,6 +53,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index d0d54605e..2b6e48b13 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nidigital-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidigital-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidigital-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nidigital-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidigital-nitclk_wheel: packaging @@ -48,7 +48,7 @@ deps = nidigital-system_tests: fasteners nidigital-coverage: coverage - nidigital-coverage: python-coveralls + nidigital-coverage: coveralls depends = nidigital-coverage: py{35,36,37,38,py3}-nidigital-system_tests @@ -61,6 +61,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index d46a64f9c..24db377f1 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidmm-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidmm-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidmm-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nidmm-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidmm-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -41,7 +41,7 @@ deps = nidmm-system_tests: fasteners nidmm-coverage: coverage - nidmm-coverage: python-coveralls + nidmm-coverage: coveralls depends = nidmm-coverage: py{35,36,37,38,py3}-nidmm-system_tests @@ -53,6 +53,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index 5843caf8a..f4c8728b5 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifake-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifake-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifake-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nifake-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nifake-nitclk_wheel: packaging @@ -48,7 +48,7 @@ deps = nifake-system_tests: fasteners nifake-coverage: coverage - nifake-coverage: python-coveralls + nifake-coverage: coveralls depends = nifake-coverage: py{35,36,37,38,py3}-nifake-system_tests @@ -61,6 +61,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index 391435b5b..15ad43b2c 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifgen-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifgen-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifgen-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nifgen-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nifgen-nitclk_wheel: packaging @@ -48,7 +48,7 @@ deps = nifgen-system_tests: fasteners nifgen-coverage: coverage - nifgen-coverage: python-coveralls + nifgen-coverage: coveralls depends = nifgen-coverage: py{35,36,37,38,py3}-nifgen-system_tests @@ -61,6 +61,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index 6b029fbf2..c7d0df564 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nimodinst-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nimodinst-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nimodinst-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nimodinst-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nimodinst-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -41,7 +41,7 @@ deps = nimodinst-system_tests: fasteners nimodinst-coverage: coverage - nimodinst-coverage: python-coveralls + nimodinst-coverage: coveralls depends = nimodinst-coverage: py{35,36,37,38,py3}-nimodinst-system_tests @@ -53,6 +53,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index 5bcf17664..4bb887854 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = niscope-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niscope-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niscope-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + niscope-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = niscope-nitclk_wheel: packaging @@ -48,7 +48,7 @@ deps = niscope-system_tests: fasteners niscope-coverage: coverage - niscope-coverage: python-coveralls + niscope-coverage: coveralls depends = niscope-coverage: py{35,36,37,38,py3}-niscope-system_tests @@ -61,6 +61,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 3842dfb4e..0bd641a7a 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nise-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nise-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nise-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nise-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nise-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -41,7 +41,7 @@ deps = nise-system_tests: fasteners nise-coverage: coverage - nise-coverage: python-coveralls + nise-coverage: coveralls depends = nise-coverage: py{35,36,37,38,py3}-nise-system_tests @@ -53,6 +53,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index 626277f3e..1d4517fc5 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = niswitch-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niswitch-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niswitch-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + niswitch-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = niswitch-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -41,7 +41,7 @@ deps = niswitch-system_tests: fasteners niswitch-coverage: coverage - niswitch-coverage: python-coveralls + niswitch-coverage: coveralls depends = niswitch-coverage: py{35,36,37,38,py3}-niswitch-system_tests @@ -53,6 +53,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index f9865c2f6..9e5287762 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nitclk-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nitclk-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nitclk-coverage: coveralls --coveralls_yaml .coveralls-jenkins.yml --config_file ../../tools/coverage_system_tests.rc + nitclk-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nitclk-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -41,7 +41,7 @@ deps = nitclk-system_tests: fasteners nitclk-coverage: coverage - nitclk-coverage: python-coveralls + nitclk-coverage: coveralls depends = nitclk-coverage: py{35,36,37,38,py3}-nitclk-system_tests @@ -53,6 +53,8 @@ passenv = BRANCH_NAME JENKINS_URL BUILD_NUMBER + JENKINS_HOME + CI_PULL_REQUEST [pytest] junit_family = xunit1 From c0ce49de58bfdf92d1a4d8ffc5c2d373faaea349 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 14:47:50 -0600 Subject: [PATCH 08/15] Can't set environment vars in the command --- build/templates/tox-system_tests.ini.mako | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 5a39780b6..f27ecba0b 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -54,7 +54,7 @@ commands = ${module_name}-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results ${module_name}-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - ${module_name}-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + ${module_name}-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = % if config['supports_nitclk']: @@ -87,6 +87,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 From 58de9a02a5540b189f9ab3db298c9f263813ac3f Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 14:47:59 -0600 Subject: [PATCH 09/15] Update generated files --- generated/nidcpower/tox-system_tests.ini | 6 +++++- generated/nidigital/tox-system_tests.ini | 6 +++++- generated/nidmm/tox-system_tests.ini | 6 +++++- generated/nifake/tox-system_tests.ini | 6 +++++- generated/nifgen/tox-system_tests.ini | 6 +++++- generated/nimodinst/tox-system_tests.ini | 6 +++++- generated/niscope/tox-system_tests.ini | 6 +++++- generated/nise/tox-system_tests.ini | 6 +++++- generated/niswitch/tox-system_tests.ini | 6 +++++- generated/nitclk/tox-system_tests.ini | 6 +++++- 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index 66c3863d7..25b24696d 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidcpower-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidcpower-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidcpower-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nidcpower-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidcpower-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -56,6 +56,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index 2b6e48b13..ac7fe86d9 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nidigital-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidigital-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidigital-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nidigital-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidigital-nitclk_wheel: packaging @@ -64,6 +64,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index 24db377f1..b161f10fb 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidmm-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidmm-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidmm-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nidmm-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidmm-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -56,6 +56,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index f4c8728b5..582d37434 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifake-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifake-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifake-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nifake-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nifake-nitclk_wheel: packaging @@ -64,6 +64,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index 15ad43b2c..c5581cf2c 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifgen-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifgen-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifgen-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nifgen-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nifgen-nitclk_wheel: packaging @@ -64,6 +64,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index c7d0df564..73b684201 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nimodinst-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nimodinst-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nimodinst-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nimodinst-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nimodinst-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -56,6 +56,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index 4bb887854..d993ac13c 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = niscope-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niscope-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niscope-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + niscope-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = niscope-nitclk_wheel: packaging @@ -64,6 +64,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 0bd641a7a..951f5e37e 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nise-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nise-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nise-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nise-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nise-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -56,6 +56,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index 1d4517fc5..2ca9edca7 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = niswitch-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niswitch-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niswitch-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + niswitch-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = niswitch-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -56,6 +56,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index 9e5287762..2724c8eff 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nitclk-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nitclk-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nitclk-coverage: COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=../../tools/coverage_system_tests.rc + nitclk-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nitclk-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' @@ -56,6 +56,10 @@ passenv = JENKINS_HOME CI_PULL_REQUEST +setenv = + COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte + COVERALLS_PARALLEL = true + [pytest] junit_family = xunit1 From fe4311ac93768bcd335c66931330ab694501a838 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 15:05:18 -0600 Subject: [PATCH 10/15] Different meaning of parallel --- .travis.yml | 2 +- build/templates/tox-system_tests.ini.mako | 1 - generated/nidcpower/tox-system_tests.ini | 1 - generated/nidigital/tox-system_tests.ini | 1 - generated/nidmm/tox-system_tests.ini | 1 - generated/nifake/tox-system_tests.ini | 1 - generated/nifgen/tox-system_tests.ini | 1 - generated/nimodinst/tox-system_tests.ini | 1 - generated/niscope/tox-system_tests.ini | 1 - generated/nise/tox-system_tests.ini | 1 - generated/niswitch/tox-system_tests.ini | 1 - generated/nitclk/tox-system_tests.ini | 1 - 12 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdb72a991..952fc8e9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,5 +35,5 @@ script: - tox -c tox-travis.ini after_success: - - travis_retry COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte COVERALLS_PARALLEL=true coveralls --rcfile=tools/coverage_unit_tests.rc + - travis_retry COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte coveralls --rcfile=tools/coverage_unit_tests.rc diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index f27ecba0b..177f2f469 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -89,7 +89,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index 25b24696d..2d1999122 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -58,7 +58,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index ac7fe86d9..63260725a 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -66,7 +66,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index b161f10fb..a48f9b0ef 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -58,7 +58,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index 582d37434..d8fe790f2 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -66,7 +66,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index c5581cf2c..dc390f19a 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -66,7 +66,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index 73b684201..db785b7e3 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -58,7 +58,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index d993ac13c..a88fd5478 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -66,7 +66,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 951f5e37e..320134989 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -58,7 +58,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index 2ca9edca7..9ce6deb66 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -58,7 +58,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index 2724c8eff..000b1d713 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -58,7 +58,6 @@ passenv = setenv = COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte - COVERALLS_PARALLEL = true [pytest] junit_family = xunit1 From 233977339dec90d902abd5c66863f8148d41fe3a Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 17:27:30 -0600 Subject: [PATCH 11/15] Don't need a token for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 952fc8e9e..0bd0900d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,5 +35,5 @@ script: - tox -c tox-travis.ini after_success: - - travis_retry COVERALLS_REPO_TOKEN=AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte coveralls --rcfile=tools/coverage_unit_tests.rc + - travis_retry coveralls --rcfile=tools/coverage_unit_tests.rc From 5fb6e946baa3cee6f9bda9ebb03e065b0bd365db Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Fri, 14 Feb 2020 17:36:27 -0600 Subject: [PATCH 12/15] Print debug information from coveralls --- build/templates/tox-system_tests.ini.mako | 2 +- generated/nidcpower/tox-system_tests.ini | 2 +- generated/nidigital/tox-system_tests.ini | 2 +- generated/nidmm/tox-system_tests.ini | 2 +- generated/nifake/tox-system_tests.ini | 2 +- generated/nifgen/tox-system_tests.ini | 2 +- generated/nimodinst/tox-system_tests.ini | 2 +- generated/niscope/tox-system_tests.ini | 2 +- generated/nise/tox-system_tests.ini | 2 +- generated/niswitch/tox-system_tests.ini | 2 +- generated/nitclk/tox-system_tests.ini | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 177f2f469..68e660eb5 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -54,7 +54,7 @@ commands = ${module_name}-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results ${module_name}-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - ${module_name}-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + ${module_name}-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = % if config['supports_nitclk']: diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index 2d1999122..891148d7b 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidcpower-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidcpower-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidcpower-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nidcpower-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nidcpower-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index 63260725a..02cc0c962 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nidigital-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidigital-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidigital-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nidigital-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nidigital-nitclk_wheel: packaging diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index a48f9b0ef..057ff36c2 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidmm-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidmm-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidmm-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nidmm-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nidmm-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index d8fe790f2..320415411 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifake-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifake-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifake-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nifake-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nifake-nitclk_wheel: packaging diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index dc390f19a..2f1d7b84c 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifgen-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifgen-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifgen-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nifgen-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nifgen-nitclk_wheel: packaging diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index db785b7e3..b7d9a0db8 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nimodinst-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nimodinst-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nimodinst-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nimodinst-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nimodinst-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index a88fd5478..218ea2f22 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = niscope-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niscope-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niscope-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + niscope-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = niscope-nitclk_wheel: packaging diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 320134989..f7337faf8 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nise-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nise-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nise-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nise-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nise-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index 9ce6deb66..2ece4ed94 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = niswitch-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niswitch-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niswitch-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + niswitch-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = niswitch-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index 000b1d713..01cf7c4b9 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nitclk-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nitclk-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nitclk-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc + nitclk-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc deps = nitclk-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' From 20c04d0fd1dc42d159846c57f3b1cdf194e66eb8 Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Mon, 17 Feb 2020 11:12:07 -0600 Subject: [PATCH 13/15] Don't run coveralls in debug mode --- build/templates/tox-system_tests.ini.mako | 2 +- generated/nidcpower/tox-system_tests.ini | 2 +- generated/nidigital/tox-system_tests.ini | 2 +- generated/nidmm/tox-system_tests.ini | 2 +- generated/nifake/tox-system_tests.ini | 2 +- generated/nifgen/tox-system_tests.ini | 2 +- generated/nimodinst/tox-system_tests.ini | 2 +- generated/niscope/tox-system_tests.ini | 2 +- generated/nise/tox-system_tests.ini | 2 +- generated/niswitch/tox-system_tests.ini | 2 +- generated/nitclk/tox-system_tests.ini | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 68e660eb5..177f2f469 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -54,7 +54,7 @@ commands = ${module_name}-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results ${module_name}-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - ${module_name}-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + ${module_name}-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = % if config['supports_nitclk']: diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index 891148d7b..2d1999122 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidcpower-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidcpower-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidcpower-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nidcpower-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidcpower-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index 02cc0c962..63260725a 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nidigital-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidigital-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidigital-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nidigital-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidigital-nitclk_wheel: packaging diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index 057ff36c2..a48f9b0ef 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nidmm-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nidmm-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nidmm-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nidmm-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nidmm-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index 320415411..d8fe790f2 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifake-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifake-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifake-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nifake-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nifake-nitclk_wheel: packaging diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index 2f1d7b84c..dc390f19a 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = nifgen-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nifgen-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nifgen-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nifgen-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nifgen-nitclk_wheel: packaging diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index b7d9a0db8..db785b7e3 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nimodinst-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nimodinst-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nimodinst-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nimodinst-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nimodinst-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index 218ea2f22..a88fd5478 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -35,7 +35,7 @@ commands = niscope-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niscope-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niscope-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + niscope-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = niscope-nitclk_wheel: packaging diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index f7337faf8..320134989 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nise-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nise-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nise-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nise-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nise-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index 2ece4ed94..9ce6deb66 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = niswitch-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results niswitch-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - niswitch-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + niswitch-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = niswitch-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index 01cf7c4b9..000b1d713 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -30,7 +30,7 @@ commands = nitclk-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc # Display the coverage results nitclk-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc - nitclk-coverage: coveralls debug --rcfile=../../tools/coverage_system_tests.rc + nitclk-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc deps = nitclk-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy' From bdef34127ea00ea77ff233c44fa41138d806e27a Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Mon, 17 Feb 2020 13:09:12 -0600 Subject: [PATCH 14/15] Update generated files --- generated/examples/nidcpower_examples.zip | Bin 2425 -> 2425 bytes generated/examples/nidigital_examples.zip | Bin 6394 -> 6394 bytes generated/examples/nidmm_examples.zip | Bin 3058 -> 3058 bytes generated/examples/nifgen_examples.zip | Bin 4012 -> 4012 bytes generated/examples/nimodinst_examples.zip | Bin 440 -> 440 bytes generated/examples/niscope_examples.zip | Bin 3685 -> 3685 bytes generated/examples/nise_examples.zip | Bin 617 -> 617 bytes generated/examples/niswitch_examples.zip | Bin 2927 -> 2927 bytes generated/examples/nitclk_examples.zip | Bin 813 -> 813 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/generated/examples/nidcpower_examples.zip b/generated/examples/nidcpower_examples.zip index 17608bcec785959221cbac11c0456eddb28e886f..913497c764d3799966aa6025c32218712e6f9bd1 100644 GIT binary patch delta 23 ccmew<^iybp6SK=nuZ^yHEFgMw84EKj0B*1c`Tzg` delta 23 ccmew<^iybp6LZE++l{VzEFgMw84EKj0B@`a2mk;8 diff --git a/generated/examples/nidigital_examples.zip b/generated/examples/nidigital_examples.zip index 3e2d56db2639a7b86660566fa86c7c07dfaeaac8..3cb1f9c8991601a8a2e00ce3b190d1a51b9324a8 100644 GIT binary patch delta 85 zcmexm_{(sD1@ry~UK6cTCRzw@+!V?Pq&7=2iL-!c7dBTge-8UOCJ?`tYdM&2&cg+! YLwHv(gT(m-CowX+p7h$hL@10602uZ@oPnL+esWfolsBba?Y3jok`3xfav delta 32 hcmew){z-g-9dp)B+l`L*nL+esWfolsBba?Y3joqk3zz@^ diff --git a/generated/examples/nifgen_examples.zip b/generated/examples/nifgen_examples.zip index 95f0c989371c66aed038a98f8682801674d62572..9da74a7da1b1fed75a972e1e716de38d99081a61 100644 GIT binary patch delta 32 icmZ1@zeaw7EwlScuZ<2fm_hXB+sv};V8(B*jVu7iXACI- delta 32 icmZ1@zeaw7Epzrx+l>x0m_hXB+sv};V8(B*jVu7kLkvCu diff --git a/generated/examples/nimodinst_examples.zip b/generated/examples/nimodinst_examples.zip index 2bbe7a4beaf3cf4bd00747737b2df800bc4e89d8..d70c0e3268ed53f53886beaecff9c6cc8efa26f5 100644 GIT binary patch delta 14 VcmdnNyn}gyJ+u2suZ>P+i~uKv1q}cI delta 14 VcmdnNyn}gyJ#)@Z+l@|Ti~uL+1r-1Q diff --git a/generated/examples/niscope_examples.zip b/generated/examples/niscope_examples.zip index 057d675fbc7c034fbf5b7f2c923597f63c7c61d3..8cd85e73a7364a98216e2c27e33e13a00a699c00 100644 GIT binary patch delta 32 icmaDV^HgSnIkV?UuZ>nKm_hXBr_4-jV8$!XY8C*~p$tU; delta 32 icmaDV^HgSnIdkq#+l^K$m_hXBr_4-jV8$!XY8C+1eGFOv diff --git a/generated/examples/nise_examples.zip b/generated/examples/nise_examples.zip index aa764e147344d4e0e22241c1a12075de390b230d..3014e2dfd2c1c2b98f96b76d7049f83d7427bf04 100644 GIT binary patch delta 14 VcmaFK@{(nO4YTJ-uZ{LvOaLqD1tI_d delta 14 VcmaFK@{(nO4Rh{J+l}^GOaLrJ1t|ak diff --git a/generated/examples/niswitch_examples.zip b/generated/examples/niswitch_examples.zip index 8a4555c71c98ffc57c1f91134994771c28c7593b..bbf3b94410c643be70d2760c1d6190bd5cd4c508 100644 GIT binary patch delta 32 icmaDa_Fim)Gqcx8uZ?cknLzYr1?CVIFr%FP2QvWENDL?d delta 32 icmaDa_Fim)GjrZf+l_A5nLzYr1?CVIFr%FP2QvWGBn&+O diff --git a/generated/examples/nitclk_examples.zip b/generated/examples/nitclk_examples.zip index f1ac97c4162ddb836e4f369b39be418208c6e97a..b98f6ca79a4cd05fb1f33a83c533268ce8df02f2 100644 GIT binary patch delta 14 VcmZ3>ww7&z6|>h#uZ^}Jm;fhz1#tiX delta 14 VcmZ3>ww7&z6?5KB+l{s#m;fi(1$Y1e From b3ff233bd4bd5412578b0d8b0818877535dda89c Mon Sep 17 00:00:00 2001 From: Mark Silva Date: Mon, 17 Feb 2020 16:27:35 -0600 Subject: [PATCH 15/15] Create .coveralls.yml --- .coveralls.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 000000000..6ec12524a --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1,2 @@ +parallel: true +