diff --git a/girder/setup.py b/girder/setup.py index 287095f17..2f36ae35e 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/girder_annotation/setup.py b/girder_annotation/setup.py index 775a644fc..3f5ff5f16 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/setup.py b/setup.py index 779352c32..aced82d9a 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -25,7 +25,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/bioformats/setup.py b/sources/bioformats/setup.py index 40527a54f..41d5a523c 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/deepzoom/setup.py b/sources/deepzoom/setup.py index dc2ca53f0..ff9dd6f9b 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/dicom/setup.py b/sources/dicom/setup.py index c65b0845b..0d86108af 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/dummy/setup.py b/sources/dummy/setup.py index 47a81859c..ec939b9d9 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/gdal/setup.py b/sources/gdal/setup.py index 91b603737..240fb8c89 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/mapnik/setup.py b/sources/mapnik/setup.py index 0768cd686..7b1ed9be0 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/multi/setup.py b/sources/multi/setup.py index b702bb327..fa7442ea1 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/nd2/setup.py b/sources/nd2/setup.py index 6263e478b..1d4057a26 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/ometiff/setup.py b/sources/ometiff/setup.py index eea57c04d..1cca7ac47 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/openjpeg/setup.py b/sources/openjpeg/setup.py index 1b220f81a..ed6e4c6c2 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/openslide/setup.py b/sources/openslide/setup.py index 5a24f2150..a3e8332c2 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/pil/setup.py b/sources/pil/setup.py index 62f04d1e7..72ccb0ae9 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/rasterio/setup.py b/sources/rasterio/setup.py index 6bc6d6184..4b9e19b31 100644 --- a/sources/rasterio/setup.py +++ b/sources/rasterio/setup.py @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/test/setup.py b/sources/test/setup.py index d6afffcad..b2a16dd06 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/tiff/setup.py b/sources/tiff/setup.py index 72e1b340e..5ac78875a 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/tifffile/setup.py b/sources/tifffile/setup.py index fbe4e88d8..251ebe2e1 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/vips/setup.py b/sources/vips/setup.py index a812f7f0f..668cd25a9 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/sources/zarr/setup.py b/sources/zarr/setup.py index 18547c21e..eda5c7ff4 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -27,7 +27,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/utilities/converter/setup.py b/utilities/converter/setup.py index eb91311f3..68256a4cb 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -30,7 +30,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = '' diff --git a/utilities/tasks/setup.py b/utilities/tasks/setup.py index aeb1407a4..43c0fc6f5 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', ) and not os.getenv('TOX_ENV_NAME'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -30,7 +30,7 @@ def prerelease_local_scheme(version): from setuptools_scm import get_version version = get_version(root='../..', local_scheme=prerelease_local_scheme) - limit_version = f'>={version}' if '+' not in version else '' + limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else '' except (ImportError, LookupError): limit_version = ''