From b5a04aee4e69359805e6839398693df2060313d3 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 27 Oct 2021 15:32:24 -0400 Subject: [PATCH 1/2] Require rdflib >= 6.0.2 This lets us remove the restriction on `pyparsing`. References: * https://github.com/RDFLib/rdflib/issues/1370 Signed-off-by: Alex Nelson --- setup.cfg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 0f51d10..743d984 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,12 +16,9 @@ classifiers = [options] include_package_data = true -# TODO The constraint on pyparsing can be removed when rdflib Issue #1190 is resolved. -# https://github.com/RDFLib/rdflib/issues/1190 install_requires = pandas - pyparsing < 3.0.0 - rdflib >= 6.0.1 + rdflib >= 6.0.2 requests tabulate packages = find: From 8025299a6f79b4ea067959dd347d499a1a27207b Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 27 Oct 2021 15:34:57 -0400 Subject: [PATCH 2/2] Remove tests around Python 3.6 detection rdflib 6.0.0 moved us to Python >= 3.7, so the <3.7 tests are now moot. Signed-off-by: Alex Nelson --- setup.cfg | 1 - tests/Makefile | 16 +++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/setup.cfg b/setup.cfg index 743d984..a99193f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,6 @@ python_requires = >=3.7 console_scripts = case_file = case_utils.case_file:main case_sparql_construct = case_utils.case_sparql_construct:main - # Note that numpy (pandas dependency, and pandas is dependency of case_sparql_select) is only supported in Python >= 3.7. case_sparql_select = case_utils.case_sparql_select:main [options.package_data] diff --git a/tests/Makefile b/tests/Makefile index bb4eaf6..3676436 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -72,11 +72,8 @@ all-case_sparql_construct: \ all-case_sparql_select: \ .venv.done.log - # Only descend if python>=3.7, due to pandas dependency unsatisfiable in 3.6.x. - # Boolean explanation: sys.exit(False) has exit status 0. - venv/bin/python3 -c 'import sys ; sys.exit(not (sys.version_info < (3, 7)))' \ - || $(MAKE) \ - --directory case_sparql_select + $(MAKE) \ + --directory case_sparql_select # These check calls are provided in preferred run-order. check: \ @@ -106,12 +103,9 @@ check-case_sparql_construct: \ check-case_sparql_select: \ .venv.done.log - # Only descend if python>=3.7, due to pandas dependency unsatisfiable in 3.6.x. - # Boolean explanation: sys.exit(False) has exit status 0. - venv/bin/python3 -c 'import sys ; sys.exit(not (sys.version_info < (3, 7)))' \ - || $(MAKE) \ - --directory case_sparql_select \ - check + $(MAKE) \ + --directory case_sparql_select \ + check check-isomorphic_diff: \ .venv.done.log