From 89cc3ebfdff3efc6358b662cfdf1d6628171466a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jun 2023 07:13:14 +0000 Subject: [PATCH 1/3] python310Packages.spectral-cube: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/spectral-cube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 298ac0a27106..21de737f4b8f 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1c0pp82wgl680w2vcwlrrz46sy83z1qs74w5bd691wg0512hv2jx"; + sha256 = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From f67702e65946a2349a93ff6f00d91bc13a4b035b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jun 2023 11:21:29 +0200 Subject: [PATCH 2/3] python310Packages.spectral-cube: update meta --- .../python-modules/spectral-cube/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 21de737f4b8f..53a1ec33634f 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc="; + hash = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,12 +40,12 @@ buildPythonPackage rec { "spectral_cube/tests/test_visualization.py" ]; - meta = { + meta = with lib; { description = "Library for reading and analyzing astrophysical spectral data cubes"; - homepage = "http://radio-astro-tools.github.io"; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ smaret ]; + homepage = "https://spectral-cube.readthedocs.io"; + changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; broken = true; }; } From 4bce6e28c27e294f3504e3a443b387d5798599c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 10:33:37 +0200 Subject: [PATCH 3/3] python311Packages.spectral-cube: unbreak --- .../python-modules/spectral-cube/default.nix | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 53a1ec33634f..252f25ddad2f 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,17 +1,17 @@ { lib , stdenv -, fetchPypi -, buildPythonPackage , aplpy -, joblib , astropy -, casa-formats-io -, radio_beam -, six -, dask -, pytestCheckHook -, pytest-astropy , astropy-helpers +, buildPythonPackage +, casa-formats-io +, dask +, fetchPypi +, joblib +, pytest-astropy +, pytestCheckHook +, pythonOlder +, radio_beam , setuptools-scm }: @@ -20,6 +20,8 @@ buildPythonPackage rec { version = "0.6.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc="; @@ -31,8 +33,19 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ astropy casa-formats-io radio_beam joblib six dask ]; - nativeCheckInputs = [ pytestCheckHook aplpy pytest-astropy ]; + propagatedBuildInputs = [ + astropy + casa-formats-io + radio_beam + joblib + dask + ]; + + nativeCheckInputs = [ + aplpy + pytest-astropy + pytestCheckHook + ]; # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. @@ -40,12 +53,15 @@ buildPythonPackage rec { "spectral_cube/tests/test_visualization.py" ]; + pythonImportsCheck = [ + "spectral_cube" + ]; + meta = with lib; { description = "Library for reading and analyzing astrophysical spectral data cubes"; homepage = "https://spectral-cube.readthedocs.io"; changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; - broken = true; }; }