Merge pull request #188 from scrapinghub/gh-182-build

Removed rdflib-jsonld as a dependency (from GH-182)
scrapinghub · Jan 17, 2022 · 70a652e · 70a652e
2 parents 547c8a0 + 4e8ede4
commit 70a652e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -30,4 +30,4 @@ jobs:
         python -m pip install -r requirements-dev.txt
     - name: tox
       run: |
-        tox -e py
+        tox -e `python -c "import sys; print('py' + ''.join(sys.version.split('.')[:2]))"`
diff --git a/requirements.txt b/requirements.txt
@@ -2,8 +2,9 @@
 # pip install -r requirements.txt
 lxml
 requests
-rdflib
-rdflib-jsonld
+rdflib>=6.0.0; python_version>="3.7"
+rdflib<6.0.0; python_version<"3.7"
+rdflib-jsonld<=0.5.0; python_version<"3.7"
 pyrdfa3
 mf2py>=1.1.0
 six>=1.11

diff --git a/setup.py b/setup.py
@@ -38,8 +38,10 @@ def get_version():
     packages=find_packages(exclude=['tests',]),
     package_data={'extruct': ['VERSION']},
     install_requires=['lxml',
-                      'rdflib',
-                      'rdflib-jsonld',
+                      'rdflib<6.0.0;python_version<"3.7"',
+                      'rdflib-jsonld<=0.5.0;python_version<"3.7"',
+                      # rdflib 6.x.y (only on 3.7 and up) contains jsonld
+                      'rdflib>=6.0.0;python_version>="3.7"',
                       'pyrdfa3',
                       'mf2py',
                       'w3lib',

diff --git a/tox.ini b/tox.ini
@@ -8,6 +8,12 @@ deps =
 commands =
     py.test --cov-report=term --cov-report= --cov=extruct {posargs:extruct tests}
 
+[testenv:py36]
+deps =
+    setuptools<58  # https://stackoverflow.com/a/69100830/217088
+commands =
+    pip install -r requirements-dev.txt
+    py.test --cov-report=term --cov-report= --cov=extruct {posargs:extruct tests}
 
 [testenv:py38]
 commands =