git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #144805 from fabaff/bump-rdflib

python3Packages.rdflib: 6.0.1 -> 6.0.2

commit4ce91f33400bb0b633467cfebd2023b1b7b1dbb8 authorFabian Affolter <fabian@affolter-engineering.ch> dateSat 6 Nov 2021, 10:31 (5 years ago) parent708d14f1a36853
3 files changed+74−28
compare with master
unifiedsplit
pkgs/development/python-modules/prov/default.nix+8−1 pkgs/development/python-modules/rdflib/default.nix+43−17 pkgs/misc/pylode/default.nix+23−10
pkgs/development/python-modules/prov/default.nix+8−1
@@ -28,8 +28,15 @@ buildPythonPackage rec {
2828 pydot
2929 ];
3030
31+ # Multiple tests are out-dated and failing
32+ doCheck = false;
33+
34+ pythonImportsCheck = [
35+ "prov"
36+ ];
37+
3138 meta = with lib; {
32− description = "A Python library for W3C Provenance Data Model (PROV)";
39+ description = "Python library for W3C Provenance Data Model (PROV)";
3340 homepage = "https://github.com/trungdong/prov";
3441 license = licenses.mit;
3542 maintainers = with maintainers; [ ashgillman ];
pkgs/development/python-modules/rdflib/default.nix+43−17
@@ -1,36 +1,62 @@
1−{ buildPythonPackage
1+{ lib
2+, buildPythonPackage
23, fetchPypi
3−, isodate
44, html5lib
5−, SPARQLWrapper
5+, isodate
66, networkx
77, nose
8−, python
8+, pyparsing
9+, tabulate
10+, pandas
11+, pytestCheckHook
12+, pythonOlder
13+, SPARQLWrapper
914}:
1015
1116buildPythonPackage rec {
1217 pname = "rdflib";
13− version = "6.0.1";
18+ version = "6.0.2";
19+ format = "setuptools";
20+
21+ disabled = pythonOlder "3.7";
1422
1523 src = fetchPypi {
1624 inherit pname version;
17− sha256 = "f071caff0b68634e4a7bd1d66ea3416ac98f1cc3b915938147ea899c32608728";
25+ sha256 = "sha256-YTauBWABR07ir/X8W5VuYqEcOpxmuw89nAqqX7tWhU4=";
1826 };
1927
20− propagatedBuildInputs = [isodate html5lib SPARQLWrapper ];
28+ propagatedBuildInputs = [
29+ isodate
30+ html5lib
31+ pyparsing
32+ SPARQLWrapper
33+ ];
2134
22− checkInputs = [ networkx nose ];
35+ checkInputs = [
36+ networkx
37+ pandas
38+ nose
39+ tabulate
40+ pytestCheckHook
41+ ];
2342
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+ ];
2751
28− checkPhase = ''
29− ${python.interpreter} run_tests.py
30− '';
52+ pythonImportsCheck = [
53+ "rdflib"
54+ ];
3155
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; [ ];
3561 };
3662}
pkgs/misc/pylode/default.nix+23−10
@@ -1,11 +1,14 @@
11{ lib
2−, python3Packages
2+, python3
33, fetchFromGitHub
44}:
55
6−python3Packages.buildPythonApplication rec {
7− pname = "pyLODE";
6+python3.pkgs.buildPythonApplication rec {
7+ pname = "pylode";
88 version = "2.12.0";
9+ format = "setuptools";
10+
11+ disabled = python3.pythonOlder "3.6";
912
1013 src = fetchFromGitHub {
1114 owner = "RDFLib";
@@ -14,22 +17,32 @@ python3Packages.buildPythonApplication rec {
1417 sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8=";
1518 };
1619
17− propagatedBuildInputs = with python3Packages; [
18− python-dateutil
20+ propagatedBuildInputs = with python3.pkgs; [
21+ beautifulsoup4
1922 falcon
20− gunicorn
21− isodate
2223 jinja2
2324 markdown
25+ python-dateutil
2426 rdflib
2527 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"
2840 ];
2941
3042 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";
3244 homepage = "https://github.com/RDFLib/pyLODE";
45+ # Next release will move to BSD3
3346 license = licenses.gpl3Only;
3447 maintainers = with maintainers; [ koslambrou ];
3548 };