Merge pull request #65750 from jonringer/update-python-sepaxml

pythonPackages.sepaxml: 2.0.0 -> 2.1.0

pkgs/development/python-modules/elementpath/default.nix

@@ -0,0 +1,26 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  version = "1.1.8";
+  pname = "elementpath";
+
+  src = fetchFromGitHub {
+    owner = "sissaschool";
+    repo = "elementpath";
+    rev = "v${version}";
+    sha256 = "0krczvf8r6pb3hb8qaxl9h2b4qwg180xk66gyxjf002im7ri75aj";
+  };
+
+  # avoid circular dependency with xmlschema which directly depends on this
+  doCheck = false;
+
+  meta = with lib; {
+    description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";
+    homepage = "https://github.com/sissaschool/elementpath";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

pkgs/development/python-modules/fints/default.nix

@@ -1,20 +1,36 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
-  requests, mt-940, sepaxml, bleach, isPy3k }:
+, bleach
+, mt-940
+, pytest
+, requests
+, sepaxml
+}:
 
 buildPythonPackage rec {
-  version = "2.1.1";
+  version = "2.2.0";
   pname = "fints";
-  disabled = !isPy3k;
+  disabled = isPy27;
 
-  src = fetchPypi {
+  src = fetchFromGitHub {
-    inherit pname version;
+    owner = "raphaelm";
-    sha256 = "06p6p0xxw0n10hmf7z4k1l29fya0sja433s6lasjr1bal5asdhaq";
+    repo = "python-fints";
+    rev = "v${version}";
+    sha256 = "1gx173dzdprf3jsc7dss0xax8s6l2hr02qg9m5c4rksb3dl5fl8w";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'sepaxml==2.0.*' 'sepaxml~=2.0'
+  '';
+
   propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
 
-  # no tests included in PyPI package
+  checkInputs = [ pytest ];
-  doCheck = false;
+
+  # ignore network calls and broken fixture
+  checkPhase = ''
+    pytest . --ignore=tests/test_client.py -k 'not robust_mode'
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/raphaelm/python-fints/;

pkgs/development/python-modules/sepaxml/default.nix

@@ -1,17 +1,32 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+, lxml
+, pytest
+, text-unidecode
+, xmlschema
+}:
 
 buildPythonPackage rec {
-  version = "2.0.0";
+  version = "2.1.0";
   pname = "sepaxml";
-  disabled = !isPy3k;
+  disabled = isPy27;
 
-  src = fetchPypi {
+  src = fetchFromGitHub {
-    inherit pname version;
+    owner = "raphaelm";
-    sha256 = "0jhj8fa0lbyaw15q485kyyli9qgrmqr47a6z6pgqm40kwmjghiyc";
+    repo = "python-sepaxml";
+    rev = version;
+    sha256 = "0lkb0nnyxmwvm6gkwls8w2290b66lwz9bv8p39wwcn7flabviwhj";
   };
 
-  # no tests included in PyPI package
+  propagatedBuildInputs = [
-  doCheck = false;
+    text-unidecode
+    xmlschema
+  ];
+
+  checkInputs = [ pytest lxml ];
+
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/raphaelm/python-sepaxml/;

pkgs/development/python-modules/xmlschema/default.nix

@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, elementpath
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.0.13";
+  pname = "xmlschema";
+
+  src = fetchFromGitHub {
+    owner = "sissaschool";
+    repo = "xmlschema";
+    rev = "v${version}";
+    sha256 = "182439gqhlxhr9rdi9ak33z4ffy1w9syhykkckkl6mq050c80qdr";
+  };
+
+  propagatedBuildInputs = [ elementpath ];
+
+  checkInputs = [ pytest ];
+
+  # Ignore broken fixtures, and tests for files which don't exist.
+  # For darwin, we need to explicity say we can't reach network
+  checkPhase = ''
+    substituteInPlace xmlschema/tests/__init__.py \
+      --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #"
+    pytest . \
+      --ignore=xmlschema/tests/test_factory.py \
+      --ignore=xmlschema/tests/test_validators.py \
+      --ignore=xmlschema/tests/test_schemas.py \
+      -k 'not element_tree_import_script'
+  '';
+
+  meta = with lib; {
+    description = "XML Schema validator and data conversion library for Python";
+    homepage = "https://github.com/sissaschool/xmlschema";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -2194,6 +2194,8 @@ in {
 
   elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { };
 
+  elementpath = callPackage ../development/python-modules/elementpath { };
+
   entrypoints = callPackage ../development/python-modules/entrypoints { };
 
   enzyme = callPackage ../development/python-modules/enzyme {};
@@ -4978,6 +4980,8 @@ in {
 
   xml2rfc = callPackage ../development/python-modules/xml2rfc { };
 
+  xmlschema = callPackage ../development/python-modules/xmlschema { };
+
   xmltodict = callPackage ../development/python-modules/xmltodict { };
 
   xarray = callPackage ../development/python-modules/xarray { };