about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/odfpy
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-03-11 00:43:18 +0000
committerAlyssa Ross <hi@alyssa.is>2019-03-11 00:43:18 +0000
commita6dea5a6f496ea38f56e3c3b4c5d628361cc029f (patch)
tree8300ad67b0135e6816ab38a6ac6f8fdaeccda2f0 /nixpkgs/pkgs/development/python-modules/odfpy
parent8779e0045c9f218caeb1dd1bcdc87e2715ed5be5 (diff)
parent5d3fd3674a66c5b1ada63e2eace140519849c967 (diff)
downloadnixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar
nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.gz
nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.bz2
nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.lz
nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.xz
nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.zst
nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.zip
Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/odfpy')
-rw-r--r--nixpkgs/pkgs/development/python-modules/odfpy/default.nix18
1 files changed, 11 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/odfpy/default.nix b/nixpkgs/pkgs/development/python-modules/odfpy/default.nix
index 161272ce1a73..f4dba0858dbf 100644
--- a/nixpkgs/pkgs/development/python-modules/odfpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/odfpy/default.nix
@@ -3,26 +3,30 @@
 , fetchPypi
 , python
 , isPy27
+, defusedxml
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "odfpy";
-  version = "1.3.6";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b";
+    sha256 = "596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b";
   };
 
-  # Python 2.7 uses a different ordering for xml namespaces.
-  # The testAttributeForeign test expects "ns44", but fails since it gets "ns43"
-  checkPhase = " " + lib.optionalString (!isPy27) ''
-    ${python.interpreter} -m unittest discover -s tests
+  propagatedBuildInputs = [ defusedxml ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
   '';
 
   meta = {
     description = "Python API and tools to manipulate OpenDocument files";
-    homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
+    homepage = https://github.com/eea/odfpy;
     license = lib.licenses.asl20;
   };
 }