diff --git a/.circleci/config.yml b/.circleci/config.yml index 252bd5c..e8d20b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,18 +3,22 @@ version: 2.1 jobs: test: docker: - - image: girder/girder_test:py38-node14 + - image: girder/girder_test:py39-node14 # Use the oldest supported MongoDB # This is equivalent to the deprecated circleci/mongo:-ram image - - image: mongo:3.6 + - image: mongo:4.2 command: bash -c "mkdir /dev/shm/mongo && mongod --storageEngine ephemeralForTest --nojournal --dbpath=/dev/shm/mongo --noauth --bind_ip_all" steps: - checkout - run: - name: Display Python & Tox versions + name: Upgrade pip + command: python -m pip install --upgrade pip + - run: + name: Display Python, Pip & Tox versions command: | python --version + pip --version tox --version - run: name: Run server tests @@ -22,13 +26,21 @@ jobs: test-cli: docker: - - image: circleci/python:3.8 + - image: cimg/python:3.9 # Use the oldest supported MongoDB # This is equivalent to the deprecated circleci/mongo:-ram image - - image: mongo:3.6 + - image: mongo:4.2 command: bash -c "mkdir /dev/shm/mongo && mongod --storageEngine ephemeralForTest --nojournal --dbpath=/dev/shm/mongo --noauth --bind_ip_all" steps: - checkout + - run: + name: Upgrade pip + command: python -m pip install --upgrade pip + - run: + name: Display Python & Pip versions + command: | + python --version + pip --version - run: name: Install server plugin command: pip install .[test] diff --git a/.readthedocs.yml b/.readthedocs.yml index 7221a19..ebe092a 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.9" sphinx: configuration: docs/conf.py diff --git a/CHANGES.rst b/CHANGES.rst index 12ac77a..89e56da 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,11 @@ details, see the commit logs at https://github.com/girder/slicer_package_manager Next Release ============ +Internal +-------- + +* Update `girder`, `girder-hashsum-download`, `girder_client` and `pytest-girder` version from `~3.1.20` to `~3.2.8`. + 0.9.0 ===== diff --git a/pyproject.toml b/pyproject.toml index 1d32b37..74d8a1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,9 @@ [build-system] requires = [ "setuptools>=42", - # Required to support dynmamic version - "girder~=3.1.20", - "girder-hashsum-download~=3.1.20", + # Required to support dynamic version + "girder~=3.2.8", + "girder-hashsum-download~=3.2.8", "html-sanitizer>=2.4.1", 'tomli; python_version<"3.11"', "versioneer", @@ -22,17 +22,18 @@ maintainers = [ ] readme = "README.rst" keywords = ["girder-plugin", "slicer_package_manager"] +license = "Apache-2.0" +license-files = ["LICENSE"] classifiers = [ "Development Status :: 5 - Production/Stable", - "License :: OSI Approved :: Apache Software License", "Natural Language :: English", "Programming Language :: Python :: 3", ] requires-python = ">=3.8" dynamic = ["version"] dependencies = [ - "girder~=3.1.20", - "girder-hashsum-download~=3.1.20", + "girder~=3.2.8", + "girder-hashsum-download~=3.2.8", "html-sanitizer>=2.4.1", ] @@ -42,7 +43,7 @@ slicer_package_manager = "slicer_package_manager:GirderPlugin" [project.optional-dependencies] test = [ "pytest~=7.4.0", # See https://github.com/TvoroG/pytest-lazy-fixture/issues/63 - "pytest-girder~=3.1.20", + "pytest-girder~=3.2.8", "pytest-lazy-fixture", "tox", "virtualenv", diff --git a/python_client/LICENSE b/python_client/LICENSE new file mode 100644 index 0000000..d5e5bc4 --- /dev/null +++ b/python_client/LICENSE @@ -0,0 +1,15 @@ +Apache Software License 2.0 + +Copyright (c) 2020, Jean-Christophe Fillion-Robin + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/python_client/pyproject.toml b/python_client/pyproject.toml index a049ac2..b9b6b11 100644 --- a/python_client/pyproject.toml +++ b/python_client/pyproject.toml @@ -13,9 +13,10 @@ maintainers = [ {name = "Jean-Christophe Fillion-Robin", email = "jchris.fillionr@kitware.com"}, ] readme = "README.rst" +license = "Apache-2.0" +license-files = ["LICENSE"] classifiers = [ "Environment :: Console", - "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", ] @@ -23,7 +24,7 @@ requires-python = ">=3.8" dynamic = ["version"] dependencies = [ "click>=6.7", - "girder_client~=3.1.20", + "girder_client~=3.2.8", "tabulate", ] @@ -31,7 +32,7 @@ dependencies = [ test = [ "pytest", "pytest-vcr", - "pytest-girder~=3.1.20", + "pytest-girder~=3.2.8", ] [project.urls] diff --git a/requirements-docs.txt b/requirements-docs.txt index 0b5c75b..39171d4 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -1,5 +1,5 @@ -girder~=3.1.20 -girder_client~=3.1.20 +girder~=3.2.8 +girder_client~=3.2.8 sphinx sphinx-issues sphinx_rtd_theme diff --git a/tox.ini b/tox.ini index dd8abd1..5bd4cc2 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ basepython = python3 [testenv:test] deps = pytest~=7.4.0 # See https://github.com/TvoroG/pytest-lazy-fixture/issues/63 - pytest-girder==3.1.20 + pytest-girder==3.2.8 pytest-lazy-fixture commands = pytest {posargs}