Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,44 @@ 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:<version>-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
command: tox

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:<version>-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]
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.8"
python: "3.9"

sphinx:
configuration: docs/conf.py
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
=====

Expand Down
15 changes: 8 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
]

Expand All @@ -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",
Expand Down
15 changes: 15 additions & 0 deletions python_client/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
7 changes: 4 additions & 3 deletions python_client/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@ maintainers = [
{name = "Jean-Christophe Fillion-Robin", email = "[email protected]"},
]
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",
]
requires-python = ">=3.8"
dynamic = ["version"]
dependencies = [
"click>=6.7",
"girder_client~=3.1.20",
"girder_client~=3.2.8",
"tabulate",
]

[project.optional-dependencies]
test = [
"pytest",
"pytest-vcr",
"pytest-girder~=3.1.20",
"pytest-girder~=3.2.8",
]

[project.urls]
Expand Down
4 changes: 2 additions & 2 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down