From 41c2ee612c6f2c0f8637f1b4df14ae27294d8e81 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 12:47:00 +0900 Subject: [PATCH 1/4] python311Packages.radio-beam: rename from radio_beam --- .../python-modules/{radio_beam => radio-beam}/default.nix | 5 ++--- pkgs/development/python-modules/spectral-cube/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{radio_beam => radio-beam}/default.nix (91%) diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix similarity index 91% rename from pkgs/development/python-modules/radio_beam/default.nix rename to pkgs/development/python-modules/radio-beam/default.nix index 1a349736787a..ae76098a52e3 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -12,13 +12,12 @@ }: buildPythonPackage rec { - pname = "radio_beam"; + pname = "radio-beam"; version = "0.3.4"; format = "pyproject"; src = fetchPypi { - inherit version; - pname = "radio-beam"; + inherit pname version; sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; }; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index abeb5d0f9277..d1c85407fdd6 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -11,7 +11,7 @@ , pytest-astropy , pytestCheckHook , pythonOlder -, radio_beam +, radio-beam , setuptools-scm }: @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ astropy casa-formats-io - radio_beam + radio-beam joblib dask ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..97474da3e010 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -359,6 +359,7 @@ mapAliases ({ Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 + radio_beam = radio-beam; # added 2023-11-04 ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228cabf855d1..7fb57545d582 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11987,7 +11987,7 @@ self: super: with self; { radian = callPackage ../development/python-modules/radian { }; - radio_beam = callPackage ../development/python-modules/radio_beam { }; + radio-beam = callPackage ../development/python-modules/radio-beam { }; radios = callPackage ../development/python-modules/radios { }; From 097a352b7083fdd7207efbe295ac830b059b3dff Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 13:03:25 +0900 Subject: [PATCH 2/4] python211Packages.radio-beam: refactor - use SRI hash - adopt pyproject instead of format - add pythonImportsCheck - remove unnecessary meta.platforms --- pkgs/development/python-modules/radio-beam/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index ae76098a52e3..7283bdf60b43 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "radio-beam"; version = "0.3.4"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; + hash = "sha256-4DIlfxUBMDhz8lHADHSxGIGAeFx5Z3+0RDCY1ReFIwk="; }; nativeBuildInputs = [ @@ -38,11 +38,14 @@ buildPythonPackage rec { pytest-astropy ]; + pythonImportsCheck = [ + "radio_beam" + ]; + meta = { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; license = lib.licenses.bsd3; - platforms = lib.platforms.all; maintainers = with lib.maintainers; [ smaret ]; }; } From 056d3fba4bbd5bfa266882e800d54e7c70a3b722 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 13:05:27 +0900 Subject: [PATCH 3/4] python311Packages.radio-beam: 0.3.4 -> 0.3.6 Diff: https://github.com/radio-astro-tools/radio-beam/compare/v0.3.4...v0.3.6 --- pkgs/development/python-modules/radio-beam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index 7283bdf60b43..78737edf0d76 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "radio-beam"; - version = "0.3.4"; + version = "0.3.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4DIlfxUBMDhz8lHADHSxGIGAeFx5Z3+0RDCY1ReFIwk="; + hash = "sha256-U+IjOTt7x9uzUl7IcQRu2s+MBKF/OR+sLddvHmp9hqU="; }; nativeBuildInputs = [ From e25e4aee789507559ba25546f25e774ab79278cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:42:21 +0100 Subject: [PATCH 4/4] python311Packages.radio-beam: add changelog to meta - use with lib for meta --- pkgs/development/python-modules/radio-beam/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index 78737edf0d76..41653caaa3e0 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -42,11 +42,12 @@ buildPythonPackage rec { "radio_beam" ]; - meta = { + meta = with lib; { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ smaret ]; + changelog = "https://github.com/radio-astro-tools/radio-beam/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; }; }