Skip to content

Commit

Permalink
specific cwltool & celery versions to resolve dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed Apr 4, 2022
1 parent 80ed423 commit 5cb716d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ conda-config: conda-base ## setup configuration of the conda environment
.PHONY: conda-install
conda-install: conda-env
@echo "Updating conda packages..."
@bash -c '$(CONDA_CMD) conda install -c conda-forge proj'
@bash -c '$(CONDA_CMD) conda install -y -c conda-forge proj'

.PHONY: conda-env
conda-env: conda-base conda-config ## create the conda environment
Expand Down
8 changes: 3 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 5cb716d

Please sign in to comment.