Fix coveralls execution on master

Author: nicoddemus

appveyor.yml

@@ -7,7 +7,7 @@ environment:
 
   matrix:
   # coveralls is not in the default env list
-  - TOXENV: "coveralls"
+  - TOXENV: "coverage"
   # note: please use "tox --listenvs" to populate the build matrix below
   - TOXENV: "linting"
   - TOXENV: "py27"
@@ -42,7 +42,7 @@ install:
 build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
-  - call scripts\call-tox.bat
+  - C:\Python36\python -m tox
 
 cache:
   - '%LOCALAPPDATA%\pip\cache'

scripts/call-tox.bat

@@ -0,0 +1,16 @@
+"""
+Calls "coveralls" to report code coverage to coveralls.io if we have COVERALLS_REPO_TOKEN defined in the environment,
+otherwise skip it.
+
+This script is needed because "coveralls" without a token defined fails, and we want to execute the entire
+workflow even on PRs to detect errors earlier rather than only on master when COVERALLS_REPO_TOKEN is actually
+defined.
+"""
+
+import os
+import subprocess
+
+if os.environ.get("COVERALLS_REPO_TOKEN"):
+    subprocess.check_call(["coveralls"])
+else:
+    print("Skipping coveralls run because COVERALLS_REPO_TOKEN is not defined")

scripts/maybe-coveralls.py

@@ -178,19 +178,19 @@ commands =
     {envpython} tox_run.py
 
 
-[testenv:coveralls]
+[testenv:coverage]
 passenv = CI TRAVIS TRAVIS_* COVERALLS_REPO_TOKEN
 usedevelop = True
-changedir = .
 deps =
     {[testenv]deps}
     coveralls
     codecov
 commands =
-    coverage run -m pytest testing
+    coverage run -m pytest testing/test_config.py
+    coverage combine
     coverage report -m
-    coveralls
     codecov
+    python scripts/maybe-coveralls.py
 
 [testenv:release]
 decription = do a release, required posarg of the version number