From ead1253f6ad46532c31709039ff7e0906bd4b268 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 20:04:41 +0100 Subject: [PATCH 1/6] python310Packages.plotnine: add changelog to meta --- pkgs/development/python-modules/plotnine/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 9e0b1c817613..9c71ac58f555 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DompMBXzxx1oRKx6qfsNoJuQj199+n3V1opcoysuvOo="; + hash = "sha256-DompMBXzxx1oRKx6qfsNoJuQj199+n3V1opcoysuvOo="; }; postPatch = '' @@ -69,7 +69,8 @@ buildPythonPackage rec { meta = with lib; { description = "Grammar of graphics for python"; - homepage = "https://plotnine.readthedocs.io/en/stable"; + homepage = "https://plotnine.readthedocs.io/"; + changelog = "https://github.com/has2k1/plotnine/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; From 748ead902a04f1622d994d9c0f6daf0dd5b4ba87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 20:09:53 +0100 Subject: [PATCH 2/6] python310Packages.mizani: add changelog to meta --- pkgs/development/python-modules/mizani/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 8cd4eb98330b..8fa9aa116039 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Scales for Python"; homepage = "https://github.com/has2k1/mizani"; + changelog = "https://github.com/has2k1/mizani/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ samuela ]; }; From 780be3d6171f42beaabc8d286cef067d3804495b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 20:17:21 +0100 Subject: [PATCH 3/6] python310Packages.mizani: 0.7.4 -> 0.8.1 Diff: https://github.com/has2k1/mizani/compare/v0.7.4...v0.8.1 Changelog: https://github.com/has2k1/mizani/releases/tag/v0.8.1 --- pkgs/development/python-modules/mizani/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 8fa9aa116039..5777f31bcc41 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -7,12 +7,13 @@ , pytestCheckHook , pythonOlder , scipy +, setuptools-scm }: buildPythonPackage rec { pname = "mizani"; - version = "0.7.4"; - format = "setuptools"; + version = "0.8.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "has2k1"; repo = pname; rev = "v${version}"; - hash = "sha256-oqbo/aQ5L1nQO8BvXH6/8PBPiWcv2m/LUjwow8+J90w="; + hash = "sha256-VE0M5/s8/XmmAe8EE/FcHBFGc9ppVWuYOYMuajQeZww="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ matplotlib palettable From 0207af197f27734f57e1a3c7f75e4023683398b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 20:31:06 +0100 Subject: [PATCH 4/6] python310Packages.plotnine: 0.9.0 -> 0.10.1 Changelog: https://github.com/has2k1/plotnine/releases/tag/v0.10.1 --- .../python-modules/plotnine/default.nix | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 9c71ac58f555..e6cb98a30542 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -1,26 +1,36 @@ { lib -, fetchPypi -, buildPythonPackage -, matplotlib -, scipy -, patsy -, pandas -, statsmodels -, pytestCheckHook -, geopandas -, scikit-misc , adjusttext -, mizani }: +, buildPythonPackage +, fetchPypi +, geopandas +, matplotlib +, mizani +, pandas +, patsy +, pytestCheckHook +, pythonOlder +, scikit-misc +, scipy +, setuptools-scm +, statsmodels +}: buildPythonPackage rec { pname = "plotnine"; - version = "0.9.0"; + version = "0.10.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DompMBXzxx1oRKx6qfsNoJuQj199+n3V1opcoysuvOo="; + hash = "sha256-2RKgS2ONz4IsUaZ4i4VmQjI0jVFfFR2zpkwAAZZvaEE="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=plotnine --cov-report=xml" "" From c2a92301eef731b6253d4bd5510f4c90e18fca1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 22:13:04 +0100 Subject: [PATCH 5/6] python310Packages.distrax: mark as broken --- pkgs/development/python-modules/distrax/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index be277f97ba5e..6ca29f81c622 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -6,7 +6,8 @@ , chex , dm-haiku , pytestCheckHook -, jaxlib }: +, jaxlib +}: buildPythonPackage rec { pname = "distrax"; @@ -53,5 +54,7 @@ buildPythonPackage rec { homepage = "https://github.com/deepmind/distrax"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; + # Broken on all platforms (starting 2022-07-27) + broken = true; }; } From 5066f089f885a12c0dc44ca610885f3e9f695b43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 22:17:36 +0100 Subject: [PATCH 6/6] python310Packages.statsmodels: 0.13.4 -> 0.13.5 Changelog: https://github.com/statsmodels/statsmodels/releases/tag/v0.13.5 --- .../python-modules/statsmodels/default.nix | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 9a6e3cfb6663..704d53963d4a 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -1,38 +1,53 @@ { lib , buildPythonPackage +, cython , fetchPypi -, isPy27 -, nose +, matplotlib , numpy -, scipy , pandas , patsy -, cython -, matplotlib +, pythonOlder +, scipy +, setuptools-scm }: buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.4"; - disabled = isPy27; + version = "0.13.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-juXRtp9kvA6TeWZ0Ve41hYSdXmvNPz5I5Yumytrf6tU="; + hash = "sha256-WTUmrK4cD9oOpsSEOfZ8OUMJTFQv52n4uQ/p5sbMSHE="; }; - nativeBuildInputs = [ cython ]; - checkInputs = [ nose ]; - propagatedBuildInputs = [ numpy scipy pandas patsy matplotlib ]; + nativeBuildInputs = [ + cython + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + scipy + pandas + patsy + matplotlib + ]; # Huge test suites with several test failures doCheck = false; - pythonImportsCheck = [ "statsmodels" ]; - meta = { + pythonImportsCheck = [ + "statsmodels" + ]; + + meta = with lib; { description = "Statistical computations and models for use with SciPy"; homepage = "https://www.github.com/statsmodels/statsmodels"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + changelog = "https://github.com/statsmodels/statsmodels/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; }; }