summary refs log tree commit diff
path: root/pkgs/development/python-modules/atomman
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2019-11-27 16:43:32 -0800
committerJon <jonringer@users.noreply.github.com>2019-11-27 19:26:43 -0800
commitf2db3204825a98555f4cf6dc00f3a9f56aae3734 (patch)
treece816f56909c43bec78cd77edd69cb1c942aaf8f /pkgs/development/python-modules/atomman
parent0bff5f6438ff6143cd324e033906b514f7c4ef45 (diff)
downloadnixpkgs-f2db3204825a98555f4cf6dc00f3a9f56aae3734.tar
nixpkgs-f2db3204825a98555f4cf6dc00f3a9f56aae3734.tar.gz
nixpkgs-f2db3204825a98555f4cf6dc00f3a9f56aae3734.tar.bz2
nixpkgs-f2db3204825a98555f4cf6dc00f3a9f56aae3734.tar.lz
nixpkgs-f2db3204825a98555f4cf6dc00f3a9f56aae3734.tar.xz
nixpkgs-f2db3204825a98555f4cf6dc00f3a9f56aae3734.tar.zst
nixpkgs-f2db3204825a98555f4cf6dc00f3a9f56aae3734.zip
python3Packages.atomman: 1.2.8 -> 1.3.0
Diffstat (limited to 'pkgs/development/python-modules/atomman')
-rw-r--r--pkgs/development/python-modules/atomman/default.nix33
1 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix
index ef69ee91d38..d873700f32a 100644
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -1,34 +1,33 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, xmltodict
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+, cython
 , datamodeldict
-, numpy
 , matplotlib
-, scipy
-, pandas
-, cython
 , numericalunits
+, numpy
+, pandas
 , pytest
+, scipy
+, toolz
+, xmltodict
 }:
 
 buildPythonPackage rec {
-  version = "1.2.8";
+  version = "1.3.0";
   pname = "atomman";
+  disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ed099fdceca2d733e81afb08d777e8e852a6e53660d6d268f3739b8d323ced9";
+  src = fetchFromGitHub {
+    owner = "usnistgov";
+    repo  = "atomman";
+    rev = "v${version}";
+    sha256 = "09pfykd96wmw00s3kgabghykjn8b4yjml4ybpi7kwy7ygdmzcx51";
   };
 
   checkInputs = [ pytest ];
-  propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits ];
-
-  # tests not included with Pypi release
-  doCheck = false;
+  propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits toolz ];
 
   checkPhase = ''
-    py.test tests
+    py.test tests -k 'not test_atomic'
   '';
 
   meta = with stdenv.lib; {