Merge pull request #62 from Harold-Solbrig/issue-60-reqtxt

regenerated requirements.txt, relax tests that assume no namespace pollution

Pipfile

@@ -7,7 +7,7 @@ verify_ssl = true
 requests = "*"
 
 [packages]
-rdflib = ">=6.2.0, <8"
+rdflib = ">=6.2.0, <7"
 rdflib-shim = "*"
 pyjsg = ">=0.11.6"
 rfc3987 = "*"

requirements.txt

@@ -14,5 +14,5 @@ bcp47
 jsonasobj
 pyjsg>=0.11.6
 rdflib-shim
-rdflib==6.2.0
+rdflib>=6.2.0,<7
 rfc3987

tests/__init__.py

@@ -13,5 +13,5 @@
 
 # rdflib 6.1.1 has a LONG list of pre-assigned prefixes.  This breaks some of our tests and the rdflib
 # community promises to fix it (some day...).  For now, we won't run tests on this version
-RDFLIB_PREFIXES_ARE_BROKEN = rdflib.__version__ == "6.1.1"
-PREFIXES_BROKEN_MESSAGE = "rdflib 6.1.1 emits a LOT of prefixes.  Test skipped!"
+RDFLIB_PREFIXES_ARE_BROKEN = rdflib.__version__ >= "6.1.1"
+PREFIXES_BROKEN_MESSAGE = "rdflib 6.1.1+ emits a LOT of prefixes.  Test skipped!"

tests/test_base/test_assertions.py

@@ -47,7 +47,7 @@ def test_differentindividuals_rdf(self):
 <http://example.org/a#Alex> a owl:NamedIndividual ;
     owl:differentFrom <http://example.org/a#Bob> .
 
-<http://example.org/a#Bob> a owl:NamedIndividual .""", g.serialize(format="turtle").decode().strip())
+<http://example.org/a#Bob> a owl:NamedIndividual .""", g.serialize(format="turtle").strip())
 
     def test_classassertion(self):
         self.assertEqual('ClassAssertion( a:GriffinFamilyMember a:Peter_Griffin )',
@@ -79,7 +79,7 @@ def test_objectpropertyassertion_rdf(self):
 
 ns1:hasBrother a <http://www.w3.org/2002/07/owl#ObjectProperty> .
 
-ns1:Stewie a <http://www.w3.org/2002/07/owl#NamedIndividual> .""", g.serialize(format='turtle').decode())
+ns1:Stewie a <http://www.w3.org/2002/07/owl#NamedIndividual> .""", g.serialize(format='turtle'))
         if diff:
             print(diff)
             self.fail()