From b7fceb1fd9a1989e08bc7e4063f823cb4e279573 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 5 Nov 2021 16:14:30 +0100
Subject: [PATCH 1/3] python3Packages.rdflib: 6.0.1 -> 6.0.2

---
 .../python-modules/rdflib/default.nix         | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 97a2fe532bc5..5f17bbd03c3e 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -1,36 +1,62 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
-, isodate
 , html5lib
-, SPARQLWrapper
+, isodate
 , networkx
 , nose
-, python
+, pyparsing
+, tabulate
+, pandas
+, pytestCheckHook
+, pythonOlder
+, SPARQLWrapper
 }:
 
 buildPythonPackage rec {
   pname = "rdflib";
-  version = "6.0.1";
+  version = "6.0.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f071caff0b68634e4a7bd1d66ea3416ac98f1cc3b915938147ea899c32608728";
+    sha256 = "sha256-YTauBWABR07ir/X8W5VuYqEcOpxmuw89nAqqX7tWhU4=";
   };
 
-  propagatedBuildInputs = [isodate html5lib SPARQLWrapper ];
+  propagatedBuildInputs = [
+    isodate
+    html5lib
+    pyparsing
+    SPARQLWrapper
+  ];
 
-  checkInputs = [ networkx nose ];
+  checkInputs = [
+    networkx
+    pandas
+    nose
+    tabulate
+    pytestCheckHook
+  ];
 
-  # Python 2 syntax
-  # Failing doctest
-  doCheck = false;
+  disabledTests = [
+    # Requires network access
+    "api_key"
+    "BerkeleyDBTestCase"
+    "test_bad_password"
+    "test_service"
+    "testGuessFormatForParse"
+  ];
 
-  checkPhase = ''
-    ${python.interpreter} run_tests.py
-  '';
+  pythonImportsCheck = [
+    "rdflib"
+  ];
 
-  meta = {
-    description = "A Python library for working with RDF, a simple yet powerful language for representing information";
-    homepage = "http://www.rdflib.net/";
+  meta = with lib; {
+    description = "Python library for working with RDF";
+    homepage = "https://rdflib.readthedocs.io";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 }

From b228c241fb2bebf38819d31c2876f556c58e3b2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 5 Nov 2021 23:28:09 +0100
Subject: [PATCH 2/3] pylode: relax rdflib constraint

---
 pkgs/misc/pylode/default.nix | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix
index 18e112346912..b37ff2366694 100644
--- a/pkgs/misc/pylode/default.nix
+++ b/pkgs/misc/pylode/default.nix
@@ -1,11 +1,14 @@
 { lib
-, python3Packages
+, python3
 , fetchFromGitHub
 }:
 
-python3Packages.buildPythonApplication rec {
-  pname = "pyLODE";
+python3.pkgs.buildPythonApplication rec {
+  pname = "pylode";
   version = "2.12.0";
+  format = "setuptools";
+
+  disabled = python3.pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "RDFLib";
@@ -14,22 +17,32 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
-    python-dateutil
+  propagatedBuildInputs = with python3.pkgs; [
+    beautifulsoup4
     falcon
-    gunicorn
-    isodate
     jinja2
     markdown
+    python-dateutil
     rdflib
     requests
-    six
-    beautifulsoup4
+  ];
+
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "rdflib==6.0.0" "rdflib"
+  '';
+
+  # Path issues with the tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "pylode"
   ];
 
   meta = with lib; {
-    description = "An OWL ontology documentation tool using Python and templating, based on LODE";
+    description = "OWL ontology documentation tool using Python and templating, based on LODE";
     homepage = "https://github.com/RDFLib/pyLODE";
+    # Next release will move to BSD3
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ koslambrou ];
   };

From 1a3685370b1ab651a65d5109e6bf765550dd117f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 5 Nov 2021 20:16:00 +0100
Subject: [PATCH 3/3] python3Packages.proc: disable tests

---
 pkgs/development/python-modules/prov/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index 9844b018518b..101ea7e2e939 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -28,8 +28,15 @@ buildPythonPackage rec {
     pydot
   ];
 
+  # Multiple tests are out-dated and failing
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "prov"
+  ];
+
   meta = with lib; {
-    description = "A Python library for W3C Provenance Data Model (PROV)";
+    description = "Python library for W3C Provenance Data Model (PROV)";
     homepage = "https://github.com/trungdong/prov";
     license = licenses.mit;
     maintainers = with maintainers; [ ashgillman ];