Merge branch 'master' into amend-dicomweb-assetstore

girder · Nov 1, 2023 · d8833d2 · d8833d2
2 parents 775dcae + d06c8be
commit d8833d2
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git a/girder/setup.py b/girder/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/girder_annotation/setup.py b/girder_annotation/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/bioformats/setup.py b/sources/bioformats/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/deepzoom/setup.py b/sources/deepzoom/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/dicom/setup.py b/sources/dicom/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/dummy/setup.py b/sources/dummy/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/gdal/setup.py b/sources/gdal/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/mapnik/setup.py b/sources/mapnik/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/multi/setup.py b/sources/multi/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/nd2/setup.py b/sources/nd2/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/ometiff/setup.py b/sources/ometiff/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/openjpeg/setup.py b/sources/openjpeg/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/openslide/setup.py b/sources/openslide/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/pil/setup.py b/sources/pil/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/test/setup.py b/sources/test/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/tiff/setup.py b/sources/tiff/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/tifffile/setup.py b/sources/tifffile/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/vips/setup.py b/sources/vips/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/sources/zarr/setup.py b/sources/zarr/setup.py
@@ -17,7 +17,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/utilities/converter/setup.py b/utilities/converter/setup.py
@@ -20,7 +20,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)

diff --git a/utilities/tasks/setup.py b/utilities/tasks/setup.py
@@ -20,7 +20,7 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
+    if os.getenv('CIRCLE_BRANCH') in ('master', ) and not os.getenv('TOX_ENV_NAME'):
         return ''
     else:
         return get_local_node_and_date(version)