From 1898efc3bf8a90afc82bc81eca12f1faa939ca7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 05:07:10 +0100 Subject: [PATCH 01/13] python312Packages.aioacaia: 0.1.10 -> 0.1.11 https://github.com/zweckj/aioacaia/releases/tag/v0.1.11 --- pkgs/development/python-modules/aioacaia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix index 955fcfec24ea..a92d44a6bb30 100644 --- a/pkgs/development/python-modules/aioacaia/default.nix +++ b/pkgs/development/python-modules/aioacaia/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioacaia"; - version = "0.1.10"; + version = "0.1.11"; pyproject = true; disabled = pythonOlder "3.12"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "aioacaia"; rev = "refs/tags/v${version}"; - hash = "sha256-Lp7sYnVzk1w7zgKDtoBMrzArTNAQ3jgt4Ch3uJ8ZDyY="; + hash = "sha256-9lRF3NrJ/Zl7ZOihiUiflxCjUi9WHjovgbpFebJJl9M="; }; build-system = [ setuptools ]; From 5a82527e06557bb41cfd617c78dd935b806234a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:39:02 +0100 Subject: [PATCH 02/13] python312Packages.aiounifi: 81 -> 81 https://github.com/Kane610/aiounifi/releases/tag/v81 --- pkgs/development/python-modules/aiounifi/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 1d325c1eb803..e8e4bf09195c 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -7,6 +7,7 @@ orjson, pytest-aiohttp, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, segno, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "80"; + version = "81"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,15 +26,13 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-320ptaKT+6mKUj9y+MvGovp4/XVbYIlDTb9lLXY7c1w="; + hash = "sha256-QuECmv/xWTNsC42JmPlYwN710Pu6L9jNbtOPJsUdM9k="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "setuptools==75.6.0" "setuptools" \ --replace-fail "wheel==" "wheel>=" - - sed -i '/--cov=/d' pyproject.toml ''; build-system = [ setuptools ]; @@ -48,6 +47,7 @@ buildPythonPackage rec { aioresponses pytest-aiohttp pytest-asyncio + pytest-cov-stub pytestCheckHook trustme ]; From c127489e0c034ea692e9adc791a2719b97cd98cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:39:08 +0100 Subject: [PATCH 03/13] python312Packages.deebot-client: 9.2.0 -> 9.3.0 https://github.com/DeebotUniverse/client.py/releases/tag/9.3.0 --- pkgs/development/python-modules/deebot-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 19771c391496..a1a60d3976d7 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "9.2.0"; + version = "9.3.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-M1O0fSfli/kktfR+RB0pLCiUPriml+NQYbNFa0KZmRE="; + hash = "sha256-3+gVtBpOvkqQSA12ive8bbNPwv1Jmc5aZu1uCgWVsm4="; }; pythonRelaxDeps = [ From d10cdbd0c621347bd0ae39076fd974b7c0e6ab1b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:39:40 +0100 Subject: [PATCH 04/13] python312Packages.plugwise: 1.6.0 -> 1.6.3 https://github.com/plugwise/python-plugwise/releases/tag/v1.6.3 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 08717a6a1c23..191f26a59db7 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.6.0"; + version = "1.6.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-+pnKcjqS9kIRjC2YRynOqTjTuAXRYOthYWC/CKDqSNc="; + hash = "sha256-REWU3ngf93HUVDnyiErML41E+nPoqphfhBKmAYvV2+U="; }; postPatch = '' From 22f32bcfc490415acd618119d6ef6b2564365098 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:39:58 +0100 Subject: [PATCH 05/13] amend! python312Packages.aiounifi: 81 -> 81 python312Packages.aiounifi: 80 -> 81 https://github.com/Kane610/aiounifi/releases/tag/v81 From 241e951586e156897a38d216b82d042c8350200e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:40:35 +0100 Subject: [PATCH 06/13] python312Packages.reolink-aio: 0.11.4 -> 0.11.5 https://github.com/starkillerOG/reolink_aio/releases/tag/0.11.5 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index dc7e453ee6e5..70daa1f7829c 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.11.4"; + version = "0.11.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-h4mHRNmzrFAUQ0qQkzAMevO9hqV4Uueivr8wwor636Q="; + hash = "sha256-9CKpkwqlRTcA/a5bBCT/3y3odWyRzLElLPtemhg1hcM="; }; build-system = [ setuptools ]; From 473d55c32f206d756a82bab33094127fdfc8f2d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:42:16 +0100 Subject: [PATCH 07/13] python312Packages.bellows: 0.42.2 -> 0.42.5 https://github.com/zigpy/bellows/releases/tag/0.42.5 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 659cae97220d..4a0311743316 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.42.2"; + version = "0.42.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-qLTlkdX0nPTUEkVBgzStbYYAi6XpGIfs/KvC/EC8svE="; + hash = "sha256-RdNJmIhJR4Ubb4hppFkde8EeYHtFSoJp3CJPGj0463U="; }; postPatch = '' From 03d80c3b5e9f700d7b713b83a28747cd536ce507 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:42:54 +0100 Subject: [PATCH 08/13] python312Packages.zha: 0.0.41 -> 0.0.42 https://github.com/zigpy/zha/releases/tag/0.0.42 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index fee751e56093..4ac2dac1f230 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.41"; + version = "0.0.42"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-qtv61rh6qwsjBjUHJ5RWnFWBiPOUW03dRAHO2mq/4II="; + hash = "sha256-iju/WjndlwEZjforoVyoIb6oTJNlvkEnsoQH2d6tFlQ="; }; postPatch = '' From 21bbe3f2745919c038b30a221b5dc8c59fc5e688 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:50:09 +0100 Subject: [PATCH 09/13] home-assistant.intents: 2024.12.4 -> 2024.12.9 https://github.com/home-assistant/intents/releases/tag/2024.12.9 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index ad16c06902d2..1acce31705b2 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.12.4"; + version = "2024.12.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-5mSMezDPJmDaWdL5GeoED3CzjoJRU1CoDZL+6bK7x2Q="; + hash = "sha256-tjJLm3SCSKy2PWahzpEOHz1PgD1VNuxxpszhBWPrcOw="; }; build-system = [ From e0b6e1eda1e0923ee1e6d589b1895929a4667b92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 16:50:18 +0100 Subject: [PATCH 10/13] home-assistant: 2024.12.1 -> 2024.12.2 https://github.com/home-assistant/core/releases/tag/2024.12.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aace85eb8f89..6ee9f8c63b7f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.12.1"; + version = "2024.12.2"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b7cffa9d6272..1fdbde26cd73 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -461,7 +461,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.12.1"; + hassVersion = "2024.12.2"; in python.pkgs.buildPythonApplication rec { @@ -482,13 +482,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-Gmm8PfgxJYlTEGYKcteSMFbxDWFqmZ/Gt0qbuMe7oHg="; + hash = "sha256-jkIXvU5mPNp/sWtbVVN+SwydiHAkfkhjQ9s0SoqZhYY="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-oQ53syzdVjd8HiO83YloDczDXDweZY4muAFB4HR8SJQ="; + hash = "sha256-72f40oVVgjf6XDCwkcZteuPjm/seoN651+wv3AlZDec="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 8eca6cd446e7..9004847c457c 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241127.6"; + version = "20241127.7"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-wNIkAuedlgHO05rGnxJHFOH2W5eQ45yGWK+tjLRLERo="; + hash = "sha256-kK47PO8RrDwslEY6l41fqi7/Uuym6YiBl4E5VpGrg80="; }; # there is nothing to strip in this package From eacd071c49cbdb7cfdb9dc73dd38287be8b91b13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 17:13:26 +0100 Subject: [PATCH 11/13] python312Packages.homeassistant-stubs: 2024.12.1 -> 2024.12.2 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.12.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 97eac3171990..007065c64c9f 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.12.1"; + version = "2024.12.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-j00wgk4oHZXNAJkosppVXMprDKeqvDMt+aq0MDms1gA="; + hash = "sha256-9wn+ZRie9eQT6J7nnYCHo9bpKWwcb6tqQnJoEmKGAxk="; }; build-system = [ From ee5fabe3d259fd43d75ffe5f5d80b51011a4f08a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 22:44:36 +0100 Subject: [PATCH 12/13] python312Packages.astropy-iers-data: 0.2024.9.23.0.31.43 -> 0.2024.12.9.0.36.21 https://github.com/astropy/astropy-iers-data/compare/refs/tags/v0.2024.9.23.0.31.43...v0.2024.12.9.0.36.21 --- .../python-modules/astropy-iers-data/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index 62c728f2f931..633ebaec21ca 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -5,12 +5,11 @@ pythonOlder, setuptools, setuptools-scm, - wheel, }: buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2024.9.23.0.31.43"; + version = "0.2024.12.9.0.36.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,13 +18,12 @@ buildPythonPackage rec { owner = "astropy"; repo = "astropy-iers-data"; rev = "refs/tags/v${version}"; - hash = "sha256-PGr8meqVs9l15+k5DHmcPcGK96ydN0nRUOBVfvCtRUg="; + hash = "sha256-SN4qDBY3hi0Gj+AH3SSDi5+hKrHMNgPR/Y6HR2Vid0A="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; pythonImportsCheck = [ "astropy_iers_data" ]; From ab434bac2f8fa506142a147bbff4ed5ef08f7f1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 23:56:24 +0100 Subject: [PATCH 13/13] python312Packages.astropy: 6.1.4-> 7.0.0 https://docs.astropy.org/en/stable/whatsnew/7.0.html https://docs.astropy.org/en/stable/changelog.html#version-7-0-0-2024-11-21 --- .../python-modules/astropy/default.nix | 99 ++++++++++++++++--- 1 file changed, 86 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 956d39cfdc3a..4e26f583b2f9 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -5,40 +5,66 @@ pythonOlder, # build time - astropy-extension-helpers, cython, + extension-helpers, setuptools, setuptools-scm, - # testing - pytestCheckHook, - stdenv, - pytest-xdist, - pytest-astropy, - - # runtime + # dependencies astropy-iers-data, numpy, packaging, pyerfa, pyyaml, + + # optional-depedencies + scipy, + matplotlib, + ipython, + ipywidgets, + ipykernel, + pandas, + certifi, + dask, + h5py, + pyarrow, + beautifulsoup4, + html5lib, + sortedcontainers, + pytz, + jplephem, + mpmath, + asdf, + asdf-astropy, + bottleneck, + fsspec, + s3fs, + + # testing + pytestCheckHook, + stdenv, + pytest-xdist, + pytest-astropy-header, + pytest-astropy, + threadpoolctl, + }: buildPythonPackage rec { pname = "astropy"; - version = "6.1.4"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-NhVY4rCTqZvr5p8f1H+shqGSYHpMFu05ugqACyq2DDQ="; + hash = "sha256-6S18n+6G6z34cU5d1Bu/nxY9ND4aGD2Vv2vQnkMTyUA="; }; build-system = [ - astropy-extension-helpers cython + extension-helpers setuptools setuptools-scm ]; @@ -51,11 +77,54 @@ buildPythonPackage rec { pyyaml ]; + optional-dependencies = lib.fix (self: { + recommended = [ + scipy + matplotlib + ]; + ipython = [ + ipython + ]; + jupyter = [ + ipywidgets + ipykernel + # ipydatagrid + pandas + ] ++ self.ipython; + all = + [ + certifi + dask + h5py + pyarrow + beautifulsoup4 + html5lib + sortedcontainers + pytz + jplephem + mpmath + asdf + asdf-astropy + bottleneck + fsspec + s3fs + ] + ++ self.recommended + ++ self.ipython + ++ self.jupyter + ++ dask.optional-dependencies.array + ++ fsspec.optional-dependencies.http; + }); + nativeCheckInputs = [ pytestCheckHook pytest-xdist + pytest-astropy-header pytest-astropy - ]; + threadpoolctl + ] ++ optional-dependencies.recommended; + + pythonImportsCheck = [ "astropy" ]; # Not running it inside the build directory. See: # https://github.com/astropy/astropy/issues/15316#issuecomment-1722190547 @@ -64,8 +133,12 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) ''; - pythonImportsCheck = [ "astropy" ]; + disabledTests = [ + # tests for all availability of all optional deps + "test_basic_testing_completeness" + "test_all_included" + # May fail due to parallelism, see: # https://github.com/astropy/astropy/issues/15441 "TestUnifiedOutputRegistry"