Harden how setuptools_scm resolves versions in tox in CI

girder · Nov 1, 2023 · 21537aa · 21537aa
1 parent fb4011a
commit 21537aa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.circleci/config.yml b/.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:

diff --git a/tox.ini b/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.