Merge pull request #1356 from girder/harden-ci

Harden how setuptools_scm resolves versions in tox in CI

.circleci/config.yml

@@ -25,7 +25,7 @@ commands:
           # Piping through cat does less buffering of the output but can
           # consume the exit code
           # command: PYTEST_ADDOPTS=--forked tox -e << parameters.env >> | cat; test ${PIPESTATUS[0]} -eq 0
-          command: PYTEST_ADDOPTS=--reruns=3 tox -e << parameters.env >> | cat; test ${PIPESTATUS[0]} -eq 0
+          command: CIRCLE_BRANCH= PYTEST_ADDOPTS=--reruns=3 tox -e << parameters.env >> | cat; test ${PIPESTATUS[0]} -eq 0
   switchpython:
     description: "Upgrade python"
     parameters:

tox.ini

@@ -51,7 +51,6 @@ setenv =
   NPM_CONFIG_PREFER_OFFLINE=true
   PIP_FIND_LINKS=https://girder.github.io/large_image_wheels
   GDAL_PAM_ENABLED=no
-  CIRCLE_BRANCH=ignore
 
 # Versions that do have all tile sources.  Using the requirements-dev.txt file
 # installs in editable mode, which then includes results in coverage.