Skip to content

Commit

Permalink
pin setuptools<58 to resolve cwltools older dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed Apr 20, 2022
1 parent 5cb716d commit 4520ffc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,10 @@ install-pkg: install-pip ## install application package dependencies
@bash -c "$(CONDA_CMD) pip install $(PIP_XARGS) -r "$(APP_ROOT)/requirements.txt" --no-cache-dir"
@echo "Install with pip complete."

# FIXME:
# pre-install 'rdflib-jsonld' to match setuptools, which will then be replaced by more recent when installing celery
# required by: cwltool -> schema_salad
# don't use 'PIP_XARGS' in this case since extra features could not yet be supported by pip being installed/updated
.PHONY: install-sys
install-sys: ## install system dependencies and required installers/runners
@echo "Installing system dependencies..."
@bash -c '$(CONDA_CMD) pip install "setuptools>=57,<58"'
@bash -c '$(CONDA_CMD) pip install "rdflib-jsonld==0.5.0"'
@bash -c '$(CONDA_CMD) pip install --upgrade -r "$(APP_ROOT)/requirements-sys.txt"'

.PHONY: install-pip
Expand Down
6 changes: 4 additions & 2 deletions requirements-sys.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
pip>=20.2.2; python_version <= "3.6"
pip>=22.0.4; python_version >= "3.7"
# celery enforces some specific versions of setuptools (<60)
setuptools>=57,!=58.*; python_version <= "3.6"
# FIXME: when cwltool and rdflib-jsonld versions are updated to avoid failing setuptools install, update more recent
setuptools>=59,<59.7; python_version >= "3.7"
# 'rdflib-jsonld==0.5.0' (required by: cwltool -> schema_salad) uses 'use_2to3' which is invalid for setuptools>=58
# setuptools<58; python_version <= "3.6"
# setuptools>=59,<59.7; python_version >= "3.7"
setuptools<58

0 comments on commit 4520ffc

Please sign in to comment.