git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #144276 from mweinelt/python/sunpy

python3Packages.sunpy: upgrade and fix build

commit48fe29f748ad2e80356f1e917fdcd93ba78d2455 authorThiago Kenji Okada <thiagokokada@gmail.com> dateFri 5 Nov 2021, 19:41 (5 years ago) parent06c89cb678cf22
6 files changed+56−24
compare with master
unifiedsplit
pkgs/development/python-modules/astropy/default.nix+2−2 pkgs/development/python-modules/parfive/default.nix+17−10 pkgs/development/python-modules/pyerfa/default.nix+13−4 pkgs/development/python-modules/pytest-astropy/default.nix+3−6 pkgs/development/python-modules/radio_beam/default.nix+5 pkgs/development/python-modules/sunpy/default.nix+16−2
pkgs/development/python-modules/astropy/default.nix+2−2
@@ -15,14 +15,14 @@
1515
1616buildPythonPackage rec {
1717 pname = "astropy";
18− version = "4.2";
18+ version = "4.3.1";
1919 format = "pyproject";
2020
2121 disabled = !isPy3k; # according to setup.py
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a";
25+ sha256 = "sha256-LTlRIjtOt/No/K2Mg0DSc3TF2OO2NaY2J1rNs481zVE=";
2626 };
2727
2828 nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ];
pkgs/development/python-modules/parfive/default.nix+17−10
@@ -1,14 +1,15 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, tqdm
5−, aiohttp
6−, pytest
74, setuptools-scm
5+, aioftp
6+, aiohttp
7+, tqdm
8+, aiofiles
9+, pytestCheckHook
810, pytest-localserver
911, pytest-socket
1012, pytest-asyncio
11−, aioftp
1213}:
1314
1415buildPythonPackage rec {
@@ -30,17 +31,23 @@ buildPythonPackage rec {
3031 aioftp
3132 ];
3233
34+ pythonImportsCheck = [
35+ "parfive"
36+ ];
37+
3338 checkInputs = [
34− pytest
39+ aiofiles
40+ pytest-asyncio
3541 pytest-localserver
3642 pytest-socket
37− pytest-asyncio
43+ pytestCheckHook
3844 ];
3945
40− checkPhase = ''
41− # these two tests require network connection
42− pytest parfive -k "not test_ftp and not test_ftp_http"
43− '';
46+ disabledTests = [
47+ "test_ftp"
48+ "test_ftp_pasv_command"
49+ "test_ftp_http"
50+ ];
4451
4552 meta = with lib; {
4653 description = "A HTTP and FTP parallel file downloader";
pkgs/development/python-modules/pyerfa/default.nix+13−4
@@ -2,6 +2,7 @@
22, buildPythonPackage
33, fetchPypi
44, isPy3k
5+, setuptools-scm
56, liberfa
67, packaging
78, numpy
@@ -10,17 +11,25 @@
1011buildPythonPackage rec {
1112 pname = "pyerfa";
1213 format = "pyproject";
13− version = "1.7.1.1";
14+ version = "2.0.0";
1415
1516 doCheck = false;
1617
1718 src = fetchPypi {
1819 inherit pname version;
19− sha256 = "09i2qcsvxd3q04a5yaf6fwzg79paaslpksinan9d8smj7viql15i";
20+ sha256 = "sha256-+QQjHhpXD5REDgYUB5lZCJUQf5QoR7UqdTzoHJYJFi0=";
2021 };
2122
22− nativeBuildInputs = [ packaging ];
23− propagatedBuildInputs = [ liberfa numpy ];
23+ nativeBuildInputs = [
24+ packaging
25+ setuptools-scm
26+ ];
27+
28+ propagatedBuildInputs = [
29+ liberfa
30+ numpy
31+ ];
32+
2433 preBuild = ''
2534 export PYERFA_USE_SYSTEM_LIBERFA=1
2635 '';
pkgs/development/python-modules/pytest-astropy/default.nix+3−6
@@ -17,7 +17,7 @@
1717buildPythonPackage rec {
1818 pname = "pytest-astropy";
1919 version = "0.9.0";
20− disabled = pythonOlder "3.6";
20+ disabled = pythonOlder "3.7";
2121
2222 src = fetchPypi {
2323 inherit pname version;
@@ -43,11 +43,8 @@ buildPythonPackage rec {
4343 pytest-remotedata
4444 ];
4545
46− # pytest-astropy is a meta package and has no tests
47− #doCheck = false;
48− checkPhase = ''
49− # 'doCheck = false;' still invokes the pytestCheckPhase which makes the build fail
50− '';
46+ # pytest-astropy is a meta package that only propagates requirements
47+ doCheck = false;
5148
5249 meta = with lib; {
5350 description = "Meta-package containing dependencies for testing";
pkgs/development/python-modules/radio_beam/default.nix+5
@@ -1,6 +1,7 @@
11{ lib
22, fetchPypi
33, buildPythonPackage
4+, setuptools-scm
45, astropy
56, pytestCheckHook
67, pytest-doctestplus
@@ -17,6 +18,10 @@ buildPythonPackage rec {
1718 sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd";
1819 };
1920
21+ nativeBuildInputs = [
22+ setuptools-scm
23+ ];
24+
2025 propagatedBuildInputs = [ astropy ];
2126
2227 checkInputs = [ pytestCheckHook pytest-doctestplus scipy ];
pkgs/development/python-modules/sunpy/default.nix+16−2
@@ -31,12 +31,12 @@
3131
3232buildPythonPackage rec {
3333 pname = "sunpy";
34− version = "3.0.2";
34+ version = "3.1.0";
3535 disabled = pythonOlder "3.6";
3636
3737 src = fetchPypi {
3838 inherit pname version;
39− sha256 = "5dcd2c5cbf2f419da00abde00798d067b515c2f082ce63f4fbe1de47682c1c41";
39+ sha256 = "sha256-0DF+/lQpsQKO5omBKJAe3gBjQ6QQb50IdRSacIRL/JA=";
4040 };
4141
4242 nativeBuildInputs = [
@@ -86,6 +86,20 @@ buildPythonPackage rec {
8686 disabledTestPaths = [
8787 "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml"
8888 "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml"
89+ # requires mpl-animators package
90+ "sunpy/map/tests/test_compositemap.py"
91+ "sunpy/map/tests/test_mapbase.py"
92+ "sunpy/map/tests/test_mapsequence.py"
93+ "sunpy/map/tests/test_plotting.py"
94+ "sunpy/map/tests/test_reproject_to.py"
95+ "sunpy/net/tests/test_helioviewer.py"
96+ "sunpy/timeseries/tests/test_timeseriesbase.py"
97+ "sunpy/visualization/animator/tests/test_basefuncanimator.py"
98+ "sunpy/visualization/animator/tests/test_mapsequenceanimator.py"
99+ "sunpy/visualization/animator/tests/test_wcs.py"
100+ "sunpy/visualization/colormaps/tests/test_cm.py"
101+ # requires cdflib package
102+ "sunpy/timeseries/tests/test_timeseries_factory.py"
89103 ];
90104
91105 pytestFlagsArray = [