Skip to content

Commit

Permalink
use rdflib<7 upper bound (for compatibility with prov)
Browse files Browse the repository at this point in the history
  • Loading branch information
jfennick committed Jun 11, 2024
1 parent 30d0c7a commit 74ea21b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cwltool.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN rm /wheels/schema_salad*
RUN pip install "black~=22.0"
# galaxy-util 22.1.x depends on packaging<22, but black 23.x needs packaging>22
RUN SCHEMA_SALAD_USE_MYPYC=1 MYPYPATH=mypy-stubs pip wheel --no-binary schema-salad \
$(grep schema.salad requirements.txt) "black~=22.0" --wheel-dir=/wheels # --verbose
$(grep schema.salad requirements.txt) "black~=22.0" "rdflib<7" --wheel-dir=/wheels # --verbose
RUN pip install --force-reinstall --no-index --no-warn-script-location \
--root=/pythonroot/ /wheels/*.whl
# --force-reinstall to install our new mypyc compiled schema-salad package
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
requests>=2.6.1
ruamel.yaml>=0.16.0,<0.19
rdflib>=4.2.2,<7.1
rdflib>=4.2.2,<7
shellescape>=3.4.1,<3.9
schema-salad>=8.4.20230426093816,<9
prov==2.0.1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"requests >= 2.6.1", # >= 2.6.1 to workaround
# https://github.com/ionrock/cachecontrol/issues/137
"ruamel.yaml >= 0.16, < 0.19",
"rdflib >= 4.2.2, < 7.1.0",
"rdflib >= 4.2.2, < 7",
"shellescape >= 3.4.1, < 3.9",
"schema-salad >= 8.4.20230426093816, < 9",
"prov == 2.0.1",
Expand Down

0 comments on commit 74ea21b

Please sign in to comment.