diff --git a/girder/setup.py b/girder/setup.py index 6c2d1a796..287095f17 100644 --- 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 index c461fd7a6..775a644fc 100644 --- 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 index 10b6036e7..779352c32 100644 --- 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 index ff702ca77..40527a54f 100644 --- 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 index 22f758ff7..dc2ca53f0 100644 --- 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 index 1d41d9a71..c65b0845b 100644 --- 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 index c50107f25..47a81859c 100644 --- 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 index 81be056aa..91b603737 100644 --- 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 index b6e82a022..0768cd686 100644 --- 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 index d1e741299..b702bb327 100644 --- 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 index 2f66d4d61..6263e478b 100644 --- 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 index d909c43d5..eea57c04d 100644 --- 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 index a5f7ebc0c..1b220f81a 100644 --- 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 index 0080c0060..5a24f2150 100644 --- 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 index 7b85dd776..62f04d1e7 100644 --- 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 index 6bbfaddfe..d6afffcad 100644 --- 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 index e00fbe64c..72e1b340e 100644 --- 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 index 3fbfd7d00..fbe4e88d8 100644 --- 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 index 7f15b095b..a812f7f0f 100644 --- 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 index f243738ed..18547c21e 100644 --- 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 index 3cbe33b51..eb91311f3 100644 --- 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 index 2535e48bd..aeb1407a4 100644 --- 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)