Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable python 3.10 testing on CI #715

Merged
merged 1 commit into from
Dec 7, 2021
+16 −19
Merged

Enable python 3.10 testing on CI #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,13 @@ workflows:
branches:
ignore:
- gh-pages
# - py310:
# filters:
# tags:
# only: /^v.*/
# branches:
# ignore:
# - gh-pages
- py310:
filters:
tags:
only: /^v.*/
branches:
ignore:
- gh-pages
- lint_and_docs:
filters:
tags:
Expand Down Expand Up @@ -315,7 +315,7 @@ workflows:
- py37
- py38
- py39
# - py310
- py310
- lint_and_docs
filters:
tags:
Expand All @@ -328,7 +328,7 @@ workflows:
- py37
- py38
- py39
# - py310
- py310
- lint_and_docs
filters:
tags:
Expand All @@ -351,6 +351,6 @@ workflows:
- py37
- py38
- py39
# - py310
- py310
- lint_and_docs
- wheels
6 changes: 2 additions & 4 deletions girder/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,14 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3.10',
],
install_requires=[
'enum34>=1.1.6;python_version<"3.4"',
'futures;python_version<"3.4"',
'girder>=3.0.4',
'girder-jobs>=3.0.3',
'girder-worker[girder]>=0.6.0',
'large_image>=1.0.0',
],
extras_require={
'tasks': [
'large-image-tasks',
'large-image-tasks[girder]',
'girder-worker[girder]>=0.6.0',
],
},
include_package_data=True,
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ girder-jobs>=3.0.3
# Don't specify other extras for the converter; they are already present above
-e utilities/converter[stats]
# Girder and worker dependencies are already installed above
-e utilities/tasks
-e utilities/tasks[girder]
-e girder/.
-e girder_annotation/.

Expand Down
2 changes: 0 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ deps =
pytest-custom-exit-code
pytest-girder>=3.0.4
pytest-xdist
celery!=4.4.4,<5
# celery 4.4.4 is broken; avoid it until a new version is released
whitelist_externals =
rm
npx
Expand Down
5 changes: 3 additions & 2 deletions utilities/tasks/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,19 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3.10',
],
install_requires=[
'girder-worker>=0.6.0',
'girder-worker-utils>=0.8.5',
# Packages required by both producer and consumer side installations
'girder-worker-utils>=0.8.5',
],
extras_require={
'girder': [
# Dependencies required on the producer (Girder) side.
'large-image-converter',
'girder-worker[girder]>=0.6.0',
],
'worker': [
# Dependencies required on the consumer (Girder Worker) side.
'large-image-converter[sources]',
'girder-worker[worker]>=0.6.0',
],
},
python_requires='>=3.6',
Expand Down