Merge pull request #19 from casework/bump_rdflib

Bump rdflib

Author: ajnelson-nist

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:
@@ -31,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]

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