-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
specific cwltool & celery versions to resolve dependencies
- Loading branch information
1 parent
80ed423
commit 5cb716d
Showing
2 changed files
with
4 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ boto3 | |
# windows fixes until | ||
# https://github.com/celery/billiard/issues/260 | ||
# https://github.com/celery/billiard/issues/313 | ||
billiard!=2.*; sys_platform != "win32" # avoid issue with use_2to3 | ||
billiard>2; sys_platform != "win32" # avoid issue with use_2to3 | ||
billiard>3.2,<3.4; sys_platform == "win32" | ||
# FIXME: pymongo>=4 breaks with kombu corresponding to pinned Celery (https://github.com/crim-ca/weaver/issues/386) | ||
# celery >=4.4.3 breaks on 'future.utils' import | ||
|
@@ -14,7 +14,7 @@ billiard>3.2,<3.4; sys_platform == "win32" | |
celery[mongodb]<4; sys_platform == "win32" # pyup: ignore | ||
# FIXME: use celery 5.2 specifically to resolve security issue | ||
# best match for now since cannot use setuptools>=59 until cwltool/rdflib-jsonld are updated | ||
celery[mongodb]>=5.1; sys_platform != "win32" and python_version >= "3.7" # pyup: ignore | ||
celery[mongodb]==5.2.2; sys_platform != "win32" and python_version >= "3.7" # pyup: ignore | ||
# celery[mongodb]>=5.2.3; sys_platform != "win32" and python_version >= "3.7" # pyup: ignore | ||
# technically, >=5.2 preferred to resolve security issue, but dependency resolver cannot find it | ||
# FIXME: drop support? more recent versions not avilable for end-of-life python | ||
|
@@ -34,7 +34,7 @@ cryptography | |
# FIXME: remove extra CWL code and let it handle it for use | ||
# - changes since cause error with invalid get_listing import location | ||
# - https://github.com/crim-ca/weaver/issues/154 | ||
cwltool>2,<=3.0.20200324120055 | ||
cwltool==3.0.20200324120055 | ||
docker | ||
duration | ||
git+https://github.com/ESGF/[email protected]#egg=esgf-compute-api | ||
|
@@ -63,8 +63,6 @@ pyramid_storage | |
pytz | ||
pywps==4.5.1 | ||
pyyaml>=5.2 | ||
# required by: cwltool => schema_salad, make requirement stricter because it has longer wheel build time | ||
rdflib-jsonld>0.5 | ||
requests | ||
requests_file | ||
# let cwltool define ruamel.yaml version (<=0.16.5) | ||
|