Merge pull request #144276 from mweinelt/python/sunpy

python3Packages.sunpy: upgrade and fix build

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

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "4.2";
+  version = "4.3.1";
   format = "pyproject";
 
   disabled = !isPy3k; # according to setup.py
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a";
+    sha256 = "sha256-LTlRIjtOt/No/K2Mg0DSc3TF2OO2NaY2J1rNs481zVE=";
   };
 
   nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ];

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

@@ -1,14 +1,15 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, tqdm
-, aiohttp
-, pytest
 , setuptools-scm
+, aioftp
+, aiohttp
+, tqdm
+, aiofiles
+, pytestCheckHook
 , pytest-localserver
 , pytest-socket
 , pytest-asyncio
-, aioftp
 }:
 
 buildPythonPackage rec {
@@ -30,17 +31,23 @@ buildPythonPackage rec {
     aioftp
   ];
 
-  checkInputs = [
-    pytest
-    pytest-localserver
-    pytest-socket
-    pytest-asyncio
+  pythonImportsCheck = [
+    "parfive"
   ];
 
-  checkPhase = ''
-    # these two tests require network connection
-    pytest parfive -k "not test_ftp and not test_ftp_http"
-  '';
+  checkInputs = [
+    aiofiles
+    pytest-asyncio
+    pytest-localserver
+    pytest-socket
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    "test_ftp"
+    "test_ftp_pasv_command"
+    "test_ftp_http"
+  ];
 
   meta = with lib; {
     description = "A HTTP and FTP parallel file downloader";

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

@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , isPy3k
+, setuptools-scm
 , liberfa
 , packaging
 , numpy
@@ -10,17 +11,25 @@
 buildPythonPackage rec {
   pname = "pyerfa";
   format = "pyproject";
-  version = "1.7.1.1";
+  version = "2.0.0";
 
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09i2qcsvxd3q04a5yaf6fwzg79paaslpksinan9d8smj7viql15i";
+    sha256 = "sha256-+QQjHhpXD5REDgYUB5lZCJUQf5QoR7UqdTzoHJYJFi0=";
   };
 
-  nativeBuildInputs = [ packaging ];
-  propagatedBuildInputs = [ liberfa numpy ];
+  nativeBuildInputs = [
+    packaging
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    liberfa
+    numpy
+  ];
+
   preBuild = ''
     export PYERFA_USE_SYSTEM_LIBERFA=1
   '';

pkgs/development/python-modules/pytest-astropy/default.nix

@@ -17,7 +17,7 @@
 buildPythonPackage rec {
   pname = "pytest-astropy";
   version = "0.9.0";
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
@@ -43,11 +43,8 @@ buildPythonPackage rec {
     pytest-remotedata
   ];
 
-  # pytest-astropy is a meta package and has no tests
-  #doCheck = false;
-  checkPhase = ''
-    # 'doCheck = false;' still invokes the pytestCheckPhase which makes the build fail
-  '';
+  # pytest-astropy is a meta package that only propagates requirements
+  doCheck = false;
 
   meta = with lib; {
     description = "Meta-package containing dependencies for testing";

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

@@ -1,6 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
+, setuptools-scm
 , astropy
 , pytestCheckHook
 , pytest-doctestplus
@@ -17,6 +18,10 @@ buildPythonPackage rec {
     sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd";
   };
 
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [ astropy ];
 
   checkInputs = [ pytestCheckHook pytest-doctestplus scipy ];

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

@@ -31,12 +31,12 @@
 
 buildPythonPackage rec {
   pname = "sunpy";
-  version = "3.0.2";
+  version = "3.1.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5dcd2c5cbf2f419da00abde00798d067b515c2f082ce63f4fbe1de47682c1c41";
+    sha256 = "sha256-0DF+/lQpsQKO5omBKJAe3gBjQ6QQb50IdRSacIRL/JA=";
   };
 
   nativeBuildInputs = [
@@ -86,6 +86,20 @@ buildPythonPackage rec {
   disabledTestPaths = [
     "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml"
     "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml"
+    # requires mpl-animators package
+    "sunpy/map/tests/test_compositemap.py"
+    "sunpy/map/tests/test_mapbase.py"
+    "sunpy/map/tests/test_mapsequence.py"
+    "sunpy/map/tests/test_plotting.py"
+    "sunpy/map/tests/test_reproject_to.py"
+    "sunpy/net/tests/test_helioviewer.py"
+    "sunpy/timeseries/tests/test_timeseriesbase.py"
+    "sunpy/visualization/animator/tests/test_basefuncanimator.py"
+    "sunpy/visualization/animator/tests/test_mapsequenceanimator.py"
+    "sunpy/visualization/animator/tests/test_wcs.py"
+    "sunpy/visualization/colormaps/tests/test_cm.py"
+    # requires cdflib package
+    "sunpy/timeseries/tests/test_timeseries_factory.py"
   ];
 
   pytestFlagsArray = [