From 74ea21b4b83e077d53af75290fd901a5ecc3e75c Mon Sep 17 00:00:00 2001
From: Jake Fennick <jake.fennick@axleinfo.com>
Date: Mon, 10 Jun 2024 15:19:30 -1000
Subject: [PATCH] use rdflib<7 upper bound (for compatibility with prov)

---
 cwltool.Dockerfile | 2 +-
 requirements.txt   | 2 +-
 setup.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cwltool.Dockerfile b/cwltool.Dockerfile
index 2b93b8d99..4562f18a6 100644
--- a/cwltool.Dockerfile
+++ b/cwltool.Dockerfile
@@ -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
diff --git a/requirements.txt b/requirements.txt
index 5d9fe6b07..671b9a4ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
diff --git a/setup.py b/setup.py
index 0bc47fe9b..85eb68975 100644
--- a/setup.py
+++ b/setup.py
@@ -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",