summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-03-26 19:18:00 +0100
committerGitHub <noreply@github.com>2021-03-26 19:18:00 +0100
commit86ab658c5726d4f718d884c010f86a507f2d7a28 (patch)
treeece97722bfdf36c63d9c47051eab367e3f28034f /pkgs/development/python-modules
parent8f84e8eaa45610565db3080b3dc05d6c765963ec (diff)
parent71b624a1ccd5c792fe5b2486863f6b51205769ab (diff)
downloadnixpkgs-86ab658c5726d4f718d884c010f86a507f2d7a28.tar
nixpkgs-86ab658c5726d4f718d884c010f86a507f2d7a28.tar.gz
nixpkgs-86ab658c5726d4f718d884c010f86a507f2d7a28.tar.bz2
nixpkgs-86ab658c5726d4f718d884c010f86a507f2d7a28.tar.lz
nixpkgs-86ab658c5726d4f718d884c010f86a507f2d7a28.tar.xz
nixpkgs-86ab658c5726d4f718d884c010f86a507f2d7a28.tar.zst
nixpkgs-86ab658c5726d4f718d884c010f86a507f2d7a28.zip
Merge pull request #117696 from rmcgibbo/python3Packages.apptools
python3Packages.apptools: 4.5.0 -> 5.1.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/apptools/default.nix29
1 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index a03b051b11d..a6bb0584018 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -1,34 +1,35 @@
-{ lib, fetchPypi, buildPythonPackage, fetchpatch
+{ lib, fetchPypi, buildPythonPackage
 , configobj, six, traitsui
-, nose, tables, pandas
+, pytestCheckHook, tables, pandas
+, pythonOlder, importlib-resources
 }:
 
 buildPythonPackage rec {
   pname = "apptools";
-  version = "4.5.0";
+  version = "5.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6";
+    sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh";
   };
 
-  # PyTables issue; should be merged in next post-4.5.0 release (#117)
-  patches = [ (fetchpatch {
-      url = "https://github.com/enthought/apptools/commit/3734289d1a0ebd8513fa67f75288add31ed0113c.patch";
-      sha256 = "001012q1ib5cbib3nq1alh9ckzj588bfrywr8brkd1f6y1pgvngk";
-    })
+  propagatedBuildInputs = [
+    configobj
+    six
+    traitsui
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    importlib-resources
   ];
 
-  propagatedBuildInputs = [ configobj six traitsui ];
-
   checkInputs = [
-    nose
     tables
     pandas
+    pytestCheckHook
   ];
 
-  doCheck = true;
-  checkPhase = "HOME=$TMP nosetests";
+  preCheck = ''
+    export HOME=$TMP
+  '';
 
   meta = with lib; {
     description = "Set of packages that Enthought has found useful in creating a number of applications.";