Merge fe4311a into f047438

ni · Feb 14, 2020 · 8f87ba7 · 8f87ba7
2 parents f047438 + fe4311a
commit 8f87ba7
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 77 deletions.
diff --git a/.codecov.yml b/.codecov.yml
diff --git 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 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_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
@@ -38,37 +38,38 @@ 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 --rcfile=../../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'
     ${module_name}-system_tests: coverage
     ${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: coveralls
 
 depends =
     ${module_name}-coverage: py{35,36,37,38,py3}-${module_name}-system_tests
@@ -83,6 +84,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1

diff --git a/generated/examples/nidigital_examples.zip b/generated/examples/nidigital_examples.zip
diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     nidcpower-coverage: .
 
 commands =
-    nidcpower-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidcpower-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    nidcpower-system_tests: python -c "import platform; print(platform.architecture())"
     nidcpower-system_tests: python -c "import nidcpower; nidcpower.print_diagnostic_information()"
     nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m py.test ../../src/nidcpower/examples --junitxml=../../generated/junit/junit-nidcpower-{envname}-{env:BITNESS:64}.xml {posargs}
     nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m py.test ../../src/nidcpower/system_tests --junitxml=../../generated/junit/junit-nidcpower-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nidcpower-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     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
-    # token is from codecov
-    nidcpower-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nidcpowersystemtests --name nidcpower --root ../.. --file ../../generated/nidcpower/coverage.xml
+    nidcpower-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nidcpower-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy'
@@ -41,8 +39,9 @@ deps =
     nidcpower-system_tests: numpy
     nidcpower-system_tests: scipy
     nidcpower-system_tests: fasteners
+
     nidcpower-coverage: coverage
-    nidcpower-coverage: codecov
+    nidcpower-coverage: coveralls
 
 depends =
     nidcpower-coverage: py{35,36,37,38,py3}-nidcpower-system_tests
@@ -54,6 +53,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1

diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini
@@ -22,32 +22,33 @@ changedir =
 
 commands =
     nidigital-nitclk_wheel: python.exe setup.py bdist_wheel --universal
-    nidigital-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidigital-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidigital-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
-    nidigital-system_tests: python -c "import platform; print(platform.architecture())"
     nidigital-system_tests: python -c "import nidigital; nidigital.print_diagnostic_information()"
     nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m py.test ../../src/nidigital/examples --junitxml=../../generated/junit/junit-nidigital-{envname}-{env:BITNESS:64}.xml {posargs}
     nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m py.test ../../src/nidigital/system_tests --junitxml=../../generated/junit/junit-nidigital-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nidigital-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     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
-    # token is from codecov
-    nidigital-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nidigitalsystemtests --name nidigital --root ../.. --file ../../generated/nidigital/coverage.xml
+    nidigital-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nidigital-nitclk_wheel: packaging
+
     nidigital-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy'
     nidigital-system_tests: pytest;platform_python_implementation=='CPython'
     nidigital-system_tests: coverage
     nidigital-system_tests: numpy
     nidigital-system_tests: scipy
     nidigital-system_tests: fasteners
+
     nidigital-coverage: coverage
-    nidigital-coverage: codecov
+    nidigital-coverage: coveralls
 
 depends =
     nidigital-coverage: py{35,36,37,38,py3}-nidigital-system_tests
@@ -60,6 +61,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1

diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     nidmm-coverage: .
 
 commands =
-    nidmm-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidmm-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    nidmm-system_tests: python -c "import platform; print(platform.architecture())"
     nidmm-system_tests: python -c "import nidmm; nidmm.print_diagnostic_information()"
     nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m py.test ../../src/nidmm/examples --junitxml=../../generated/junit/junit-nidmm-{envname}-{env:BITNESS:64}.xml {posargs}
     nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m py.test ../../src/nidmm/system_tests --junitxml=../../generated/junit/junit-nidmm-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nidmm-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     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
-    # token is from codecov
-    nidmm-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nidmmsystemtests --name nidmm --root ../.. --file ../../generated/nidmm/coverage.xml
+    nidmm-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nidmm-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy'
@@ -41,8 +39,9 @@ deps =
     nidmm-system_tests: numpy
     nidmm-system_tests: scipy
     nidmm-system_tests: fasteners
+
     nidmm-coverage: coverage
-    nidmm-coverage: codecov
+    nidmm-coverage: coveralls
 
 depends =
     nidmm-coverage: py{35,36,37,38,py3}-nidmm-system_tests
@@ -54,6 +53,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1

diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini
@@ -22,32 +22,33 @@ changedir =
 
 commands =
     nifake-nitclk_wheel: python.exe setup.py bdist_wheel --universal
-    nifake-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nifake-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifake-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
-    nifake-system_tests: python -c "import platform; print(platform.architecture())"
     nifake-system_tests: python -c "import nifake; nifake.print_diagnostic_information()"
     nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m py.test ../../src/nifake/examples --junitxml=../../generated/junit/junit-nifake-{envname}-{env:BITNESS:64}.xml {posargs}
     nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m py.test ../../src/nifake/system_tests --junitxml=../../generated/junit/junit-nifake-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nifake-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     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
-    # token is from codecov
-    nifake-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nifakesystemtests --name nifake --root ../.. --file ../../generated/nifake/coverage.xml
+    nifake-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nifake-nitclk_wheel: packaging
+
     nifake-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy'
     nifake-system_tests: pytest;platform_python_implementation=='CPython'
     nifake-system_tests: coverage
     nifake-system_tests: numpy
     nifake-system_tests: scipy
     nifake-system_tests: fasteners
+
     nifake-coverage: coverage
-    nifake-coverage: codecov
+    nifake-coverage: coveralls
 
 depends =
     nifake-coverage: py{35,36,37,38,py3}-nifake-system_tests
@@ -60,6 +61,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1

diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini
@@ -22,32 +22,33 @@ changedir =
 
 commands =
     nifgen-nitclk_wheel: python.exe setup.py bdist_wheel --universal
-    nifgen-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nifgen-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifgen-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
-    nifgen-system_tests: python -c "import platform; print(platform.architecture())"
     nifgen-system_tests: python -c "import nifgen; nifgen.print_diagnostic_information()"
     nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m py.test ../../src/nifgen/examples --junitxml=../../generated/junit/junit-nifgen-{envname}-{env:BITNESS:64}.xml {posargs}
     nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m py.test ../../src/nifgen/system_tests --junitxml=../../generated/junit/junit-nifgen-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nifgen-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     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
-    # token is from codecov
-    nifgen-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nifgensystemtests --name nifgen --root ../.. --file ../../generated/nifgen/coverage.xml
+    nifgen-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nifgen-nitclk_wheel: packaging
+
     nifgen-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy'
     nifgen-system_tests: pytest;platform_python_implementation=='CPython'
     nifgen-system_tests: coverage
     nifgen-system_tests: numpy
     nifgen-system_tests: scipy
     nifgen-system_tests: fasteners
+
     nifgen-coverage: coverage
-    nifgen-coverage: codecov
+    nifgen-coverage: coveralls
 
 depends =
     nifgen-coverage: py{35,36,37,38,py3}-nifgen-system_tests
@@ -60,6 +61,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1

diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     nimodinst-coverage: .
 
 commands =
-    nimodinst-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nimodinst-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    nimodinst-system_tests: python -c "import platform; print(platform.architecture())"
     nimodinst-system_tests: python -c "import nimodinst; nimodinst.print_diagnostic_information()"
     nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m py.test ../../src/nimodinst/examples --junitxml=../../generated/junit/junit-nimodinst-{envname}-{env:BITNESS:64}.xml {posargs}
     nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m py.test ../../src/nimodinst/system_tests --junitxml=../../generated/junit/junit-nimodinst-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nimodinst-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     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
-    # token is from codecov
-    nimodinst-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nimodinstsystemtests --name nimodinst --root ../.. --file ../../generated/nimodinst/coverage.xml
+    nimodinst-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nimodinst-system_tests: pytest==4.6.5;platform_python_implementation=='PyPy'
@@ -41,8 +39,9 @@ deps =
     nimodinst-system_tests: numpy
     nimodinst-system_tests: scipy
     nimodinst-system_tests: fasteners
+
     nimodinst-coverage: coverage
-    nimodinst-coverage: codecov
+    nimodinst-coverage: coveralls
 
 depends =
     nimodinst-coverage: py{35,36,37,38,py3}-nimodinst-system_tests
@@ -54,6 +53,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1