Merge pull request #144805 from fabaff/bump-rdflib

python3Packages.rdflib: 6.0.1 -> 6.0.2

authored by

Fabian Affolter and committed by
GitHub
4ce91f33 708d14fb

+74 -28
+8 -1
pkgs/development/python-modules/prov/default.nix
··· 28 28 pydot 29 29 ]; 30 30 31 + # Multiple tests are out-dated and failing 32 + doCheck = false; 33 + 34 + pythonImportsCheck = [ 35 + "prov" 36 + ]; 37 + 31 38 meta = with lib; { 32 - description = "A Python library for W3C Provenance Data Model (PROV)"; 39 + description = "Python library for W3C Provenance Data Model (PROV)"; 33 40 homepage = "https://github.com/trungdong/prov"; 34 41 license = licenses.mit; 35 42 maintainers = with maintainers; [ ashgillman ];
+43 -17
pkgs/development/python-modules/rdflib/default.nix
··· 1 - { buildPythonPackage 1 + { lib 2 + , buildPythonPackage 2 3 , fetchPypi 3 - , isodate 4 4 , html5lib 5 - , SPARQLWrapper 5 + , isodate 6 6 , networkx 7 7 , nose 8 - , python 8 + , pyparsing 9 + , tabulate 10 + , pandas 11 + , pytestCheckHook 12 + , pythonOlder 13 + , SPARQLWrapper 9 14 }: 10 15 11 16 buildPythonPackage rec { 12 17 pname = "rdflib"; 13 - version = "6.0.1"; 18 + version = "6.0.2"; 19 + format = "setuptools"; 20 + 21 + disabled = pythonOlder "3.7"; 14 22 15 23 src = fetchPypi { 16 24 inherit pname version; 17 - sha256 = "f071caff0b68634e4a7bd1d66ea3416ac98f1cc3b915938147ea899c32608728"; 25 + sha256 = "sha256-YTauBWABR07ir/X8W5VuYqEcOpxmuw89nAqqX7tWhU4="; 18 26 }; 19 27 20 - propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; 28 + propagatedBuildInputs = [ 29 + isodate 30 + html5lib 31 + pyparsing 32 + SPARQLWrapper 33 + ]; 21 34 22 - checkInputs = [ networkx nose ]; 35 + checkInputs = [ 36 + networkx 37 + pandas 38 + nose 39 + tabulate 40 + pytestCheckHook 41 + ]; 23 42 24 - # Python 2 syntax 25 - # Failing doctest 26 - doCheck = false; 43 + disabledTests = [ 44 + # Requires network access 45 + "api_key" 46 + "BerkeleyDBTestCase" 47 + "test_bad_password" 48 + "test_service" 49 + "testGuessFormatForParse" 50 + ]; 27 51 28 - checkPhase = '' 29 - ${python.interpreter} run_tests.py 30 - ''; 52 + pythonImportsCheck = [ 53 + "rdflib" 54 + ]; 31 55 32 - meta = { 33 - description = "A Python library for working with RDF, a simple yet powerful language for representing information"; 34 - homepage = "http://www.rdflib.net/"; 56 + meta = with lib; { 57 + description = "Python library for working with RDF"; 58 + homepage = "https://rdflib.readthedocs.io"; 59 + license = licenses.bsd3; 60 + maintainers = with maintainers; [ ]; 35 61 }; 36 62 }
+23 -10
pkgs/misc/pylode/default.nix
··· 1 1 { lib 2 - , python3Packages 2 + , python3 3 3 , fetchFromGitHub 4 4 }: 5 5 6 - python3Packages.buildPythonApplication rec { 7 - pname = "pyLODE"; 6 + python3.pkgs.buildPythonApplication rec { 7 + pname = "pylode"; 8 8 version = "2.12.0"; 9 + format = "setuptools"; 10 + 11 + disabled = python3.pythonOlder "3.6"; 9 12 10 13 src = fetchFromGitHub { 11 14 owner = "RDFLib"; ··· 14 17 sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8="; 15 18 }; 16 19 17 - propagatedBuildInputs = with python3Packages; [ 18 - python-dateutil 20 + propagatedBuildInputs = with python3.pkgs; [ 21 + beautifulsoup4 19 22 falcon 20 - gunicorn 21 - isodate 22 23 jinja2 23 24 markdown 25 + python-dateutil 24 26 rdflib 25 27 requests 26 - six 27 - beautifulsoup4 28 + ]; 29 + 30 + postPatch = '' 31 + substituteInPlace requirements.txt \ 32 + --replace "rdflib==6.0.0" "rdflib" 33 + ''; 34 + 35 + # Path issues with the tests 36 + doCheck = false; 37 + 38 + pythonImportsCheck = [ 39 + "pylode" 28 40 ]; 29 41 30 42 meta = with lib; { 31 - description = "An OWL ontology documentation tool using Python and templating, based on LODE"; 43 + description = "OWL ontology documentation tool using Python and templating, based on LODE"; 32 44 homepage = "https://github.com/RDFLib/pyLODE"; 45 + # Next release will move to BSD3 33 46 license = licenses.gpl3Only; 34 47 maintainers = with maintainers; [ koslambrou ]; 35 48 };