From 0cdd25eba30d1ba3a7fe0ee67b3ea91935998b14 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Mon, 28 Dec 2020 13:49:17 -0500 Subject: [PATCH] python3Packages.sunpy: 1.0.6 -> 2.0.6 --- .../python-modules/sunpy/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 6830c7c1343..6a455ce49eb 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -1,12 +1,12 @@ { stdenv , lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder - , asdf , astropy , astropy-helpers +, astropy-extension-helpers , beautifulsoup4 , drms , glymur @@ -29,16 +29,18 @@ buildPythonPackage rec { pname = "sunpy"; - version = "1.0.6"; + version = "2.0.6"; disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "sunpy"; - repo = pname; - rev = "v${version}"; - sha256 = "0j2yfhfxgi95rig8cfp9lvszb7694gq90jvs0xrb472hwnzgh2sk"; + src = fetchPypi { + inherit pname version; + sha256 = "109flghca42yhsm2w5xicqhyx1mc8c3vlwvadbn65fz3lhysqj67"; }; + nativeBuildInputs = [ + astropy-extension-helpers + ]; + propagatedBuildInputs = [ numpy scipy @@ -66,16 +68,11 @@ buildPythonPackage rec { pytest-mock ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - export HOME=$(mktemp -d) - ''; - # darwin has write permission issues doCheck = stdenv.isLinux; # ignore documentation tests checkPhase = '' - pytest sunpy -k 'not rst' + PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' ''; meta = with lib; {