From 21537aa65b646be4e72f8137a56ddbf4570fe180 Mon Sep 17 00:00:00 2001
From: David Manthey <david.manthey@kitware.com>
Date: Wed, 1 Nov 2023 16:23:07 -0400
Subject: [PATCH] Harden how setuptools_scm resolves versions in tox in CI

---
 .circleci/config.yml | 2 +-
 tox.ini              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eec4a7005..457f5b65c 100644
--- 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
index ba9823ace..f69bdc468 100644
--- 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.