#65 upgrade requirements

requirements-dev.txt

@@ -2,8 +2,8 @@
 --requirement requirements.txt
 
 # Documentation
-Sphinx==1.7.8
+Sphinx==4.3.0
 
 #testing
-pytest==3.7.4
-pytest-cov==2.5.1
+pytest==6.2.5
+pytest-cov==3.0.0

requirements.txt

@@ -1,4 +1,4 @@
-requests==2.19.1
-#skosprovider==0.6.0
--e git+https://github.com/koenedaele/skosprovider.git#egg=skosprovider
-rdflib==4.2.2
+requests==2.26.0
+skosprovider==1.0.0
+#-e git+https://github.com/koenedaele/skosprovider.git#egg=skosprovider
+rdflib==6.0.2

skosprovider_heritagedata/providers.py

@@ -284,7 +284,7 @@ def _get_items(self, service, params, **kwargs):
 
         request = self.service_scheme_uri + "/" + service
         try:
-            res = self.session.get(request, params=params)
+            res = self.session.get(request, params=params, allow_redirects=True)
         except ConnectionError as e:
             raise ProviderUnavailableException(f"Request could not be executed - Request: {request} - Params: {params}")
         if res.status_code == 404:

skosprovider_heritagedata/utils.py

@@ -90,7 +90,7 @@ def things_from_graph(graph, concept_scheme):
 def _create_from_subject_typelist(graph, subject, typelist):
     list = []
     for p in typelist:
-        term = SKOS.term(p)
+        term = SKOS._NS.term(p)
         list.extend(_create_from_subject_predicate(graph, subject, term))
     return list
 
@@ -149,8 +149,10 @@ def uri_to_graph(uri, **kwargs):
         raise ProviderUnavailableException("URI not available: %s" % uri)
     if res.status_code == 404:
         return False
-    graph.parse(data=res.content)
-    #heritagedata.org returns a empy page/graph when a resource does not exists (statsu_code 200). For this reason we return False if the graph is empty
+    content_type = res.headers['Content-Type'].split(';')[0]
+    graph.parse(data=res.content, format=content_type)
+    # heritagedata.org returns a empy page/graph when a resource does not exists
+    # (statsu_code 200). For this reason we return False if the graph is empty
     if len(graph) == 0:
         return False
     return graph