Skip to content

Commit 70a652e

Browse files
authored
Merge pull request #188 from scrapinghub/gh-182-build
Removed rdflib-jsonld as a dependency (from GH-182)
2 parents 547c8a0 + 4e8ede4 commit 70a652e

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
python -m pip install -r requirements-dev.txt
3131
- name: tox
3232
run: |
33-
tox -e py
33+
tox -e `python -c "import sys; print('py' + ''.join(sys.version.split('.')[:2]))"`

requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
# pip install -r requirements.txt
33
lxml
44
requests
5-
rdflib
6-
rdflib-jsonld
5+
rdflib>=6.0.0; python_version>="3.7"
6+
rdflib<6.0.0; python_version<"3.7"
7+
rdflib-jsonld<=0.5.0; python_version<"3.7"
78
pyrdfa3
89
mf2py>=1.1.0
910
six>=1.11

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ def get_version():
3838
packages=find_packages(exclude=['tests',]),
3939
package_data={'extruct': ['VERSION']},
4040
install_requires=['lxml',
41-
'rdflib',
42-
'rdflib-jsonld',
41+
'rdflib<6.0.0;python_version<"3.7"',
42+
'rdflib-jsonld<=0.5.0;python_version<"3.7"',
43+
# rdflib 6.x.y (only on 3.7 and up) contains jsonld
44+
'rdflib>=6.0.0;python_version>="3.7"',
4345
'pyrdfa3',
4446
'mf2py',
4547
'w3lib',

tox.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ deps =
88
commands =
99
py.test --cov-report=term --cov-report= --cov=extruct {posargs:extruct tests}
1010

11+
[testenv:py36]
12+
deps =
13+
setuptools<58 # https://stackoverflow.com/a/69100830/217088
14+
commands =
15+
pip install -r requirements-dev.txt
16+
py.test --cov-report=term --cov-report= --cov=extruct {posargs:extruct tests}
1117

1218
[testenv:py38]
1319
commands =

0 commit comments

Comments
 (0)