diff --git a/.circleci/config.yml b/.circleci/config.yml index 55e858099..ed0b03a06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,5 +56,4 @@ workflows: tags: only: /^v.*/ branches: - only: girder-3 -# Change to master branch when girder-3 becomes the master + only: master diff --git a/girder/setup.py b/girder/setup.py index d74435343..c7621c9bb 100644 --- a/girder/setup.py +++ b/girder/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -42,10 +42,10 @@ def prerelease_local_scheme(version): install_requires=[ 'enum34>=1.1.6;python_version<"3.4"', 'futures;python_version<"3.4"', - 'girder>=3.0.0a2', - 'girder-jobs>=3.0.0a2', - 'girder-worker[girder]>=0.5.1.dev213', - 'large_image>=1.0.0.dev0', + 'girder>=3.0.3', + 'girder-jobs>=3.0.3', + 'girder-worker[girder]>=0.6.0', + 'large_image>=1.0.0', ], extras_require={ 'tasks': [ diff --git a/girder_annotation/setup.py b/girder_annotation/setup.py index d55ec47e9..aedde8059 100644 --- a/girder_annotation/setup.py +++ b/girder_annotation/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,7 +41,7 @@ def prerelease_local_scheme(version): ], install_requires=[ 'jsonschema>=2.5.1', - 'girder-large-image>=1.0.0.dev0', + 'girder-large-image>=1.0.0', 'ujson>=1.35', ], extras_require={ diff --git a/requirements-dev.txt b/requirements-dev.txt index 87acfdb5f..2ccfadd76 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ # Top level dependencies -girder>=3.0.0a5 -girder-jobs>=3.0.0a5 +girder>=3.0.3 +girder-jobs>=3.0.3 -e sources/dummy -e sources/mapnik -e sources/openslide @@ -24,7 +24,7 @@ flake8-docstrings flake8-quotes pytest>=3.6 pytest-cov==2.5 -pytest-girder>=3.0.0a5 +pytest-girder>=3.0.3 pytest-xdist mock tox diff --git a/setup.py b/setup.py index f290e27bd..9157fb2d7 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) diff --git a/sources/dummy/setup.py b/sources/dummy/setup.py index f52cf8969..142fd5d46 100644 --- a/sources/dummy/setup.py +++ b/sources/dummy/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,7 +41,7 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.7' ], install_requires=[ - 'large-image>=1.0.0.dev0', + 'large-image>=1.0.0', ], license='Apache Software License 2.0', keywords='large_image, tile source', diff --git a/sources/mapnik/setup.py b/sources/mapnik/setup.py index 742e14b56..4eb0e39eb 100644 --- a/sources/mapnik/setup.py +++ b/sources/mapnik/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,14 +41,14 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.7' ], install_requires=[ - 'large-image>=1.0.0.dev0', + 'large-image>=1.0.0', 'gdal', 'mapnik', 'palettable', 'pyproj>=2.0.0', ], extras_require={ - 'girder': 'girder-large-image>=1.0.0.dev0', + 'girder': 'girder-large-image>=1.0.0', }, license='Apache Software License 2.0', keywords='large_image, tile source', diff --git a/sources/ometiff/setup.py b/sources/ometiff/setup.py index f6d6b0fc2..1a87ecfeb 100644 --- a/sources/ometiff/setup.py +++ b/sources/ometiff/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,11 +41,11 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.7' ], install_requires=[ - 'large-image>=1.0.0.dev0', - 'large-image-source-tiff>=1.0.0.dev0', + 'large-image>=1.0.0', + 'large-image-source-tiff>=1.0.0', ], extras_require={ - 'girder': 'girder-large-image>=1.0.0.dev0', + 'girder': 'girder-large-image>=1.0.0', }, license='Apache Software License 2.0', keywords='large_image, tile source', diff --git a/sources/openslide/setup.py b/sources/openslide/setup.py index 27606872c..07219cf5e 100644 --- a/sources/openslide/setup.py +++ b/sources/openslide/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,11 +41,11 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.7' ], install_requires=[ - 'large-image>=1.0.0.dev0', + 'large-image>=1.0.0', 'openslide-python>=1.1.0', ], extras_require={ - 'girder': 'girder-large-image>=1.0.0.dev0', + 'girder': 'girder-large-image>=1.0.0', }, license='Apache Software License 2.0', keywords='large_image, tile source', diff --git a/sources/pil/setup.py b/sources/pil/setup.py index 7a06117d9..03d100b0d 100644 --- a/sources/pil/setup.py +++ b/sources/pil/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,10 +41,10 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.7' ], install_requires=[ - 'large-image>=1.0.0.dev0', + 'large-image>=1.0.0', ], extras_require={ - 'girder': 'girder-large-image>=1.0.0.dev0', + 'girder': 'girder-large-image>=1.0.0', }, license='Apache Software License 2.0', keywords='large_image, tile source', diff --git a/sources/test/setup.py b/sources/test/setup.py index 1ad1078f4..dae9f96a5 100644 --- a/sources/test/setup.py +++ b/sources/test/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,7 +41,7 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.7' ], install_requires=[ - 'large-image>=1.0.0.dev0', + 'large-image>=1.0.0', ], license='Apache Software License 2.0', keywords='large_image, tile source', diff --git a/sources/tiff/setup.py b/sources/tiff/setup.py index dfdc1b0df..4740ba5c0 100644 --- a/sources/tiff/setup.py +++ b/sources/tiff/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -41,11 +41,11 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.7' ], install_requires=[ - 'large-image>=1.0.0.dev0', + 'large-image>=1.0.0', 'libtiff>=0.4.1', ], extras_require={ - 'girder': 'girder-large-image>=1.0.0.dev0', + 'girder': 'girder-large-image>=1.0.0', }, license='Apache Software License 2.0', keywords='large_image, tile source', diff --git a/tasks/setup.py b/tasks/setup.py index a4e9b27f9..77a35c656 100644 --- a/tasks/setup.py +++ b/tasks/setup.py @@ -16,7 +16,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in ('master', 'girder-3'): + if os.getenv('CIRCLE_BRANCH') in ('master', ): return '' else: return get_local_node_and_date(version) @@ -39,8 +39,8 @@ def prerelease_local_scheme(version): 'Programming Language :: Python' ], install_requires=[ - 'girder-worker>=0.5.1.dev213', - 'girder_worker_utils>=0.8.5.dev23', + 'girder-worker>=0.6.0', + 'girder-worker-utils>=0.8.5', # Packages required by both producer and consumer side installations 'six>=1.10.0', ],