From d77e13848dd63155aab17d87a3d2c53deb935614 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Jun 2023 13:01:07 +0200 Subject: [PATCH 001/752] python3: 3.10 -> 3.11 Updates the default python version to 3.11, while keeping 3.10 around until after the NixOS 23.11 release. --- pkgs/development/interpreters/python/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c850a3ed6424..b09aec49963e 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -127,7 +127,7 @@ in { enableOptimizations = false; enableLTO = false; mimetypesSupport = false; - } // sources.python310)).overrideAttrs(old: { + } // sources.python311)).overrideAttrs(old: { # TODO(@Artturin): Add this to the main cpython expr strictDeps = true; pname = "python3-minimal"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56b1b2ec4a85..9a92c2e05fee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18045,11 +18045,11 @@ with pkgs; # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python2 = python27; - python3 = python310; + python3 = python311; # pythonPackages further below, but assigned here because they need to be in sync python2Packages = dontRecurseIntoAttrs python27Packages; - python3Packages = dontRecurseIntoAttrs python310Packages; + python3Packages = dontRecurseIntoAttrs python311Packages; pypy = pypy2; pypy2 = pypy27; From f23415e0397f72c116d0d685603ce6aee7a123bc Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 29 Aug 2023 20:34:28 -0700 Subject: [PATCH 002/752] python311Packages.cepa: pull in patch to fix python 3.11 build --- pkgs/development/python-modules/cepa/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index 708decb2964f..67c45a26665b 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, python, mock }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, python +, mock +}: buildPythonPackage rec { pname = "cepa"; @@ -9,6 +15,14 @@ buildPythonPackage rec { hash = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; }; + patches = [ + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/onionshare/cepa/commit/0bf9aee7151e65594c532826bb04636e1d80fb6f.patch"; + hash = "sha256-roSt9N5OvnOOxKZUee86zGXt0AsZCcbBdV2cLz1MB2k="; + }) + ]; + postPatch = '' rm test/unit/installation.py sed -i "/test.unit.installation/d" test/settings.cfg From dbdc0095802278f807979884bd555a2ab7df8a1e Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:48:23 -0700 Subject: [PATCH 003/752] cpplint: patch so that tests pass on python 3.11 --- .../tools/analysis/cpplint/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 7be303a52a48..87344d747bf6 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -1,18 +1,34 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "cpplint"; version = "1.5.5"; + format = "setuptools"; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-JXz2Ufo7JSceZVqYwCRkuAsOR08znZlIUk8GCLAyiI4="; + hash = "sha256-JXz2Ufo7JSceZVqYwCRkuAsOR08znZlIUk8GCLAyiI4="; }; - patches = [ ./0001-Remove-pytest-runner-version-pin.patch ]; + patches = [ + ./0001-Remove-pytest-runner-version-pin.patch + + # The patch below stops using the sre_compile module, which was deprecated + # in Python 3.11 and replaces it with re.compile. Upstream is unsure if it + # should use re.compile or re._compiler.compile, so we should monitor the + # thread for updates. + # + # https://github.com/cpplint/cpplint/pull/214 + # + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/cpplint/cpplint/commit/e84e84f53915ae2a9214e756cf89c573a73bbcd3.patch"; + hash = "sha256-u57AFWaVmGFSsvSGq1x9gZmTsuZPqXvTC7mTfyb2164="; + }) + ]; postPatch = '' patchShebangs cpplint_unittest.py From 31a7d7ba4cc389d4fda0fba97d9be2e1ae393ea7 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 06:10:47 -0700 Subject: [PATCH 004/752] python310Packages.recordlinkage: add missing build dependencies --- pkgs/development/python-modules/recordlinkage/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/recordlinkage/default.nix b/pkgs/development/python-modules/recordlinkage/default.nix index 4d8ab8e8a8c9..7b92cfacebf9 100644 --- a/pkgs/development/python-modules/recordlinkage/default.nix +++ b/pkgs/development/python-modules/recordlinkage/default.nix @@ -15,6 +15,7 @@ , scipy , setuptools , setuptools-scm +, wheel }: buildPythonPackage rec { @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm + wheel ]; propagatedBuildInputs = [ From 00ee658dfbcaac61a80a0b7ba1bb33d5b5caca44 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:04:28 -0700 Subject: [PATCH 005/752] portmod: 2.1.0 -> 2.6.2 --- pkgs/games/portmod/default.nix | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index c67626d0b005..f9631c6d764f 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -12,20 +12,20 @@ }: let - version = "2.1.0"; + version = "2.6.2"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - hash = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; + hash = "sha256-ufr2guaPdCvI5JOicL/lTrT3t6UlaY1hEB2xbwzhw6A="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE="; + cargoHash = "sha256-sAjgGVVjgXaWbmN/eGEvatYjkHeFTZNX1GXFcJqs3GI="; nativeBuildInputs = [ python3Packages.python @@ -49,22 +49,32 @@ python3Packages.buildPythonApplication rec { inherit src version; pname = "portmod"; + format = "pyproject"; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; # build the rust library independantly prePatch = '' substituteInPlace setup.py \ - --replace "from setuptools_rust import Binding, RustExtension" "" \ - --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" + --replace "from setuptools_rust import Binding, RustExtension, Strip" "" \ + --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=Strip.Debug)" "" + + substituteInPlace pyproject.toml \ + --replace '"setuptools-rust"' "" ''; + nativeBuildInputs = with python3Packages; [ + setuptools + wheel + ]; + propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools requests chardet colorama + deprecated restrictedpython appdirs gitpython @@ -95,6 +105,9 @@ python3Packages.buildPythonApplication rec { "test_sync" "test_manifest" "test_add_repo" + "test_init_prefix_interactive" + "test_scan_sources" + "test_unpack" ]; # for some reason, installPhase doesn't copy the compiled binary From e96bf1e688b0acc55ba1865589699c090dfb3cd3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 16 Aug 2023 14:43:26 +0800 Subject: [PATCH 006/752] python310Packages.s3transfer: 0.6.1 -> 0.6.2 Diff: https://github.com/boto/s3transfer/compare/0.6.1...0.6.2 --- pkgs/development/python-modules/s3transfer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index a609bbe99b69..361764818605 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-cL4IOfWLRUJC5zCzmN/qRf0N/IV/MDHF/j2JDX5hlUE="; + hash = "sha256-hoHNblnCSZteHmI5sJN72WrX7tveNFZqmL1jFKQmdag="; }; propagatedBuildInputs = [ botocore ]; From 6086908c9896b9a49e81cdb20867de6cf2e2832c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Sep 2023 20:56:23 +0900 Subject: [PATCH 007/752] python310: 3.10.12 -> 3.10.13 https://docs.python.org/release/3.10.13/whatsnew/changelog.html Fixes: CVE-2023-40217 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b09aec49963e..43b8baadb11b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "10"; - patch = "12"; + patch = "13"; suffix = ""; }; - hash = "sha256-r7dL8ZEw56R9EDEsj154TyTgUnmB6raOIFRs+4ZYMLg="; + hash = "sha256-XIiEhmhkDT4VKzW0U27xwjsspL0slX7x7LsFP1cd0/Y="; }; python311 = { From 836da00391f30f7c28af0e9363fdcd7f5578f16c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Sep 2023 20:59:58 +0900 Subject: [PATCH 008/752] python311: 3.11.4 -> 3.11.5 https://docs.python.org/release/3.11.5/whatsnew/changelog.html Fixes: CVE-2023-40217 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 43b8baadb11b..ffb68efcf9f6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,10 +30,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "4"; + patch = "5"; suffix = ""; }; - hash = "sha256-Lw5AnfKrV6qfxMvd+5dq9E5OVb9vYZ7ua8XCKXJkp/Y="; + hash = "sha256-hc0S6c8dbVpF8X96/hzr5+5ijTKCKBxJLoat9jbe+j8="; }; }; From 7aaa5ba972c17dcc45e72dfddfe1238d5d6d2089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 10 Sep 2023 23:24:59 -0700 Subject: [PATCH 009/752] python310Packages.pytest-aiohttp: 1.0.4 -> 1.0.5 Changelog: https://github.com/aio-libs/pytest-aiohttp/blob/v1.0.5/CHANGES.rst --- .../python-modules/pytest-aiohttp/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 4a70b0d98057..9cd6ec0491a9 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , setuptools-scm +, wheel , aiohttp , pytest , pytest-asyncio @@ -10,22 +12,26 @@ buildPythonPackage rec { pname = "pytest-aiohttp"; - version = "1.0.4"; + version = "1.0.5"; - format = "setuptools"; + format = "pyproject"; __darwinAllowLocalNetworking = true; - src = fetchPypi { - inherit pname version; - sha256 = "39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4"; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "pytest-aiohttp"; + rev = "refs/tags/v${version}"; + hash = "sha256-UACf0frMTOAgSsXQ0oqROHKR1zn4OfLPhd9MwBK002Y="; }; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ pytest @@ -40,15 +46,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # pytest 7.2.0 incompatibilities - # https://github.com/aio-libs/pytest-aiohttp/issues/50 - "tests/test_fixtures.py" - ]; - meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; - changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/${src.rev}/CHANGES.rst"; description = "Pytest plugin for aiohttp support"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; From 06da4d82233610a2d9f30dbb214a741ac48c9b83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 00:09:20 +0200 Subject: [PATCH 010/752] python311Packages.build: 0.10.0 -> 1.0.3 https://github.com/pypa/build/blob/1.0.3/CHANGELOG.rst --- pkgs/development/python-modules/build/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index f86f47e2bd85..055b1d0460f3 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "build"; - version = "0.10.0"; + version = "1.0.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pypa"; - repo = pname; - rev = version; - hash = "sha256-kXFrfTb7+68EV+gSENL81IFSR+ue7Fl6R2gsuFFBJhI="; + repo = "build"; + rev = "refs/tags/${version}"; + hash = "sha256-SGWpm+AGIfqKMpDfmz2aMYmcs+XVREbHIXSuU4R7U/k="; }; nativeBuildInputs = [ From a84e337f30b80411160b0ba58b519478629d5305 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 00:29:46 +0200 Subject: [PATCH 011/752] python311Packages.setuptools: 68.0.0 -> 68.2.2 https://setuptools.pypa.io/en/stable/history.html#v68-2-2 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index ad7638f3cb38..93912d4b4ad3 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "68.0.0"; + version = "68.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-Ew/DpI5XsYMB4kBfkFeeB5wv5cjx4oYTddZCWLgBHBs="; + hash = "sha256-PpZbITlYp/cA+8jmObw8g69TK+oE9YEXD3NNJixExB4="; }; patches = [ From f90f651d0f3dcc97c721135433a17c990eae9670 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 12:13:40 +0200 Subject: [PATCH 012/752] python311Packages.build: fix tests --- pkgs/development/python-modules/build/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 055b1d0460f3..4b06298f1d26 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -13,8 +13,8 @@ , pytestCheckHook , pythonOlder , setuptools -, toml , tomli +, wheel }: buildPythonPackage rec { @@ -49,7 +49,7 @@ buildPythonPackage rec { passthru.tests = { pytest = buildPythonPackage { pname = "${pname}-pytest"; - inherit version; + inherit src version; format = "other"; dontBuild = true; @@ -63,7 +63,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook setuptools - toml + wheel ]; pytestFlagsArray = [ From a14239a0ee66b69de5043bd17596713c5b17d671 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 12:24:58 +0200 Subject: [PATCH 013/752] python311Packages.pdm-backend: 2.1.4 -> 2.1.6 https://github.com/pdm-project/pdm-backend/releases/tag/2.1.5 https://github.com/pdm-project/pdm-backend/releases/tag/2.1.6 --- pkgs/development/python-modules/pdm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 96f626b24b61..0572a1e633b8 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.4"; + version = "2.1.6"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-46HTamiy+8fiGVeviYqXsjwu+PEBE38y19cBVRc+zm0="; + hash = "sha256-ZEci8VeKYuORs9iAzaEqrtVBh9fMWHlLsFH1e5PRLwA="; }; env.PDM_BUILD_SCM_VERSION = version; From 7cdcc74c70235db62a9f3ee255b2b1959ca9b1dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 12:28:30 +0200 Subject: [PATCH 014/752] python311Packages.poetry-core: 1.6.1 -> 1.7.0 https://github.com/python-poetry/poetry-core/blob/1.7.0/CHANGELOG.md The revert for x86_64-darwin does not seem necessary any longer, as I could build the package on the darwin community builder. --- .../python-modules/poetry-core/default.nix | 42 +------------------ 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 1205b860b8da..fc8da7447ffb 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.6.1"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,47 +24,9 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; + hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; }; - # revert update of vendored dependencies to unbreak e.g. zeroconf on x86_64-darwin - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/0bdf29e9631fda9436066a07ca8e69a4aa97a31e.patch"; - revert = true; - hash = "sha256-Uqlv17GUcmVkB6ZFePtrbUonsbkiIXay7LLuT/WcPh8="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/48447a18a60c43240bf075fc0c2501f6d68f0211.patch"; - revert = true; - hash = "sha256-23GazppqYmuAmkE/xMtuzng2PbxhYNwgtmsvb6lfvig="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/bc97ac6030049a01e5337fcb53493112a9c75a81.patch"; - revert = true; - hash = "sha256-8NAG+Xm/BNL16NONZJRNB3JiRRKvjMsZJH2FWlw+dHk="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/835bc91393fbb983de6227d67b076aea1360ea68.patch"; - revert = true; - hash = "sha256-Z5viypprDY9GGeX6luBsIoSI9D0lN9g14U9uMh4DTfA="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/80d7dcdc722dee0e09e5f3303b663003d794832c.patch"; - revert = true; - hash = "sha256-CPjkNCmuAiowp/kyKqnEfUQNmXK95RMJOIa24nG6xi8="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/43fd7fe62676421b3661c96844b5d7cf49b87c07.patch"; - excludes = [ - "vendors/poetry.lock" - "vendors/pyproject.toml" - ]; - revert = true; - hash = "sha256-mbu16qFH9ymDZ0KIMiYMy7js5OmxY7z5qg6ZfgfgeLs="; - }) - ]; - nativeCheckInputs = [ build git From bbbb7858e5114481300336bc080f27c904a7f8e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 12:28:53 +0200 Subject: [PATCH 015/752] python311Packages.pytest: 7.4.0 -> 7.4.2 https://github.com/pytest-dev/pytest/releases/tag/7.4.1 https://github.com/pytest-dev/pytest/releases/tag/7.4.2 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 5fde855e58e3..d557bcf15e93 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.0"; + version = "7.4.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-tL+MRb1Zk07YQAGtUeEbTuQNQKEinSx5+cWSsKP2vYo="; + hash = "sha256-p2YlnPq1ZKKtUssarhuIGnXD6340yjd5aXwj7UfEcGk="; }; outputs = [ From 133c3edc11105f0d590f6eb3ebb7a12bbf791a4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 12:50:49 +0200 Subject: [PATCH 016/752] python311Packages.hypothesis: 6.68.2 -> 6.84.3 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-84-3 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index a5692c631508..4cc5aab3bffe 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.68.2"; + version = "6.84.3"; outputs = [ "out" ]; format = "setuptools"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-SgX8esTyC3ulFIv9mZJUoBA5hiv7Izr2hyD+NOudkpE="; + hash = "sha256-wymZ/tJBGcP57B3BuDlBT7kbUxNwW4/SSmvwLSa5PvM="; }; # I tried to package sphinx-selective-exclude, but it throws From 42323c673c9370451f6f1396d9cbe4b8b7c487eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:41 +0200 Subject: [PATCH 017/752] python3Packages.accelerate: 0.21.0 -> 0.23.0 --- .../python-modules/accelerate/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 9aefa2294878..de51ac126950 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonAtLeast , pythonOlder , pytestCheckHook @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.21.0"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,18 +26,9 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BwM3gyNhsRkxtxLNrycUGwBmXf8eq/7b56/ykMryt5w="; + hash = "sha256-pFkEgE1NGLPBW1CeGU0RJr+1Nj/y58ZcljyOnJuR47A="; }; - patches = [ - # fix import error when torch>=2.0.1 and torch.distributed is disabled - # https://github.com/huggingface/accelerate/pull/1800 - (fetchpatch { - url = "https://github.com/huggingface/accelerate/commit/32701039d302d3875c50c35ab3e76c467755eae9.patch"; - hash = "sha256-Hth7qyOfx1sC8UaRdbYTnyRXD/VRKf41GtLc0ee1t2I="; - }) - ]; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -64,6 +54,19 @@ buildPythonPackage rec { # try to download data: "FeatureExamplesTests" "test_infer_auto_device_map_on_t0pp" + + # require socket communication + "test_explicit_dtypes" + "test_gated" + "test_invalid_model_name" + "test_invalid_model_name_transformers" + "test_no_metadata" + "test_no_split_modules" + "test_remote_code" + "test_transformers_model" + + # set the environment variable, CC, which conflicts with standard environment + "test_patch_environment_key_exists" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" From 6597fe2a5e0efc963a403eb339e85ee93b3c6bcc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:41 +0200 Subject: [PATCH 018/752] python3Packages.adafruit-nrfutil: 0.5.3.post17 -> 1 --- .../development/python-modules/adafruit-nrfutil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/pkgs/development/python-modules/adafruit-nrfutil/default.nix index 43071fa93f0e..0197bf21927f 100644 --- a/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adafruit-nrfutil"; - version = "0.5.3.post17"; + version = "1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_nRF52_nrfutil"; - rev = version; - hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; + rev = "refs/tags/appveyor-test-release-${version}"; + hash = "sha256-wsspDg8XwEtJwJye6Z3TXaIN1TcfI7gYDah3L/xiiLo="; }; patches = [ From a38e5de1b174a78200f484afbf0740ae10109021 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:41 +0200 Subject: [PATCH 019/752] python3Packages.aenum: 3.1.12 -> 3.1.15 --- pkgs/development/python-modules/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index ba7fcaa46e64..d1ff94519646 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.12"; + version = "3.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PlMckYYKgfiF9+bpfSGa6XcsuJlYAIR4iTXa19l0LvA="; + hash = "sha256-jL12zRjE+HD/ObJChNPqAo++hzGljfOqWB5DTFdblVk="; }; nativeCheckInputs = [ From fae629edac597cd3261445e0b2e97a33335e6a4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:42 +0200 Subject: [PATCH 020/752] python3Packages.afdko: 3.9.3 -> 4.0.0 --- pkgs/development/python-modules/afdko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 214a85f8c915..a821e9d87890 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.9.3"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v0fIhf3P5Xjdn5/ryRNj0Q2YHAisMqi5RTmJQabaUO0="; + hash = "sha256-66faoWBuCW0lQZP8/mBJLT+ErRGBl396HdG1RfPOYcM="; }; nativeBuildInputs = [ From 3fef82ed7d199cf9b0d5950ee5a48cb4b3560da8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:42 +0200 Subject: [PATCH 021/752] python3Packages.aioairq: 0.2.4 -> 0.3.0 --- pkgs/development/python-modules/aioairq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 342a2fc978f3..73be4e3f64cf 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.2.4"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + hash = "sha256-9OO3ox6q08QQcYfz4ArsKy/6jR329bAQPUo+mVYuhJs="; }; propagatedBuildInputs = [ From 1af7d8391e224db41233be09288d01530a09daf6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:42 +0200 Subject: [PATCH 022/752] python3Packages.aiobotocore: 2.5.2 -> 2.6.0 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 6f7ef895c373..9de5593a2562 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.5.2"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-twIo5qJht7oZye5lbiPwLFa/5dCwgCm+OkwuCuWU0cU="; + hash = "sha256-e8FBUG08yWNL9B51Uv4ftYx1C0kcdoweOreUtvvvTAk="; }; # Relax version constraints: aiobotocore works with newer botocore versions From a26be73f1ff9ba54dd0161515717bd8c9e514360 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:42 +0200 Subject: [PATCH 023/752] python3Packages.aiofiles: 23.1.0 -> 23.2.1 --- pkgs/development/python-modules/aiofiles/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 28d4f5f368dc..fe72ff28c78b 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , pytest-asyncio , pytestCheckHook , pythonOlder @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "23.1.0"; + version = "23.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,11 +19,11 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ouBqqt0CJYxxQqbG9jn4p8zO+nKjqZgPjZpiZic67ss="; + hash = "sha256-EbRQD/AoTMWAlPOMWmD0UdFjRyjt5MUBkJtcydUCdHM="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; nativeCheckInputs = [ From 2586fb4407a05cf4b8ef51977c29fbbd6cbaf530 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:42 +0200 Subject: [PATCH 024/752] python3Packages.aiogram: 2.25.1 -> 3.0.0 --- pkgs/development/python-modules/aiogram/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index ceb3f9603ede..7638c4efb48f 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "2.25.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; - rev = "v${version}"; - hash = "sha256-g8nuvna7DpXElvjBehnGKHUsrf+nyQcoKNnyR59RALo="; + rev = "refs/tags/v${version}"; + hash = "sha256-bWwK761gn7HsR9ObcBDfvQH0fJfTAo0QAcL/HcNdHik="; }; postPatch = '' From a63983ca633c5d7ec7170252e6c6e3e6dc1ac33d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:42 +0200 Subject: [PATCH 025/752] python3Packages.aiohttp-socks: 0.8.1 -> 0.8.3 --- pkgs/development/python-modules/aiohttp-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 9b157264a7e9..0a60d0af2801 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.8.1"; + version = "0.8.3"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - hash = "sha256-duWEJDS5Ts3EWNRZ8MJcD7buMh3FRKA+bJiO3P7QWz0="; + hash = "sha256-aqtSj2aeCHMBj9N3c7gzouK6KEJDvmcoF/pAG8eUHsY="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; From c96bcebeb72844836c4759011a2c9f8764581109 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:42 +0200 Subject: [PATCH 026/752] python3Packages.aiojobs: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/aiojobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index a3b982e22d5a..094e7509ee3c 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; + hash = "sha256-/+PTHLrZyf2UuYkLWkNgzf9amFywDJnP2OKVWvARcAA="; }; postPatch = '' From 6b55ec34b72c47db75c2f43f84f3cdc4d54320ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:43 +0200 Subject: [PATCH 027/752] python3Packages.aiosql: 8.0 -> 9.0 --- pkgs/development/python-modules/aiosql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 88a1c7aa37ca..d7d87003e1a7 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "8.0"; + version = "9.0"; outputs = [ "out" "doc" ]; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-cE89w1CbDqlkryRr3yAdSxAtWzV1+O+n41ihTwYWelE="; + hash = "sha256-AwuZ3y/qAyZzffTG6mHLk0b+zFB9307VjAX8g1pvWto="; }; sphinxRoot = "docs/source"; From 3854980058e66019b87ee9b63cfe2fc7919eb1d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:43 +0200 Subject: [PATCH 028/752] python3Packages.alembic: 1.9.4 -> 1.12.0 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4a60bfca201f..c1bb0f1d3c7d 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.9.4"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-TTvTLs27e7+0ip/p5tb9aoMaG1nQPibikiECNzc+fbU="; + hash = "sha256-jnZFwy5PIAZ15p8HRUFTNetZo2Y/X+tIer+gswxFiIs="; }; propagatedBuildInputs = [ From 4f168bc16ca49f22ee2628a7f2fe4afdb278b3e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:44 +0200 Subject: [PATCH 029/752] python3Packages.allure-behave: 2.12.0 -> 2.13.2 --- pkgs/development/python-modules/allure-behave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index 2dc57281e8f3..a67ff5e98d9b 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; + hash = "sha256-mxXb7+1tvf5EmVbD6eOmGfza9lAjbEVoxWZBSeZmPxQ="; }; nativeBuildInputs = [ From 39eb3230fffff823bb8adab2967cdf8f510f8253 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:44 +0200 Subject: [PATCH 030/752] python3Packages.allure-pytest: 2.12.0 -> 2.13.2 --- pkgs/development/python-modules/allure-pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix index a08f4bc93a43..cdfbf4c142c5 100644 --- a/pkgs/development/python-modules/allure-pytest/default.nix +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; + hash = "sha256-IiQxWejsgc4rUlS0ATgCGYghsbQvEY9p1KKJOWYHx7M="; }; buildInputs = [ From 74ceb33d268ba71b67950a667270ce7aeae934d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:44 +0200 Subject: [PATCH 031/752] python3Packages.allure-python-commons: 2.12.0 -> 2.13.2 --- .../python-modules/allure-python-commons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index b92ee139b6ba..0b50f23f77c4 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; + hash = "sha256-igNoEzAjGx3q3Ya5f/aIQcZZEyARSuY4Vw8e1g16IDM="; }; nativeBuildInputs = [ From ac40f0c3c910e71a9275bbca30b30b25e5e9a945 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:44 +0200 Subject: [PATCH 032/752] python3Packages.allure-python-commons-test: 2.12.0 -> 2.13.2 --- .../python-modules/allure-python-commons-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index aaba8d9fccf7..c358a2f14d7f 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; + hash = "sha256-Xh6NtqiuTg7UxKqJ7/p45rCUQGWiGDEaNAslzeYtgfg="; }; nativeBuildInputs = [ From 7ce7403597a034b6927ea14a27f56dd15b7eb20d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:44 +0200 Subject: [PATCH 033/752] python3Packages.amazon-ion: 0.9.3 -> 0.10.0 --- pkgs/development/python-modules/amazon-ion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 21db57509745..0a2479dd38f4 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.9.3"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,9 +18,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amzn"; repo = "ion-python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-FLwzHcge+vLcRY4gOzrxS3kWlprCkRXX5KeGOoTJDSw="; + hash = "sha256-pCm3jd/dVqO/uIvT5N/w5yoUWU6ni62Pl2A862e+qSk="; }; postPatch = '' From 5697f68514914fd5f1fe4f29497e37b4a698d1c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:44 +0200 Subject: [PATCH 034/752] python3Packages.amazon-kclpy: 2.1.1 -> 2.1.3 --- pkgs/development/python-modules/amazon-kclpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index 623ab60ed63a..fca55e3bc0dc 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon-kclpy"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z0MC4SbZS82beMA7UunEfs4KvrmhW5xAhFeb7WXA7DM="; + hash = "sha256-3BhccRJd6quElXZSix1aVIqWr9wdcTTziDhnIOLiPPo="; }; # argparse is just required for python2.6 From 78c366e9a54d2c3516e5b937c5df828fbbf6b34a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:44 +0200 Subject: [PATCH 035/752] python3Packages.ansible: 8.3.0 -> 8.4.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index f7c41aa12ba2..71bd13c7ab49 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "8.3.0"; + version = "8.4.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-XlgAHX1twz5dFWyjQ4g7YT7JiPaTZLCkP3Ek/ktb4vI="; + hash = "sha256-8zxJJpBZL60SaE6Yl/beLaFcn24ey3kTdwOgZHCvLOY="; }; postPatch = '' From 0579d86ddb461790dbfc8d3dd0d402da6ba90909 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:45 +0200 Subject: [PATCH 036/752] python3Packages.anthropic: 0.3.11 -> 0.3.13 --- pkgs/development/python-modules/anthropic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 8344af439070..ef0ffe778e46 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.11"; + version = "0.3.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-bjagT0I0/N76CGf1b8EBNyOTzPBWybr2I2yO5NWO3po="; + hash = "sha256-2sw/tzbKd0d4sSHM+PYTE/XeqkycFFLfG1c/lyrU4Jc="; }; nativeBuildInputs = [ From 9cd45c14f23b4174f0160123473566d3b2c6017a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:45 +0200 Subject: [PATCH 037/752] python3Packages.anyio: 3.7.1 -> 4.0.0 --- pkgs/development/python-modules/anyio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 3508554d308d..9fc63cb0d161 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.7.1"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,8 +36,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agronholm"; repo = pname; - rev = version; - hash = "sha256-9/pAcVTzw9v57E5l4d8zNyBJM+QNGEuLKrQ0WUBW5xw="; + rev = "refs/tags/${version}"; + hash = "sha256-gUFd2gHWIElYfzOvg7Yx7iJyhU6+iAcJpHTVsJtxTsk="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From 3bab3cbabc2f1bd3360d2008a1210752c9baf213 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:45 +0200 Subject: [PATCH 038/752] python3Packages.aocd: 1.3.2 -> 2.0.1 --- pkgs/development/python-modules/aocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index b58c31ea7320..dd0f570b31d4 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aocd"; - version = "1.3.2"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "wimglenn"; repo = "advent-of-code-data"; rev = "refs/tags/v${version}"; - hash = "sha256-yY8ItXZZp0yVs4viJzduMPq8Q8NKd34uvlGaVUE2GjQ="; + hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0="; }; propagatedBuildInputs = [ From 8fac1e059167c77914b1f11e8c36dabf097b9f18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:45 +0200 Subject: [PATCH 039/752] python3Packages.apache-beam: 2.45.0 -> 2.50.0 --- pkgs/development/python-modules/apache-beam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 92a9203a93f6..d0e36a989b94 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -48,13 +48,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.45.0"; + version = "2.50.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-e+6Vt+SlOxi16udsdx7WFoDWYupuXhggpoEZPe4tPr0="; + hash = "sha256-qaxYWPVdMlegvH/W66UBoQbcQ5Ac/3DNoQs8xo+KfLc="; }; patches = [ From 740d2fd261bdaf163a09409dc38811fbfc1db72f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:45 +0200 Subject: [PATCH 040/752] python3Packages.apsw: 3.42.0.0 -> 3.43.1.0 --- pkgs/development/python-modules/apsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 5964274881c6..59576a129d68 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.42.0.0"; + version = "3.43.1.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-pLkYTyf2BGRLs4bChb+eo2i5gRRUUJDFyfCBTSJ1RkQ="; + hash = "sha256-x+bSft37DgF2tXXCL6ac86g1+mj/wJeDLoCSiVSXedA="; }; buildInputs = [ From 48c31d859edc5ec0b0eb97fd175177f8272c1390 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:46 +0200 Subject: [PATCH 041/752] python3Packages.argostranslate: 1.8.0 -> 1.8.1 --- pkgs/development/python-modules/argostranslate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 8a1cadfb8803..2347730ad4cb 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -18,13 +18,13 @@ let in buildPythonPackage rec { pname = "argostranslate"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9b109255d6a2c692c6f3bfbde494d1a27b3d5ed1c1d1d78711cdc1b1e3744c64"; + sha256 = "sha256-8eVmEHwsQ9/5NPmKJzZ4aX4nkh4+mna5K1BC+lXLXcE="; }; propagatedBuildInputs = [ From 00ba00e21c81defdbf7c97ce3f82e7b515b0e399 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:46 +0200 Subject: [PATCH 042/752] python3Packages.argos-translate-files: 1.1.3 -> 1.1.4 --- .../python-modules/argos-translate-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index 1acab31b723c..0f0e3ea22354 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "argos-translate-files"; - version = "1.1.3"; + version = "1.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "c6931ea8fbabdc24903ceaabfe848be0fa4a0477d00451a8dfbc1525b623f0ba"; + sha256 = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; }; propagatedBuildInputs = [ From 2d7f268ece6caaaaab1cfee3dd0179296f5f3fa4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:46 +0200 Subject: [PATCH 043/752] python3Packages.ariadne: 0.18.1 -> 0.20.1 --- pkgs/development/python-modules/ariadne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 23d45893fe4f..3810934eefeb 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.18.1"; + version = "0.20.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-E7uC+l0Yjol8UPLF4CV+PN49tOUJXNUS5yYdF1oyfwU="; + hash = "sha256-v3CaLMTo/zbNEoE3K+aWnFTCgLetcnN7vOU/sFqLq2k="; }; nativeBuildInputs = [ From 9c3b68bd3e08698cc2b0a03e1c118a53691f9d8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:46 +0200 Subject: [PATCH 044/752] python3Packages.array-record: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/array-record/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index f278c34fbe1d..1c82445f0e4f 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "array-record"; - version = "0.4.0"; + version = "0.4.1"; format = "wheel"; disabled = python.pythonVersion != "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "array_record"; dist = "py310"; python = "py310"; - hash = "sha256-VHDU6RLR/z3/tNxJiDdAruz1cva6cHu5NzMlsKrLYXg="; + hash = "sha256-agyO1v36ryzs09XGucE+EWrTKZZJYRyP0YTWRVf7q6g="; }; propagatedBuildInputs = [ From 280cf2b576b18cc6bcb954444a804b634ad45546 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:46 +0200 Subject: [PATCH 045/752] python3Packages.arviz: 0.15.1 -> 0.16.1 --- pkgs/development/python-modules/arviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index fee3f12b80ca..2c7654f325ce 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.15.1"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jjA+yltvpPZldIxXXqu1bXCLqpiU5/NBYTPlI9ImGVs="; + hash = "sha256-kixWGj0M0flTq5rXSiPB0nfZaGYRvvMBGAJpehdW8KY="; }; propagatedBuildInputs = [ From f7c20eb5e1eb60ec8b9babe514698e599f60162d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:46 +0200 Subject: [PATCH 046/752] python3Packages.asana: 3.2.1 -> 4.0.11 --- pkgs/development/python-modules/asana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 410c8d6a24f1..f3b6787dd66b 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asana"; - version = "3.2.1"; + version = "4.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; - rev = "refs/tags/v${version}"; - hash = "sha256-hvAyKGoNkX3bs7Mz2h7SnOa5T6J88c0YiTR/L8fgfi8="; + rev = "refs/tags/${version}"; + hash = "sha256-B98X8ErmoMIpXu4KKvRGgtElPs/va2+UIR+ARUgafgo="; }; propagatedBuildInputs = [ From 9c901e3a03338c372c388d3958abb623b9b0ba67 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:46 +0200 Subject: [PATCH 047/752] python3Packages.asf-search: 6.3.1 -> 6.6.3 --- pkgs/development/python-modules/asf-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 3fd043766778..a5177a6b7e18 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "6.3.1"; + version = "6.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-9mhb8PEpRdFjbPBZ/B8he/UcRSLryBQU0Dgjcii7LGY="; + hash = "sha256-w4xpCqNal0BHsmf1cL4k/DKzs/e9WQXTQNJNs8puJUU="; }; propagatedBuildInputs = [ From 7c0162d554fbed20d3ae10ac130d661d87d0bf4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:47 +0200 Subject: [PATCH 048/752] python3Packages.asttokens: 2.2.1 -> 2.4.0 --- pkgs/development/python-modules/asttokens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 89c959293df3..452abd626e0b 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.2.1"; + version = "2.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-RiIRCypvMLd+FHOv+ql+cRvC8H0/EISEIP8YmO2+lPM="; + hash = "sha256-LgFxuZGyyVmsxsSTGASSNoRKXaHWW6JnLEiAwciUg04="; }; nativeBuildInputs = [ From c99ccbfe741132ddc466299e81ae5c8b204f8b38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:47 +0200 Subject: [PATCH 049/752] python3Packages.async-timeout: 4.0.2 -> 4.0.3 --- pkgs/development/python-modules/async-timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-timeout/default.nix b/pkgs/development/python-modules/async-timeout/default.nix index 55297bea9cbd..59c8b51fbb67 100644 --- a/pkgs/development/python-modules/async-timeout/default.nix +++ b/pkgs/development/python-modules/async-timeout/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "4.0.2"; + version = "4.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IWPhZA3bUreoyA0KZ6CFh+XSRcycVTp0qEcFa8KXaxU="; + hash = "sha256-RkDZa+hNgtAu1Z6itxBaD3szq+hwNwPNCrC/h8QnUi8="; }; propagatedBuildInputs = [ From 4f0073c770104d5453e4356eef02c682e46e03d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:48 +0200 Subject: [PATCH 050/752] python3Packages.atpublic: 3.1.1 -> 4.0 --- pkgs/development/python-modules/atpublic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index d856aa544cb1..20fc37d45999 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -3,25 +3,25 @@ , fetchPypi , pytestCheckHook , pythonOlder -, pdm-pep517 +, pdm-backend , sybil , typing-extensions }: buildPythonPackage rec { pname = "atpublic"; - version = "3.1.1"; + version = "4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg="; + hash = "sha256-D0BDMhnhJO3xFcbDY4CMpvDhz6fRYNhrL7lHkwhtEpQ="; }; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ From 9191b1d7d6d5f29fcca4589c6d20bd16af980276 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:48 +0200 Subject: [PATCH 051/752] python3Packages.auth0-python: 4.4.0 -> 4.4.2 --- .../python-modules/auth0-python/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 44599435f149..5d17c5705b4b 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -5,6 +5,8 @@ , callee , fetchPypi , mock +, poetry-core +, poetry-dynamic-versioning , pyjwt , pytestCheckHook , pythonOlder @@ -13,16 +15,22 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.4.0"; - format = "setuptools"; + version = "4.4.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-Yf8/NmQygdikQXv9sUukQEKKd+FcpSPnGbbi8kzVyLo="; + pname = "auth0_python"; + inherit version; + hash = "sha256-4XWxx0GlDVkABwK69laqOFZliWelQ5mWul3FcWnxuko="; }; + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + propagatedBuildInputs = [ requests pyjwt From 8b1444a07633efe0ec20526dc83be2dcb86ff232 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:48 +0200 Subject: [PATCH 052/752] python3Packages.autoflake: 2.0.1 -> 2.2.1 --- pkgs/development/python-modules/autoflake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index 9446a6dc2b4c..0897abe77b84 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "autoflake"; - version = "2.0.1"; + version = "2.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HOUgExt/OWkVJC/pHlciH01CQIUpu+Ouk62v7ShlkeA="; + hash = "sha256-Yre2RJppLDybDJFpGbvCFkjacoHoUGvPjT+CgOQx68E="; }; nativeBuildInputs = [ From b47b2e9fe93e07e77ef27726ece3db621a8e45a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:48 +0200 Subject: [PATCH 053/752] python3Packages.autopep8: 2.0.2 -> 2.0.4 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index b34a78351bd9..9a177d7b4936 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.0.2"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hhatto"; repo = "autopep8"; rev = "refs/tags/v${version}"; - hash = "sha256-+EZgo7xtYKMgpcntU5FtPrfikDDpnvGHhorhtoqDsvE="; + hash = "sha256-TuaDnZqn9mRUsoDJkj9JK4ztvzl9JTwAk8nghIkZBvw="; }; propagatedBuildInputs = [ From 02ae98522c217d2c724ad1fa2b98de1530bccb01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:48 +0200 Subject: [PATCH 054/752] python3Packages.awkward-cpp: 22 -> 23 --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index a8107fac2b84..16bae9a42597 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "22"; + version = "23"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8="; + hash = "sha256-c+Rg8+CMIvuDaeuME6ERyfMqeaLMfQHklnXdXQiSNt4="; }; nativeBuildInputs = [ From c4bb82dc19017cf69fb5b77dde3888a2d266e8de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:48 +0200 Subject: [PATCH 055/752] python3Packages.awkward: 2.3.1 -> 2.4.2 --- pkgs/development/python-modules/awkward/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 81881d519392..f8fd32caa696 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -3,8 +3,10 @@ , fetchPypi , pythonOlder , awkward-cpp +, cupy , hatch-fancy-pypi-readme , hatchling +, importlib-metadata , numba , numpy , packaging @@ -15,14 +17,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.3.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NLROXEbh4MKvBFuj+4+Wa2u37P9vuQ0Ww8kK+CYWt5E="; + hash = "sha256-soMmJ2JXhoR7rmCjtb+5388WfwnDrEbILyMvJqdymro="; }; nativeBuildInputs = [ @@ -34,13 +36,16 @@ buildPythonPackage rec { awkward-cpp numpy packaging - ] ++ lib.optionals (pythonOlder "3.11") [ + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions + ] ++ lib.optionals (pythonOlder "3.12") [ + importlib-metadata ]; dontUseCmakeConfigure = true; nativeCheckInputs = [ + cupy pytestCheckHook numba setuptools From 95db7cad8c3a1b18f47bc85ed449598f28fe4ae7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:49 +0200 Subject: [PATCH 056/752] python3Packages.aws-adfs: 2.2.1 -> 2.8.2 --- .../python-modules/aws-adfs/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 85a4f6bbe680..953140768d67 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.2.1"; + version = "2.8.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "venth"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-REJYuOGq22onMj4WcfA7i4/cG99UGZA9D99ESIKY1A8="; + rev = "refs/tags/v${version}"; + hash = "sha256-hMM7Z0s9t5vetgskiy7nb1W/kKCKHe0Q3kT2ngUVADA="; }; nativeBuildInputs = [ @@ -47,20 +47,6 @@ buildPythonPackage rec { requests-kerberos ]; - patches = [ - # Apply new fido2 api (See: venth/aws-adfs#243) - (fetchpatch { - url = "https://github.com/venth/aws-adfs/commit/09836d89256f3537270d760d8aa30ab9284725a8.diff"; - hash = "sha256-pAAJvOa43BXtyWvV8hsLe2xqd5oI+vzndckRTRol61s="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \ - --replace 'botocore = ">=1.12.6"' 'botocore = "*"' - ''; - nativeCheckInputs = [ pytestCheckHook toml From 882b6ad890ad15f0461db81ccc92493cfcb3c904 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:49 +0200 Subject: [PATCH 057/752] python3Packages.awslambdaric: 2.0.0 -> 2.0.7 --- pkgs/development/python-modules/awslambdaric/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index d79b3448f212..1d89f2e93241 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "2.0.0"; + version = "2.0.7"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; - rev = version; - sha256 = "1amlaq119mk8fa3fxi3d6vgp83vcd81mbk53jzbixacklmcsp50k"; + rev = "refs/tags/${version}"; + sha256 = "sha256-9PgdLzeSafglguXksMetzopbDlBWlGDSSXiZHfuWgE8="; }; patches = [ From ce8620175fc202fc482dca6c639acbeae25a0c59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:49 +0200 Subject: [PATCH 058/752] python3Packages.awswrangler: 3.3.0 -> 3.4.0 --- pkgs/development/python-modules/awswrangler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 806016afbffc..65f5bcf36e94 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-Sb5yqbEqGmwhPoG21+uMnl8Jdn3Gc455guceQhAflWY="; + hash = "sha256-ZHEWG/A3lNwSw3MxguqjvgAOx5IHei43ku7GVJh8tLY="; }; nativeBuildInputs = [ From a6e22b4a4034080d94b3e4622c8d3ef411e76371 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:49 +0200 Subject: [PATCH 059/752] python3Packages.aws-xray-sdk: 2.11.0 -> 2.12.0 --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 3be1c09b5fbe..e2fb2414a2c0 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.11.0"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - hash = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; + hash = "sha256-KVr8I3BzqAlW19TyfDGDDty5qMzKnviqRJkLre8V5bc="; }; propagatedBuildInputs = [ From b6c6d314fc4c7d4dc1f447cad20dcc7b7b5cc107 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:49 +0200 Subject: [PATCH 060/752] python3Packages.azure-cosmos: 3.2.0 -> 4.5.1 --- pkgs/development/python-modules/azure-cosmos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 9cbbd8e64b06..f41bc696d56f 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "4.5.1"; pname = "azure-cosmos"; src = fetchPypi { inherit pname version; - sha256 = "4f77cc558fecffac04377ba758ac4e23f076dc1c54e2cf2515f85bc15cbde5c6"; + sha256 = "sha256-xK2oOBMG7sQTwBvFCneOJk3D9Pr6nWlvnfhDYUjSrqg="; }; propagatedBuildInputs = [ six requests ]; From ef96a35c44e85b1976c611bcbe0b4439a10f34ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:49 +0200 Subject: [PATCH 061/752] python3Packages.azure-mgmt-trafficmanager: 1.0.0 -> 1.1.0 --- .../python-modules/azure-mgmt-trafficmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index a0da387c627a..c5190b6d3368 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-trafficmanager"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; + hash = "sha256-Nb8ZAr8VidYm41lx5aqgCeiECUZytHm3mM0buNTy/fk="; }; propagatedBuildInputs = [ From 115aa7ab7e390102d8c27d406d8c5bff6cbd4038 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:49 +0200 Subject: [PATCH 062/752] python3Packages.bambi: 0.10.0 -> 0.12.0 --- pkgs/development/python-modules/bambi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index dd76021cab03..450a3402a14e 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bambi"; - version = "0.10.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bambinos"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-D04eTAlckEqgKA+59BRljlyneHYoqqZvLYmt/gBLHcU="; + hash = "sha256-36D8u813v2vWQdNqBWfM8YVnAJuLGvn5vqdHs94odmU="; }; nativeBuildInputs = [ From 9fc72e6a63d12166dabad952815e021e4159b284 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:50 +0200 Subject: [PATCH 063/752] python3Packages.bash_kernel: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/bash_kernel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index 582e7c5dccf1..331b9c91707a 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "bash_kernel"; - version = "0.9.0"; - format = "pyproject"; + version = "0.9.1"; + format = "flit"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-BCPwUS72+DplThQ5o2lxiJmjjyeUj+IbZlst8dvzp8c="; + sha256 = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; }; patches = [ From 994d3fa6298bcd5c297251a35badc836a0a4f331 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:50 +0200 Subject: [PATCH 064/752] python3Packages.bbox: 0.9.2 -> 0.9.4 --- pkgs/development/python-modules/bbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix index 88a019dda8e9..4f1d0cef7fd0 100644 --- a/pkgs/development/python-modules/bbox/default.nix +++ b/pkgs/development/python-modules/bbox/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bbox"; - version = "0.9.2"; + version = "0.9.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ucR7mg9eubEefjC7ratEgrb9h++a26z8KV38n3N2kcw="; + hash = "sha256-GGQhKkdwmrYPEhtldPY3WUInSniU/B40NZvt1gXEuzg="; }; propagatedBuildInputs = [ pyquaternion numpy ]; From cfbd3bdea7eead7c21add3b7508091f8e0d75d45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:50 +0200 Subject: [PATCH 065/752] python3Packages.beartype: 0.14.0 -> 0.15.0 --- pkgs/development/python-modules/beartype/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 62dbfd059b11..42b3ea063de5 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -3,22 +3,24 @@ , fetchPypi , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "beartype"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VG5ujc3aHW2fkG6k6xUYqgHJxfWkQOSVkXstr1PL1Zg="; + hash = "sha256-Kvao2KcmfM99Jx4aO9kIr7wCXSoJqlESNWfX17N0ON8="; }; nativeCheckInputs = [ pytestCheckHook + typing-extensions ]; pythonImportsCheck = [ From 732f6bbda6df02044e9cf0be7162f962efee2619 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:50 +0200 Subject: [PATCH 066/752] python3Packages.bitcoinlib: 0.12.0 -> 0.12.2 --- pkgs/development/python-modules/bitcoinlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index 037ea8b5ebfe..3b1ead8d8962 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.12.0"; + version = "0.12.2"; disabled = !isPy3k; @@ -10,12 +10,12 @@ buildPythonPackage rec { owner = "petertodd"; repo = "python-bitcoinlib"; rev = "refs/tags/python-bitcoinlib-v${version}"; - hash = "sha256-jguybrH86z6NWLaucQEYjvH2Gkoh3Aqh/PLZ6l8Qel4="; + hash = "sha256-jfd2Buy6GSCH0ZeccRREC1NmlS6Mq1qtNv/NLNJOsX0="; }; postPatch = '' substituteInPlace bitcoin/core/key.py --replace \ - "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or 'libeay32'" \ + "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or ctypes.util.find_library('libeay32')" \ "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; From 48e092e5a57599437fa50636ac52fe8fa81b9ed0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:50 +0200 Subject: [PATCH 067/752] python3Packages.bitstring: 4.0.2 -> 4.1.2 --- pkgs/development/python-modules/bitstring/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index a61a159a71ec..55a6094c131b 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, bitarray , setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "bitstring"; - version = "4.0.2"; + version = "4.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,14 +17,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scott-griffiths"; repo = pname; - rev = "bitstring-${version}"; - hash = "sha256-LghfDjf/Z1dEU0gjH1cqMb04ChnW+aGDjmN+RAhMWW8="; + rev = "refs/tags/bitstring-${version}"; + hash = "sha256-e4OnXwEuXz5m8d2PZOL5zDw8iGEzUg8LLk+xs/eGleA="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + bitarray + ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "bitstring" ]; From 377fecd2ff36d4575738da2dbc0a87056ed9d78d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:51 +0200 Subject: [PATCH 068/752] python3Packages.blinker: 1.5 -> 1.6.2 https://github.com/pallets-eco/blinker/blob/1.6.2/CHANGES.rst --- .../python-modules/blinker/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 88bd08c92554..9864bbae3c61 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -2,24 +2,37 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pytest-asyncio +, setuptools }: buildPythonPackage rec { pname = "blinker"; - version = "1.5"; + version = "1.6.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; + hash = "sha256-Sv095m7zqfgGdVn7ehy+VVwX3L4VlxsF0bYlw+er4hM="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "blinker" ]; + pythonImportsCheck = [ + "blinker" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; meta = with lib; { - homepage = "https://pythonhosted.org/blinker/"; - description = "Fast, simple object-to-object and broadcast signaling"; + changelog = "https://github.com/pallets-eco/blinker/releases/tag/${version}"; + description = "Fast Python in-process signal/event dispatching system"; + homepage = "https://github.com/pallets-eco/blinker/"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From b5e33a962c4d97ad184437b54798b0d631c032fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:51 +0200 Subject: [PATCH 069/752] python3Packages.blinkpy: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/blinkpy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 51e5e3b0f472..619e181e8d56 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiofiles +, aiohttp , pytestCheckHook , python-dateutil , python-slugify @@ -12,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,10 +23,12 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; + hash = "sha256-r8kf5L6bvtivqd9dSi8om1wIi8IHmipKFckNMPT515I="; }; propagatedBuildInputs = [ + aiofiles + aiohttp python-dateutil python-slugify requests From 2ab1bb9fc4b18ef539f98b58b595b6cf401c178a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:51 +0200 Subject: [PATCH 070/752] python3Packages.blosc2: 2.1.1 -> 2.2.7 --- pkgs/development/python-modules/blosc2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 80cec5ca1ec3..a4c1db3d7b70 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "blosc2"; - version = "2.1.1"; + version = "2.2.7"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "python-blosc2"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-nbPMLkTye0/Q05ubE35LssN677sUIQErPTxjAtSuGgI="; + hash = "sha256-5a94Zm6sYl/nSfkcFbKG7PkyXwLB6bAoIvfaq0yVGHo="; }; postPatch = '' From f2fae4647a88f2d1a6f7f1a95f45893d85086a01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:51 +0200 Subject: [PATCH 071/752] python3Packages.botocore: 1.31.9 -> 1.31.48 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 1693f2258bcc..3dac327a48be 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.31.9"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.48"; # N.B: if you change this, change boto3 and awscli to a matching version format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vYSdOslfF4E4Xtgx11OgSj7IcKWdZZgXWq7dcdwrr18="; + hash = "sha256-btFvZqpu1gcP7SbWl2TLFMd1nkzAscGRKDzEiwXWXek="; }; propagatedBuildInputs = [ From 23884a5a7561f52b5cc876ab68faf7b3e3eb6f57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:52 +0200 Subject: [PATCH 072/752] python3Packages.bottle: 0.12.24 -> 0.12.25 --- pkgs/development/python-modules/bottle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 7a97b9990230..e64883140316 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.24"; + version = "0.12.25"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JIASGnPoc4CYm3fjK9IJLRkOfqfXHm8bj3r36rnVTqM="; + hash = "sha256-4anJSXCubXELP7RSYpTf64byy0qB7/OkuY3ED7Dl4CE="; }; nativeCheckInputs = [ From 92ed0b8c8b30f0b4907529c20cbc2183f3d109c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:52 +0200 Subject: [PATCH 073/752] python3Packages.bottombar: 1.0 -> 2.1 --- pkgs/development/python-modules/bottombar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottombar/default.nix b/pkgs/development/python-modules/bottombar/default.nix index e3e9bb38cc11..ab7a9b06d64f 100644 --- a/pkgs/development/python-modules/bottombar/default.nix +++ b/pkgs/development/python-modules/bottombar/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bottombar"; - version = "1.0"; + version = "2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "evalf"; repo = "bottombar"; rev = "refs/tags/v${version}"; - hash = "sha256-/3m34HcYmmEf92H3938dYV1Q6k44KaCb9TDx9nDNPnM="; + hash = "sha256-W+Cbcgb664nVT/nsFdDruT688JWG2NZnF5hDDezTgnw="; }; nativeBuildInputs = [ From d10b952be9184d61b7a90c664bdc409f013d9c2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:52 +0200 Subject: [PATCH 074/752] python3Packages.bqplot: 0.12.39 -> 0.12.40 --- pkgs/development/python-modules/bqplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bqplot/default.nix b/pkgs/development/python-modules/bqplot/default.nix index 5695be669bbc..a1737d339a3d 100644 --- a/pkgs/development/python-modules/bqplot/default.nix +++ b/pkgs/development/python-modules/bqplot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bqplot"; - version = "0.12.39"; + version = "0.12.40"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FNjeb5pNGUW76mwTIOpNHJMlb3JoN3T24AINzFefPdI="; + hash = "sha256-7L/ovwTwRFju5G3Cwvgla0wVIdRvlEOOm+GTieT4b7k="; }; # upstream seems in flux for 0.13 release. they seem to want to migrate from From 3c858588b85c8a61cdfa1b4bd07818a8bdcd1bf9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:52 +0200 Subject: [PATCH 075/752] python3Packages.bqscales: 0.3.1 -> 0.3.3 --- pkgs/development/python-modules/bqscales/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bqscales/default.nix b/pkgs/development/python-modules/bqscales/default.nix index 8b0ebb610ad9..c8fa7879bd75 100644 --- a/pkgs/development/python-modules/bqscales/default.nix +++ b/pkgs/development/python-modules/bqscales/default.nix @@ -3,6 +3,8 @@ , pythonOlder , fetchPypi , hatchling +, hatch-jupyter-builder +, jupyterlab , jupyter-packaging , ipywidgets , numpy @@ -12,13 +14,13 @@ buildPythonPackage rec { pname = "bqscales"; - version = "0.3.1"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-C+/GLpqYpePngbn5W0MwvpdmVgFZF7aGHyKMgO5XM90="; + hash = "sha256-SlnNw4dWOzRedwIN3kCyl95qVqkY92QGOMS3Eyoqk0I="; }; # We relax dependencies here instead of pulling in a patch because upstream @@ -35,7 +37,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + hatch-jupyter-builder hatchling + jupyterlab jupyter-packaging ]; From ac85b30804e28c0e9f1a3cf2694c52c4a5b82944 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:52 +0200 Subject: [PATCH 076/752] python3Packages.breathe: 4.34.0 -> 4.35.0 --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index cfb919682e44..54b5c4a06f99 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "breathe"; - version = "4.34.0"; + version = "4.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "michaeljones"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OOc3XQjqQa0cVpA+/HHco+koL+0whUm5qC7x3xiEdwQ="; + hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; patches = [ From c31e6e834fcdc40d9c4663145e4b9671d1e38e7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:52 +0200 Subject: [PATCH 077/752] python3Packages.brian2: 2.5.1 -> 2.5.4 --- pkgs/development/python-modules/brian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index 6ebd89a7b346..2b3bcbff5076 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "brian2"; - version = "2.5.1"; + version = "2.5.4"; src = fetchPypi { pname = "Brian2"; inherit version; - hash = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw="; + hash = "sha256-XMXSOwcH8fLgzXCcT+grjYxhBdtF4H/Vr+S7J4GYZSw="; }; patches = [ From ae0f16a255811468b976e4525cfd189f5626f705 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:52 +0200 Subject: [PATCH 078/752] python3Packages.brotli: 1.0.9 -> 1.1.0 --- pkgs/development/python-modules/brotli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index b70302fe9ea6..91e907c3af33 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "v${version}"; - hash = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; + rev = "refs/tags/v${version}"; + hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data forceFetchGit = true; }; From 61fd67c8ec73c5532b5c2ef6b7537fd00b5fc125 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:53 +0200 Subject: [PATCH 079/752] python3Packages.bytewax: 0.16.2 -> 0.17.1 --- pkgs/development/python-modules/bytewax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 61e6b3142fb9..c27d756070de 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bytewax"; - version = "0.16.2"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bytewax"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PHjKEZMNhtLliOSGt4XHQFDm8Rc4TejQUVSqFN6Au38="; + hash = "sha256-Cv2bTgs3XfYOcHK628/RgGol7S6E4WfHb7gHXXjBhig="; }; env = { From 64d9258787066f4ab47b7f3f8856c30e692a77f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:53 +0200 Subject: [PATCH 080/752] python3Packages.castepxbin: 0.2.0 -> 0.3.0 --- .../python-modules/castepxbin/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index 765bb7164369..8fbb9cfc39e3 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , numpy , scipy , pymatgen @@ -9,15 +10,20 @@ buildPythonPackage rec { pname = "castepxbin"; - version = "0.2.0"; + version = "0.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; - rev = "v${version}"; - sha256 = "0bqicpdyisbcz8argy4ppm59zzkcn9lcs4y1mh2f31f75x732na3"; + rev = "refs/tags/v${version}"; + hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ numpy scipy From d039a28561aaab04632b726acc246a2b67cc12ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:53 +0200 Subject: [PATCH 081/752] python3Packages.catppuccin: 1.1.1 -> 1.3.2 --- pkgs/development/python-modules/catppuccin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix index 5a53233fff87..c938b389c28a 100644 --- a/pkgs/development/python-modules/catppuccin/default.nix +++ b/pkgs/development/python-modules/catppuccin/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "catppuccin"; - version = "1.1.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - hash = "sha256-mHNuV3yIuFL2cixDOr+//+/b9iD2fN82cfLzZkegxKc="; + hash = "sha256-iRQF9U6QvbyOSdp0OALc/Efl4IL1w17WGOZRbhzlqGA="; }; propagatedBuildInputs = [ pygments ]; From 8506b9ff14baad868c2fa7ae9ed0c0a7c90d078d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:53 +0200 Subject: [PATCH 082/752] python3Packages.cfn-lint: 0.79.6 -> 0.79.11 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index ed5377d9783a..f52bf2f667ae 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.79.6"; + version = "0.79.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-5Lb8dA8HqDdEO/Ehv5y/JlP+te46mzrTw/kNHBb9l38="; + hash = "sha256-dVLKMoZzP2q3bejEIslgpQgkPJOJUeEsXyyk8HRP6h0="; }; propagatedBuildInputs = [ From c21422ec24566e6c41634006dd89b26fd082875d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:54 +0200 Subject: [PATCH 083/752] python3Packages.chardet: 5.1.0 -> 5.2.0 --- pkgs/development/python-modules/chardet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 69353dcaec28..7c78de37d36d 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "chardet"; - version = "5.1.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DWJxK5VrwVT4X7CiZuKjxZE8KWfgA0hwGzJBHW3vMeU="; + hash = "sha256-Gztv9HmoxBS8P6LAhSmVaVxKAm3NbQYzst0JLKOcHPc="; }; nativeBuildInputs = [ From b144da36411e00bcc7d3e314713fa01f0af5dade Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:54 +0200 Subject: [PATCH 084/752] python3Packages.charset-normalizer: 3.0.1 -> 3.2.0 --- .../development/python-modules/charset-normalizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index d567c41dbe6f..c36c266ed983 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "3.0.1"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = "refs/tags/${version}"; - hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk="; + hash = "sha256-CfL5rlrwJs9453z+1xPUzs1B3OyjFBaU6klzY7gJCzA="; }; nativeCheckInputs = [ From 104a1e15abdbda86014205360d43ece9f375baf6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:54 +0200 Subject: [PATCH 085/752] python3Packages.cheroot: 9.0.0 -> 10.0.0 --- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 11ce178e6906..679c5464b8f5 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "9.0.0"; + version = "10.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PUetnuGey+wUS0dYOZA2aS/b9npAuW7vH7FFQ2ez0zg="; + hash = "sha256-WcShh3/vmWmzw8CAyqrzd+J4CRlDeFP8DTKp30CzEfA="; }; nativeBuildInputs = [ From 2912181ccb8c75b2344ad38c702ef26ab6395239 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:54 +0200 Subject: [PATCH 086/752] python3Packages.chia-rs: 0.2.0 -> 0.2.10 --- pkgs/development/python-modules/chia-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix index b8ce9ce755bc..7afec2e1a426 100644 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ b/pkgs/development/python-modules/chia-rs/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.2.0"; + version = "0.2.10"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = version; - hash = "sha256-kjURkzynrrb5iD5s77Q3nETt71SCGGazm/2lt9HS5JU="; + rev = "refs/tags/${version}"; + hash = "sha256-MFVWdpfvmvGfWIuVdrigGucP52/dB4xCO4Pn1RvUJnM="; }; patches = [ From b1335210272bcb7c695dc6cfdb08d61fa3fbec96 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:54 +0200 Subject: [PATCH 087/752] python3Packages.circuitbreaker: 1.4.0 -> 2.0.0 --- .../python-modules/circuitbreaker/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix index 05fce26d6e65..9218d82847cc 100644 --- a/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/pkgs/development/python-modules/circuitbreaker/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock , pytestCheckHook +, pytest-asyncio +, pytest-mock , pythonOlder }: buildPythonPackage rec { pname = "circuitbreaker"; - version = "1.4.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,12 +18,13 @@ buildPythonPackage rec { owner = "fabfuel"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-l0ASt9CQmgJmWpRrghElbff/gaNOmxNh+Wj0C0p4jE0="; + hash = "sha256-jaDCMGCZZu3STluYeHDNgdEPf2DNq7bXJ0LPV3JZdk0="; }; nativeCheckInputs = [ - mock pytestCheckHook + pytest-asyncio + pytest-mock ]; pythonImportsCheck = [ From 8fad29c518e0ef0533508d98c640307b1b5df330 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:55 +0200 Subject: [PATCH 088/752] python3Packages.cirq-core: 1.1.0 -> 1.2.0 --- .../python-modules/cirq-core/default.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index ce188ce6811b..88d2b5115b3e 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -32,36 +32,24 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; - # Upstream package is broken on Python 3.11 https://github.com/quantumlib/Cirq/issues/6018 - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; rev = "refs/tags/v${version}"; - hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4="; + hash = "sha256-KEei5PJ0ammsduZVmMh2vaW3f58DYI4BCrFCl/SjUoo="; }; sourceRoot = "${src.name}/${pname}"; - patches = [ - # https://github.com/quantumlib/Cirq/pull/5991 - (fetchpatch { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-cirq/cirq-pr5991-np1.24.patch?rev=8"; - stripLen = 1; - hash = "sha256-d2FpaxM1PsPWT9ZM9v2gVrnLCy9zmvkkyAVgo85eL3U="; - }) - ]; - postPatch = '' substituteInPlace requirements.txt \ - --replace "matplotlib~=3.0" "matplotlib" \ - --replace "networkx~=2.4" "networkx" \ - --replace "numpy>=1.16,<1.24" "numpy" - ''; + --replace "matplotlib~=3.0" "matplotlib" + ''; propagatedBuildInputs = [ duet From 5a7dfd9776e8a05d40210f7a7f7254b42dd489e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:55 +0200 Subject: [PATCH 089/752] python3Packages.cleanlab: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/cleanlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index 0ac79e306c17..f1de682c40b5 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -16,7 +16,7 @@ }: let pname = "cleanlab"; - version = "2.4.0"; + version = "2.5.0"; in buildPythonPackage { inherit pname version; @@ -27,8 +27,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "cleanlab"; repo = pname; - rev = "v${version}"; - hash = "sha256-XFrjjBJA0OQEAspnQQiSIW4td0USJDXTp9C/91mobp8="; + rev = "refs/tags/v${version}"; + hash = "sha256-5XQQVrhjpvjwtFM79DqttObmw/GQLkMQVXb5jhiC8e0="; }; # postPatch = '' From 66ae840e93e775f7e75e4bf3e7bb2f8394f3e43f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:55 +0200 Subject: [PATCH 090/752] python3Packages.clickgen: 2.1.3 -> 2.1.8 --- .../python-modules/clickgen/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index c4598f86d9ac..026acd33caaa 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -3,7 +3,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, attrs , pillow +, pyyaml , toml , numpy , python @@ -12,7 +14,7 @@ buildPythonPackage rec { pname = "clickgen"; - version = "2.1.3"; + version = "2.1.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,19 +23,29 @@ buildPythonPackage rec { owner = "ful1e5"; repo = "clickgen"; rev = "refs/tags/v${version}"; - hash = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; + hash = "sha256-74nOqaRZXLOSF4sjydAbF3sRMrw+21+fYDs3hiVSszA="; }; - propagatedBuildInputs = [ pillow toml numpy ]; + propagatedBuildInputs = [ + attrs + numpy + pillow + pyyaml + toml + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; postInstall = '' # Copying scripts directory needed by clickgen script at $out/bin/ cp -R src/clickgen/scripts $out/${python.sitePackages}/clickgen/scripts ''; - pythonImportsCheck = [ "clickgen" ]; + pythonImportsCheck = [ + "clickgen" + ]; meta = with lib; { homepage = "https://github.com/ful1e5/clickgen"; From 04da19ff3f7691a8a10976b53dc3afdca04a0e35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:55 +0200 Subject: [PATCH 091/752] python3Packages.clickhouse-cli: 0.3.8 -> 0.3.9 --- pkgs/development/python-modules/clickhouse-cli/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 9e986383dc57..3c807716e03d 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -10,11 +10,12 @@ buildPythonPackage rec { pname = "clickhouse-cli"; - version = "0.3.8"; + version = "0.3.9"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pa3vkIyNblS1LOwBReTqg8JAR2Ii32a2QIHWjau0uZE="; + hash = "sha256-gkgLAedUtzGv/4P+D56M2Pb5YecyqyVYp06ST62sjdY="; }; propagatedBuildInputs = [ From d08f71ff52f0e96b0ea35700254d6204fb917b00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:56 +0200 Subject: [PATCH 092/752] python3Packages.clickhouse-connect: 0.6.8 -> 0.6.11 --- .../python-modules/clickhouse-connect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index e2a2915fe38b..1d693b3629f3 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.6.8"; + version = "0.6.11"; format = "setuptools"; @@ -32,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "clickhouse-connect"; owner = "ClickHouse"; - rev = "v${version}"; - hash = "sha256-T1vUXhOngPvA4wrg5jVzIiqj0B0gEnk/BS5OdopHgkA="; + rev = "refs/tags/v${version}"; + hash = "sha256-1ItHRbfV8tSH5h0f+/bXIBIWfAxh4Umxqm4N4MT7oek="; }; nativeBuildInputs = [ cython_3 ]; From 4477982d1cb898c205cf0e855c0ead3646db7d2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:56 +0200 Subject: [PATCH 093/752] python3Packages.click-odoo-contrib: 1.16.1 -> 1.17.0 --- .../development/python-modules/click-odoo-contrib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix index b0ddaef004b9..ced0f6678407 100644 --- a/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "click-odoo-contrib"; - version = "1.16.1"; + version = "1.17.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VFoS/lOw/jbJNj9xfgZHKzR6JDTwnlCAItq4mZ3RA6I="; + hash = "sha256-my6dWmAqvelihtB9SzFje01dZenkkNneKqcgwKtbOuA="; }; nativeBuildInputs = [ From c8356772ea01fcb902fbf78a815a3cc6d47652ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:56 +0200 Subject: [PATCH 094/752] python3Packages.cliff: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/cliff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index f6feaaf39562..978c1c3f62f8 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-l/wx6TVS477GZL6dVa1/kNwqtCqtjfKaW5hbZEybjPI="; + hash = "sha256-/FtuvI+4FTMncLJIXuNsCXU5N8N8zk8yJ83U4Qsz6sw="; }; postPatch = '' From f0a4cc453781189c3b8878606e12dfa20911e7cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:56 +0200 Subject: [PATCH 095/752] python3Packages.cohere: 4.21 -> 4.26.1 --- pkgs/development/python-modules/cohere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 29ec01f23823..0966ba8ae28c 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.21"; + version = "4.26.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9hFDj0Cd/F1aChU6WFNJ9agLFpxxArWZTZmZ7PhECGY="; + hash = "sha256-kiU5VooOWhqnjdhSHAIGV+D4pm9Qupz2oo0TZz9ASY8="; }; patches = [ From 98d6f425687d3e2c71eb2ffae1de9169f406e7db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:56 +0200 Subject: [PATCH 096/752] python3Packages.coinmetrics-api-client: 2023.8.30.20 -> 2023.9.11.14 --- .../python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index b113175941cc..b935abdaeb0e 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.30.20"; + version = "2023.9.11.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-zi9hFpmRILfWXA9eLGbzt/+v3l1wykZz10GUuH20hzE="; + hash = "sha256-hp1z8XvK02M+AMMKB9pox6yVWBhxcxtiZEL3oPkj/7k="; }; pythonRelaxDeps = [ From ae63bf704461c5ac07385841e5b79ae197357be7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:56 +0200 Subject: [PATCH 097/752] python3Packages.colored: 1.4.4 -> 2.2.3 --- .../python-modules/colored/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 1a8c55dfde09..af696f384f15 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -1,24 +1,33 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitLab +, flit-core +, unittestCheckHook }: buildPythonPackage rec { pname = "colored"; - version = "1.4.4"; - format = "setuptools"; + version = "2.2.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; + src = fetchFromGitLab { + owner = "dslackw"; + repo = "colored"; + rev = "refs/tags/${version}"; + hash = "sha256-4APFAIN+cmPPd6qbqVC9iU4YntNEjoPbJXZywG1hsBY="; }; - nativeCheckInputs = [ nose ]; + nativeBuildInputs = [ + flit-core + ]; - checkPhase = '' - nosetests - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ + "unittests" + ]; pythonImportsCheck = [ "colored" From 8a340413fd7337839e2d118dc7c9f280f42a1a1b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:56 +0200 Subject: [PATCH 098/752] python3Packages.comm: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/comm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix index 2f42ef87e928..627c1630489d 100644 --- a/pkgs/development/python-modules/comm/default.nix +++ b/pkgs/development/python-modules/comm/default.nix @@ -8,7 +8,7 @@ let pname = "comm"; - version = "0.1.3"; + version = "0.1.4"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "ipython"; repo = "comm"; rev = "refs/tags/v${version}"; - hash = "sha256-5IUE2g00GT231hjuM7mLPst0QTk2Y+Re302FRDq65C8="; + hash = "sha256-6GvAyiTm+zQ5sSynuJhAg50PaMTY9EFqVVsD3K2wTkY="; }; nativeBuildInputs = [ From c1115acec604a8451bc0f45ca173f780e5cd9479 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:57 +0200 Subject: [PATCH 099/752] python3Packages.compreffor: 0.5.4 -> 0.5.5 --- pkgs/development/python-modules/compreffor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 0b5e684fdf91..f587a2963800 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.4"; + version = "0.5.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MGulQEUGPrQ30T3VYzwRRlvzvWkFqNzqsNzAjtjX9xU="; + hash = "sha256-9NMmIJC8Q4hRC/H2S7OrgoWSQ9SRIPHxHvZpPrPCvHo="; }; patches = [ From ce508b54291aab1c31b179bb19650431a5cb3bc5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:57 +0200 Subject: [PATCH 100/752] python3Packages.configparser: 5.3.0 -> 6.0.0 --- .../python-modules/configparser/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index b703e5de599b..9dc6d16097a2 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "configparser"; - version = "5.3.0"; + version = "6.0.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA="; + hash = "sha256-7JFKseVsZy3h9cNIOWTmj3GzTkV5BLe3bga5Iq7AZ6g="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -18,6 +18,12 @@ buildPythonPackage rec { export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; + preCheck = '' + # avoid FileNotFoundError + # FileNotFoundError: [Errno 2] No such file or directory: 'cfgparser.3' + cd tests + ''; + meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; homepage = "https://github.com/jaraco/configparser"; From f0962123a6bdf9529f00307f042ce2a3632d24ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:57 +0200 Subject: [PATCH 101/752] python3Packages.contourpy: 1.0.7 -> 1.1.0 --- .../development/python-modules/contourpy/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index dfefc1b4486e..f5af82e55ff3 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -4,8 +4,10 @@ , pythonOlder # build +, meson +, meson-python +, ninja , pybind11 -, setuptools # propagates , numpy @@ -23,7 +25,7 @@ let countourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.0.7"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,12 +34,14 @@ let countourpy = buildPythonPackage rec { owner = "contourpy"; repo = "contourpy"; rev = "refs/tags/v${version}"; - hash = "sha256-n04b9yUoUMH2H7t8um/8h5XaL3hzY/uNMYmOKTVKEPA="; + hash = "sha256-7M+5HMDqQI4UgVfW/MXsVyz/yM6wjTcJEdw7vPvzuNY="; }; nativeBuildInputs = [ + meson + meson-python + ninja pybind11 - setuptools ]; propagatedBuildInputs = [ From 15af33b7428e2f7a390ffbd3ba280f3268e8512c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:57 +0200 Subject: [PATCH 102/752] python3Packages.correctionlib: 2.2.2 -> 2.3.3 --- pkgs/development/python-modules/correctionlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index 2156bd978229..45be07ce4dce 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "correctionlib"; - version = "2.2.2"; + version = "2.3.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-h3eggtPLSF/8ShQ5xzowZW1KSlcI/YBsPu3lsSyzHkw="; + hash = "sha256-4WXY7XfZVYaJD63y7fPB6tCsc+wGAsgnFlgtFbX5IK0="; }; patches = [ From a046621efdfa8d11a5bc430a7106f1174f109056 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:57 +0200 Subject: [PATCH 103/752] python3Packages.coverage: 7.2.1 -> 7.3.1 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 4e1f780e3613..2bcfe6c34655 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.2.1"; + version = "7.3.1"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-x38qkJPM8yndUjqbKzyFTCDSo9lott7zuCAnLKZzIkI="; + hash = "sha256-bLf+FYHetnt4LBUxNlQeIJAaoxLO7a8UZ9yzUlV4eVI="; }; # No tests in archive From b18bd308a667c5afe3892de8ed413526907fbd3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:58 +0200 Subject: [PATCH 104/752] python3Packages.crate: 0.31.1 -> 0.33.0 --- pkgs/development/python-modules/crate/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 6535ab5f6c8d..2a6b5a1fc1ee 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,25 +1,26 @@ { lib , fetchPypi , buildPythonPackage +, dask , urllib3 , geojson +, pandas , pythonOlder , sqlalchemy , pytestCheckHook , pytz -, stdenv }: buildPythonPackage rec { pname = "crate"; - version = "0.31.1"; + version = "0.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SYjzyPqKR6BpC5z3P/ASDXe0mwi8Hz413b8Fm7cc5zo="; + hash = "sha256-bzsJnWw4rLjl1VrjmfNq4PudrnWPB1FzIuWAc9WmT6M="; }; propagatedBuildInputs = [ @@ -29,6 +30,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + dask + pandas pytestCheckHook pytz ]; From bdfd57d929251f0c6bb061b8d45e454a59793587 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:58 +0200 Subject: [PATCH 105/752] python3Packages.cronsim: 2.3 -> 2.5 --- pkgs/development/python-modules/cronsim/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index ef4e533a977c..098dbe711d9d 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -1,20 +1,22 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "cronsim"; - version = "2.3"; + version = "2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ebFYIOANXZLmM6cbovwBCJH8Wr/HlJbOR9YGp8Jw7pc="; + src = fetchFromGitHub { + owner = "cuu508"; + repo = "cronsim"; + rev = "refs/tags/${version}"; + hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg="; }; nativeCheckInputs = [ From 6be0873b6d46a6df0a3e780113f25046f788f08e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:58 +0200 Subject: [PATCH 106/752] python3Packages.cryptolyzer: 0.8.4 -> 0.10.0 --- pkgs/development/python-modules/cryptolyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index f25c46907b61..da45bb33ffc0 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.8.4"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CryptoLyzer"; inherit version; - hash = "sha256-7qMNz8F0B3bph/nHkS1VrkcF1bETWAklXFOlMWu3K9s="; + hash = "sha256-jb2yin3W+VfqFWJbQOXNml0xJEbSr1SfSSFupfxBHRs="; }; propagatedBuildInputs = [ From 6f14e9a7389048c48c4f02605fa3bbeca9b54201 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Sep 2023 13:09:49 +0200 Subject: [PATCH 107/752] python311Packages.cryptodatahub: init at 0.10.1 Packaged for crytoparser. --- .../python-modules/cryptodatahub/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/cryptodatahub/default.nix diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix new file mode 100644 index 000000000000..734569297796 --- /dev/null +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab + +# build-system +, setuptools + +# dependencies +, asn1crypto +, attrs +, pathlib2 +, python-dateutil +, six +, urllib3 + +# tests +, beautifulsoup4 +, pyfakefs +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "cryptodatahub"; + version = "0.10.1"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "coroner"; + repo = "cryptodatahub"; + rev = "v${version}"; + hash = "sha256-eLdK5gFrLnbIBB1NTeQzpdCLPdATVjzPn5LhhUsDuwo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asn1crypto + attrs + pathlib2 + python-dateutil + six + urllib3 + ]; + + pythonImportsCheck = [ "cryptodatahub" ]; + + nativeCheckInputs = [ + beautifulsoup4 + pyfakefs + unittestCheckHook + ]; + + preCheck = '' + # failing tests + rm test/updaters/test_common.py + ''; + + meta = with lib; { + description = "Repository of cryptography-related data"; + homepage = "https://gitlab.com/coroner/cryptodatahub"; + changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mpl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 958016ebbb13..78847f3f9850 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2342,6 +2342,8 @@ self: super: with self; { cryptg = callPackage ../development/python-modules/cryptg { }; + cryptodatahub = callPackage ../development/python-modules/cryptodatahub { }; + cryptography = callPackage ../development/python-modules/cryptography { inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security; From 2c6809e48225c5c0a76ddbdb6271b86738a95150 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:58 +0200 Subject: [PATCH 108/752] python3Packages.cryptoparser: 0.8.4 -> 0.10.0 --- .../python-modules/cryptoparser/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index afbbe513b21b..1eab372381bc 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , attrs -, six , asn1crypto +, cryptodatahub , python-dateutil +, urllib3 +, pytestCheckHook }: buildPythonPackage rec { pname = "cryptoparser"; - version = "0.8.4"; + version = "0.10.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-Sn4sfzu1Y1gC+4K9WdiZW92cYuVbUsBXcNbNQOv0BRw="; + pname = "CryptoParser"; + inherit version; + hash = "sha256-43V82/nxtOa9y4fVOMsxhoSQpDxTyOcHIGsbRr0euAk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - attrs - six asn1crypto + attrs + cryptodatahub python-dateutil + urllib3 ]; pythonImportsCheck = [ From 290d253caa49eb0bc3e2046ccbeb33fc2c48ee74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:58 +0200 Subject: [PATCH 109/752] python3Packages.cvxopt: 1.3.0 -> 1.3.2 --- pkgs/development/python-modules/cvxopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 8c1da0f7f5c4..0a2b13ad4c81 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -21,13 +21,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.3.0"; + version = "1.3.2"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - hash = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; + hash = "sha256-NGH6QsGyJAuk2h2YXKc1A5FBV/xMd0FzJ+1tfYWs2+Y="; }; buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]); From b77342a8c31d4a551285139dfcbb345a465ab1bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:59 +0200 Subject: [PATCH 110/752] python3Packages.cx-freeze: 6.14.4 -> 6.15.7 --- pkgs/development/python-modules/cx-freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index b30fa8e5659f..db03a359a6bd 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.14.4"; + version = "6.15.7"; format = "pyproject"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-ydox+o4B0t/dYD+nDiY5CmWupt1iMzyU2fA4tCqgVcg="; + hash = "sha256-+X9FWkpG7gwHbZIqKftT7/RioWXdBCP6J+J8KkRTtAs="; }; nativeBuildInputs = [ From 5623075fea45294e0228b3a75ad2eb547627c4ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:59 +0200 Subject: [PATCH 111/752] python3Packages.cytoolz: 0.12.1 -> 0.12.2 --- pkgs/development/python-modules/cytoolz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 768950237acb..ce24c505b83b 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.12.1"; + version = "0.12.2"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4="; + hash = "sha256-MdSwRV1y2RRkX4A9kX2vTzFNEVxw3gV404IN64sQH2Y="; }; nativeBuildInputs = [ cython ]; From 0d987586d1dc4bd648c09cdbdcce1c65c460a560 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:59 +0200 Subject: [PATCH 112/752] python3Packages.dalle-mini: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/dalle-mini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dalle-mini/default.nix b/pkgs/development/python-modules/dalle-mini/default.nix index 0f5a0f07e06d..f20b693d3870 100644 --- a/pkgs/development/python-modules/dalle-mini/default.nix +++ b/pkgs/development/python-modules/dalle-mini/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "dalle-mini"; - version = "0.1.4"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - hash = "sha256-UwCcoKbGxZT5XB+Mtv8kAHFdj0iLw8U1Ayo60y3Tm7U="; + hash = "sha256-k4XILjNNz0FPcAzwPEeqe5Lj24S2Y139uc9o/1IUS1c="; }; format = "setuptools"; From 9bfc61135fa0807bd96091773c8ad072c5c038da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:59 +0200 Subject: [PATCH 113/752] python3Packages.dash: 2.10.2 -> 2.13.0 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index d990d710d639..5d99a40c004b 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.10.2"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OcY4nEtIfR9nvBaBwpHeUJkHXwWZp+LZxjhEkwjRC9k="; + hash = "sha256-+pTxEPuXtcu+ZekphqXD/k2tQ5werH/1ueGJOxA8pZw="; }; propagatedBuildInputs = [ From 737963ab6bd3059f121826766320e67e276aba11 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:05:59 +0200 Subject: [PATCH 114/752] python3Packages.dask-awkward: 2023.8.1 -> 2023.9.1 --- pkgs/development/python-modules/dask-awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index a0ae12d7c13e..a913f577b77b 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.8.1"; + version = "2023.9.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY="; + hash = "sha256-eGdOFI2KCpheMQcUH1jokyBO96dqyUlcl98jcgdRkYA="; }; patches = [ From f4baa962ef10f8ec9dcbe84f0b6b99403cbeb1ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 115/752] python3Packages.databases: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/databases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 2f731daa1131..bbd16ffb126d 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3RRHXkM8/GoIcO6Y1EZGbnp/X5gzYkW/PV4bzGay6ZI="; + hash = "sha256-e3iMZBPdldZFuS7FyhbGj9SufnH5hBBt8MEUjixXfqA="; }; propagatedBuildInputs = [ From 994619c736a1fbd27e98a521c3961e9953fe815d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 116/752] python3Packages.databricks-sql-connector: 2.4.0 -> 2.9.3 --- .../python-modules/databricks-sql-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 8d087712a539..f47949a6198e 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.4.0"; + version = "2.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-V8Nl6xr96Xnd1gkw9R0aqXkitLESsAyW7ufTYn6ttLg="; + hash = "sha256-y4Pmkgq3hv6mVu0zBsoiqNOcsHM0mxTNiJOCCZ+rwA8="; }; pythonRelaxDeps = [ From 54e51c49a31e75067d22eb31bf3aafbb73b4d244 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 117/752] python3Packages.dataset: 1.6.0 -> 1.6.2 --- pkgs/development/python-modules/dataset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index a3f2d67d35a7..9446920d0b05 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dataset"; - version = "1.6.0"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fNvJBdZjtYKvhGzwULfP2iDNUrqhxiwRlhlFrHfmGdU="; + hash = "sha256-d9NiEY9nqMu0hI29MKs2K5+nz+vb+vQmycUAyziWmpk="; }; propagatedBuildInputs = [ From e75adaa1cd760814afc3b467dd9e355a2157cf4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 118/752] python3Packages.datasets: 2.14.4 -> 2.14.5 --- pkgs/development/python-modules/datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index eae7b663dd99..0802ae5cf6f6 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.14.4"; + version = "2.14.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2XC5k546JvqUV4xeL1SRQOHDzItL1CE3bJQMjva3IkY="; + hash = "sha256-oLB6laY/Si071mBKoWlZpd1fqr/wNtAnhRvBKLjeEuE="; }; propagatedBuildInputs = [ From a079000ab9154a9fbda443735cb0a697108a8cf7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 119/752] python3Packages.datauri: 1.1.0 -> 2.0.0 --- .../python-modules/datauri/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index 4c89eb9ba279..d5ed9bf0525e 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -1,31 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, pydantic , pytestCheckHook }: buildPythonPackage rec { pname = "datauri"; - version = "1.1.0"; + version = "2.0.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "fcurella"; repo = "python-datauri"; - rev = "v${version}"; - hash = "sha256-Eevd/xxKgxvvsAfI/L/KShH+PfxffBGyVwKewLgyEu0="; + rev = "refs/tags/v${version}"; + hash = "sha256-k4tlWRasGa2oQykCD9QJl65UAoZQMJVdyCfqlUBBgqY="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "datauri" ]; nativeCheckInputs = [ + pydantic pytestCheckHook ]; - disabledTestPaths = [ - # UnicodeDecodeError: 'utf-8' codec can't decode - "tests/test_file_ebcdic.txt" + disabledTests = [ + "test_pydantic" # incompatible with pydantic v2 ]; meta = with lib; { From 63d8d0141db0b9441075881cc367db83d7b5b18c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 120/752] python3Packages.dbt-bigquery: 1.5.3 -> 1.6.4 --- pkgs/development/python-modules/dbt-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 9d456c84d22c..5b1e9aeeb946 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.5.3"; + version = "1.6.4"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mzqUdT+dI7U0tHHcr0joIB1UCfKXrDdqhtVFShjIKus="; + hash = "sha256-m458gg5TQ7jznhA9QNi8KQ+ICxdQn58mS0jvyZ88Fmg="; }; nativeBuildInputs = [ From a99480f317815616a6a1a80aec43e6809b9c1744 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 121/752] python3Packages.dbt-core: 1.5.5 -> 1.6.2 --- pkgs/development/python-modules/dbt-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index e927665bdc85..930dd5618ccf 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.5.5"; + version = "1.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aAe3sNa4CxqynsFHoTLEYWo12jEF/LAyYMqnpy5cTbg="; + hash = "sha256-zmZdFOB0jQHamRJ7Zuzr/augP6Y2smAdUvqSXDZDuwo="; }; sourceRoot = "${src.name}/core"; From 2b67c194355e90fbea627188766936be3a5438f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:00 +0200 Subject: [PATCH 122/752] python3Packages.dbt-redshift: 1.5.8 -> 1.6.1 --- pkgs/development/python-modules/dbt-redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index b757683e9516..46f62dcafd7e 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.5.8"; + version = "1.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T7cNszIroOT8TNfOzZpdJDR1+5ybhkXvyvvM5zokVgo="; + hash = "sha256-5sgge55BwvC00Gj3UvLS/uzCgNSi4j4YdVlg/LuJI+s="; }; nativeBuildInputs = [ From 7eb0fcabb38ef4e51804ff676e0ba153ee27ddde Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:01 +0200 Subject: [PATCH 123/752] python3Packages.dbt-snowflake: 1.5.2 -> 1.6.2 --- pkgs/development/python-modules/dbt-snowflake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index b32f7fbd9a6b..dccf0ed7f989 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.5.2"; + version = "1.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oz9BDvxSG4kOteuwKiPccxlsmQtOEwDLVyirDSWy1kY="; + hash = "sha256-AOO3VbU1R3/snH7U7K9XXokBGXtf9Udpv7eR5HCBxss="; }; propagatedBuildInputs = [ From a9a61914c00f750f6f8ed6c419e6cc49ad3ed0f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:01 +0200 Subject: [PATCH 124/752] python3Packages.deal: 4.24.0 -> 4.24.2 --- pkgs/development/python-modules/deal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 861f9c6847ce..0333bb37ce3b 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "deal"; - version = "4.24.0"; + version = "4.24.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5gd46SMucH0rek9talMJ74TMRRvUm5Up6pCusUIHDjE="; + hash = "sha256-bdIoKOOC7qSer9Cp9A55HG960xunKXT2WiXp0UC6tsI="; }; postPatch = '' From 05cb8d74a087729a63f5c060c7f387930d9a7e6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:01 +0200 Subject: [PATCH 125/752] python3Packages.deap: 1.3.3 -> 1.4.1 --- pkgs/development/python-modules/deap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index a6e901199204..4f0d493c0f80 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deap"; - version = "1.3.3"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - hash = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE="; + hash = "sha256-zAHemJLfp9G8mAPasoiS/q0XfwGCyB20c2CiQOrXeP8="; }; propagatedBuildInputs = [ numpy matplotlib ]; From 7d2078409a4b056fd3b16b65f02ff54d21e0cde0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:01 +0200 Subject: [PATCH 126/752] python3Packages.debugpy: 1.6.7.post1 -> 1.8.0 --- pkgs/development/python-modules/debugpy/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 2cf365846246..85389fba2fb2 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,10 +2,8 @@ , stdenv , buildPythonPackage , pythonOlder -, pythonAtLeast , fetchFromGitHub , substituteAll -, fetchpatch , gdb , django , flask @@ -23,7 +21,7 @@ buildPythonPackage rec { version = "1.8.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "microsoft"; @@ -110,13 +108,8 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; disabledTests = [ - # https://github.com/microsoft/debugpy/issues/1241 - "test_flask_breakpoint_multiproc" - - # DeprecationWarning: pkg_resources is deprecated as an API - # Supposedly fixed in https://github.com/microsoft/debugpy/pull/1374, - # but still fails for a nix build - "test_gevent" + # testsuite gets stuck at this one + "test_attach_pid_client" ]; pythonImportsCheck = [ From 19ab95a25207444d63647e1b6d4370bce15012a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:01 +0200 Subject: [PATCH 127/752] python3Packages.deepdiff: 6.3.0 -> 6.4.1 --- pkgs/development/python-modules/deepdiff/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 7f1f0481d228..93deb8c10b81 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -11,12 +11,13 @@ , python-dateutil , pyyaml , toml +, tomli-w , pythonOlder }: buildPythonPackage rec { pname = "deepdiff"; - version = "6.3.0"; + version = "6.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-txZ1X1J8DwueDRpLP3OuRA+S9hc5G3YCmEG+AS6ZAkI="; + hash = "sha256-oO5+ZCDgqonxaHR95tSrPkZDar/fzr1FXtl6J2W3PeU="; }; postPatch = '' @@ -52,8 +53,15 @@ buildPythonPackage rec { numpy pytestCheckHook python-dateutil + tomli-w ] ++ passthru.optional-dependencies.cli; + disabledTests = [ + # not compatible with pydantic 2.x + "test_pydantic1" + "test_pydantic2" + ]; + pythonImportsCheck = [ "deepdiff" ]; From 032456462aca6f560d04865894690719377922ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:01 +0200 Subject: [PATCH 128/752] python3Packages.defcon: 0.10.2 -> 0.10.3 --- pkgs/development/python-modules/defcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 8d5d9da29a02..3203f0bb973e 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ruOW5taeRa5lyCZHgTktTCkRaTSyc3rXbYIwtAwYKkQ="; + hash = "sha256-Vt4m18dfFk7qA+KLwRtMdpxo1wX6GG38rrVsJ/mkzAw="; extension = "zip"; }; From df6d6c7fc9a23c2b3b774146f5c7453fe67fb54a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:01 +0200 Subject: [PATCH 129/752] python3Packages.deprecated: 1.2.13 -> 1.2.14 --- pkgs/development/python-modules/deprecated/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 4c8dae04e7bd..ed2cf8a01171 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "deprecated"; - version = "1.2.13"; + version = "1.2.14"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "tantale"; repo = "deprecated"; - rev = "v${version}"; - hash = "sha256-rCDUY/TVmJqhrxDah62lEhqpr05JNZSyiFNTlHvSnmw="; + rev = "refs/tags/v${version}"; + hash = "sha256-H5Gp2F/ChMeEH4fSYXIB34syDIzDymfN949ksJnS0k4="; }; nativeBuildInputs = [ From 3e45935566d358977e954eab3e6b077681e070ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:02 +0200 Subject: [PATCH 130/752] python3Packages.devtools: 0.11.0 -> 0.12.2 --- pkgs/development/python-modules/devtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index ec386f8e0b29..08a5f2e7f50c 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "devtools"; - version = "0.11.0"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-ogogXZnuSFkWktCin+cyefjqIbGFRBVIeOrZJAa3hOE="; + hash = "sha256-1HFbNswdKa/9cQX0Gf6lLW1V5Kt/N4X6/5kQDdzp1Wo="; }; nativeBuildInputs = [ From 0a53a81bd007214f0163068284fe5024545c0af9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:02 +0200 Subject: [PATCH 131/752] python3Packages.diff-match-patch: 20200713 -> 20230430 --- .../diff-match-patch/default.nix | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 3e05deb5e2d3..93d9e3288dda 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -1,21 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, python }: +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, unittestCheckHook +}: buildPythonPackage rec { pname = "diff-match-patch"; - version = "20200713"; - - meta = { - homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; - description = "Diff, Match and Patch libraries for Plain Text"; - license = lib.licenses.asl20; - }; + version = "20230430"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "da6f5a01aa586df23dfc89f3827e1cafbb5420be9d87769eeb079ddfd9477a18"; + hash = "sha256-lTAZzbnJ0snke1sSvP889HRvxFmOtAYHb6H8J+ah8Vw="; }; - checkPhase = '' - ${python.interpreter} -m unittest -v diff_match_patch.tests - ''; + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; + description = "Diff, Match and Patch libraries for Plain Text"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; } From abcfbd44616e6ec00e8f7e7d8bf909cf1daf011d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:02 +0200 Subject: [PATCH 132/752] python3Packages.dill: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/dill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 3caf068a1270..4107e62c7ed1 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "dill"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/dill-${version}"; - hash = "sha256-lh1o/TqnqtYN9xTZom33y1/7ZhMEAFpheLdtalwgObQ="; + hash = "sha256-1cRGA5RuNjlpc3jq9SAsUYgmPauIV8zRF9SxOmveljI="; }; nativeBuildInputs = [ From 3e57c65bacbc5d2c34a9db414714bb9c270e43ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:02 +0200 Subject: [PATCH 133/752] python3Packages.dinghy: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/dinghy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index aea49cde6f18..cae8c8abcc66 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dinghy"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw="; + hash = "sha256-a1CHbPSoiR3JbuAXYPJc1EsSq13DbrOttk9zLFF9+cM="; }; propagatedBuildInputs = [ From 6babcdba48c23f33fbd5297a6bb8d1062673627c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:02 +0200 Subject: [PATCH 134/752] python3Packages.distlib: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/distlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index f9668720653b..ca91e77a6672 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FLrS2bBNOjYSesl/MLEqGSaPIRBj2PjuT0cQiJbhG0Y="; + hash = "sha256-na/lSzSgKOr9lQOdXl1IUaE3NFQPEzEGDTHJkW5xR6g="; }; nativeBuildInputs = [ From d419e300558ad684473fa22aff5179860515fc39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 135/752] python3Packages.distrax: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/distrax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index 69679a8bbf7f..80dc392c603d 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "distrax"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - hash = "sha256-x9ORfhGX5catEZMfR+iXkZSRa/wIb0B3CrCWOWf35Ks="; + hash = "sha256-klXT5wfnWUGMrf5sQhYqz7Foc/Ou5y4GIFgtTff1ZFQ="; }; buildInputs = [ From d4a78112636208228793894bd9f9287425103a0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 136/752] python3Packages.django-anymail: 9.0 -> 10.1 --- pkgs/development/python-modules/django-anymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index fb8ca502695d..50b86d7fb90a 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "9.0"; + version = "10.1"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; + hash = "sha256-unmbYQFLeqfqE1uFLMPLUad1UqA+sgbTzwRfpRhM3ik="; }; propagatedBuildInputs = [ From f86c2ccc4f9acb51b527f17326da6919d10c67a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 137/752] python3Packages.django-environ: 0.9.0 -> 0.11.2 --- pkgs/development/python-modules/django-environ/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix index bb3cd1acf7ce..b0e3f6eb0c40 100644 --- a/pkgs/development/python-modules/django-environ/default.nix +++ b/pkgs/development/python-modules/django-environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.9.0"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - hash = "sha256-v/U4FTMFYyjJrAL3F5C9W/HOqBsb7rZI8ouByeg+CiE="; + hash = "sha256-8yqHqgiZiUwn1OF3b6a0d+gWTtf2s+QQpiptcsqvZL4="; }; # The testsuite fails to modify the base environment From 939aa839778a317386fccb436509aae0fed022e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 138/752] python3Packages.django-extensions: 3.2.1 -> 3.2.3 --- .../python-modules/django-extensions/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 3c09cde4d10b..22df58346c27 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , django , factory_boy , mock @@ -16,23 +15,15 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI="; + hash = "sha256-A2+5FBv0IhTJPkwgd7je+B9Ac64UHJEa3HRBbWr2FxM="; }; - patches = [ - (fetchpatch { - # pygments 2.14 compat for tests - url = "https://github.com/django-extensions/django-extensions/commit/61ebfe38f8fca9225b41bec5418e006e6a8815e1.patch"; - hash = "sha256-+sxaQMmKi/S4IlfHqARPGhaqc+F1CXUHVFyeU/ArW2U="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=django_extensions --cov-report html --cov-report term" "" From a676d9380639cb5a4cf62df502a564f23e0a1f18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 139/752] python3Packages.django-filter: 22.1 -> 23.2 --- pkgs/development/python-modules/django-filter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 1225a3301a10..80714b28cf72 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-filter"; - version = "22.1"; + version = "23.2"; src = fetchPypi { inherit pname version; - hash = "sha256-7Uc7duhPfoOyURuyBQw++zbRNSB9ASjf465LNuNZS6U="; + hash = "sha256-L+FfeBCEde2lJWkoEyBfpvnowcrxrmXapYYtQDxtvwA="; }; propagatedBuildInputs = [ django ]; From ff728fe8b18d75055d30a6e81cebd3214ba4a7ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 140/752] python3Packages.django-hijack: 3.3.0 -> 3.4.1 --- pkgs/development/python-modules/django-hijack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index ef77abefeeae..01e1593a82ce 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.3.0"; + version = "3.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-ytQ4xxkBAC3amQbenD8RO5asrbfNAjOspWUY3c2hkig="; + hash = "sha256-y8KT/Fbk2eQDbGzcJtLdwS6jPCNoTWXousvqY+GlFnQ="; }; postPatch = '' From 9636681b9cee32b9fb475a8e184c7e60bf1ed819 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 141/752] python3Packages.django-import-export: 3.2.0 -> 3.3.1 --- .../python-modules/django-import-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index bc87f6f5dfd6..5f68c82b1f56 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "3.2.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ws9gUPCr5nM8HGbCt9+6IFjLgAKiCMQRkY/yfIb2mng="; + hash = "sha256-9eFBFTx+M28tbIKflldvDJW1po5ht/5FBX5ImfHGFuk="; }; propagatedBuildInputs = [ From 42dcc556e5f41f1ff8f9cf15b16d8180c3660c5f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:03 +0200 Subject: [PATCH 142/752] python3Packages.django-redis: 5.2.0 -> 5.3.0 --- pkgs/development/python-modules/django-redis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index e7aed3f22b59..63a3519eb745 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "jazzband"; repo = "django-redis"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-eX9rUUvpkRrkZ82YalWn8s9DTw6nsbGzi1A6ibRoQGw="; }; @@ -71,12 +71,12 @@ buildPythonPackage { # ModuleNotFoundError: No module named 'test_cache_options' "test_custom_key_function" # ModuleNotFoundError: No module named 'test_client' + "test_delete_pattern_calls_delete_for_given_keys" "test_delete_pattern_calls_get_client_given_no_client" "test_delete_pattern_calls_make_pattern" - "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" "test_delete_pattern_calls_pipeline_delete_and_execute" "test_delete_pattern_calls_scan_iter" - "test_delete_pattern_calls_delete_for_given_keys" + "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" ]; meta = with lib; { From acb5ad0b2e23057c32c962ee6ddf98144cca286f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:04 +0200 Subject: [PATCH 143/752] python3Packages.django-storages: 1.13.2 -> 1.14 --- .../django-storages/default.nix | 83 ++++++++++++++----- 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 5b638aa05b34..1bce8c0d751e 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,53 +1,90 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies , django + +# optional-dependencies , azure-storage-blob , boto3 , dropbox , google-cloud-storage , libcloud , paramiko + +# tests +, cryptography +, moto +, pytestCheckHook +, rsa }: buildPythonPackage rec { pname = "django-storages"; - version = "1.13.2"; + version = "1.14"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-y63RXJCc63JH1P/FA/Eqm+w2mZ340L73wx5XF31RJog="; + src = fetchFromGitHub { + owner = "jschneier"; + repo = "django-storages"; + rev = "refs/tags/${version}"; + hash = "sha256-q+vQm1T5/ueGPfwzuUOmSI/nESchqJc4XizJieBsLWc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ django ]; - preCheck = '' - export DJANGO_SETTINGS_MODULE=tests.settings - # timezone issues https://github.com/jschneier/django-storages/issues/1171 - substituteInPlace tests/test_sftp.py \ - --replace 'test_accessed_time' 'dont_test_accessed_time' \ - --replace 'test_modified_time' 'dont_test_modified_time' - ''; - - nativeCheckInputs = [ - azure-storage-blob - boto3 - dropbox - google-cloud-storage - libcloud - paramiko - ]; + passthru.optional-dependencies = { + azure = [ + azure-storage-blob + ]; + boto3 = [ + boto3 + ]; + dropbox = [ + dropbox + ]; + google = [ + google-cloud-storage + ]; + libcloud = [ + libcloud + ]; + s3 = [ + boto3 + ]; + sftp = [ + paramiko + ]; + }; pythonImportsCheck = [ "storages" ]; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; + + nativeCheckInputs = [ + cryptography + moto + pytestCheckHook + rsa + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + meta = with lib; { - description = "Collection of custom storage backends for Django"; - homepage = "https://django-storages.readthedocs.io"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; + description = "Collection of custom storage backends for Django"; + downloadPage = "https://github.com/jschneier/django-storages/"; + homepage = "https://django-storages.readthedocs.io"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; From d9384600533279f5a1c8b1904fa95e391600f711 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:04 +0200 Subject: [PATCH 144/752] python3Packages.django-stubs: 4.2.3 -> 4.2.4 --- pkgs/development/python-modules/django-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index fe7e96579cdb..6dcc875884e0 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "4.2.3"; + version = "4.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2tqzm0bZro83qOh5xZDzmp4EK1ZcA/oMWo91S0QbHyM="; + hash = "sha256-fUoTLDgVGYFehlwnqJ7KQby9BgVoMlByJIFqQ9dcYBw="; }; propagatedBuildInputs = [ From e30d4edaf04c618a563b8281c5a1f8e9234e2621 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:04 +0200 Subject: [PATCH 145/752] python3Packages.django-taggit: 3.1.0 -> 4.0.0 https://github.com/jazzband/django-taggit/blob/4.0.0/CHANGELOG.rst --- .../python-modules/django-taggit/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 4260f76e03c5..81326d195a2d 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , django , djangorestframework , python @@ -10,24 +9,16 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "3.1.0"; + version = "4.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg="; + hash = "sha256-TVLenTckWpufmMDscf3M8dIoPjjohm1Ap65qO2eHoWE="; }; - patches = [ - (fetchpatch { - # Django 4.2 support; https://github.com/jazzband/django-taggit/pull/850 - url = "https://github.com/jazzband/django-taggit/commit/5f19cfbaa14e8d6d4d1679529eb168a87ca97908.patch"; - hash = "sha256-KcsiACLy3+1JoFquu//Kz+iAySZQAVIuBEKzNZaaR9s="; - }) - ]; - propagatedBuildInputs = [ django ]; From b95727f367249b5283463734309401e7e2b2891f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:04 +0200 Subject: [PATCH 146/752] python3Packages.dj-rest-auth: 4.0.1 -> 5.0.0 --- pkgs/development/python-modules/dj-rest-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index a2219ae22cc5..2f9ae61b1a79 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "4.0.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-+ladx0b/bvvUW8zLjtG8IiWWdfPTqqm/KYbEK9uiFaU="; + hash = "sha256-GSNY8AC4KvxHxq+18qTDgSlyKpJvq0kSVRp7NdMHe18="; }; postPatch = '' From 1b3f4458eefc3a275bd2de41d096caf782d91a1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:04 +0200 Subject: [PATCH 147/752] python3Packages.docformatter: 1.6.4 -> 1.7.5 --- pkgs/development/python-modules/docformatter/default.nix | 4 ++-- .../development/python-modules/docformatter/test-path.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 52bdb7ccc9d7..5e0240034413 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.6.4"; + version = "1.7.5"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OQNE6Is1Pl0uoAkFYh4M+c8oNWL/uIh4X0hv8X0Qt/g="; + hash = "sha256-QUjeG84KwI5Y3MU1wrmjHBXU2tEJ0CuiR3Y/S+dX7Gs="; }; patches = [ diff --git a/pkgs/development/python-modules/docformatter/test-path.patch b/pkgs/development/python-modules/docformatter/test-path.patch index bd61c0ca829b..2959d84704e8 100644 --- a/pkgs/development/python-modules/docformatter/test-path.patch +++ b/pkgs/development/python-modules/docformatter/test-path.patch @@ -1,13 +1,13 @@ diff --git a/tests/conftest.py b/tests/conftest.py -index 5f5a9aa..3289222 100644 +index 762d246..7f86763 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -92,21 +92,9 @@ def run_docformatter(arguments, temporary_file): +@@ -101,21 +101,9 @@ def run_docformatter(arguments, temporary_file): Return subprocess object. """ - if "DOCFORMATTER_COVERAGE" in os.environ and int( -- os.environ["DOCFORMATTER_COVERAGE"] +- os.environ["DOCFORMATTER_COVERAGE"] - ): - DOCFORMATTER_COMMAND = [ - "coverage", From 0b6470747786aa0096d47a59d359632344f2f55a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:04 +0200 Subject: [PATCH 148/752] python3Packages.docker: 6.0.1 -> 6.1.3 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index f4c59515315c..80c73f2fe0a6 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "docker"; - version = "6.0.1"; + version = "6.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iWxCguXHr1xF6LaDsLDDOTKXT+blD8aQagqDYWqz2pc="; + hash = "sha256-qm0XgwBFul7wFo1eqjTTe+6xE5SMQTr/4dWZH8EfmiA="; }; nativeBuildInputs = [ From adbb57375a63bfa57e6cc3100df6573d6a04fc4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:05 +0200 Subject: [PATCH 149/752] python3Packages.docopt-ng: 0.8.1 -> 0.9.0 --- .../python-modules/docopt-ng/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/docopt-ng/default.nix b/pkgs/development/python-modules/docopt-ng/default.nix index a6297780a83a..cdeda778e0dc 100644 --- a/pkgs/development/python-modules/docopt-ng/default.nix +++ b/pkgs/development/python-modules/docopt-ng/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, pdm-backend }: buildPythonPackage rec { pname = "docopt-ng"; - version = "0.8.1"; + version = "0.9.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-6mphooj8hk7uayLW/iiqIC1Z/Ib60F8W/145zE6n9uM="; + pname = "docopt_ng"; + inherit version; + hash = "sha256-kcbaELW7by6eJTRYKfuCeMeK8Bn2/ECIetSbBgSDsdc="; }; + nativeBuildInputs = [ + pdm-backend + ]; + pythonImportsCheck = [ "docopt" ]; doCheck = false; # no tests in the package From 2b1ad99374ed5af40dd3603b63b12ad11eb19af3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:05 +0200 Subject: [PATCH 150/752] python3Packages.docutils: 0.19 -> 0.20.1 --- pkgs/development/python-modules/docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index ca7fcae7406e..136f679fcf6e 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.19"; + version = "0.20.1"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-M5laZ1PDC39Xf+v8LFBBH+xqrH9//rfEz+WZEHLc+eY="; + hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; }; # Only Darwin needs LANG, but we could set it in general. From 7c198d9e968a54e0f51102460294f9c809dec9a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:05 +0200 Subject: [PATCH 151/752] python3Packages.dogpile-cache: 1.2.0 -> 1.2.2 --- .../python-modules/dogpile-cache/default.nix | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index 4f5337fdb04c..069d08f4d551 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -2,41 +2,45 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , pytestCheckHook -, mock , mako , decorator , stevedore +, typing-extensions }: buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.2.0"; + version = "1.2.2"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "dogpile.cache"; inherit version; - hash = "sha256-R1VMhgzrSE3Vrvn/H4j+yz1K72u5IRlFD1vLqgJrv7E="; + hash = "sha256-/ZAiwNnLra3yCUI5GpWtrylr6AtC2qjiAvjeHCHxmLI="; }; - preCheck = '' - # Disable concurrency tests that often fail, - # probably some kind of timing issue. - rm tests/test_lock.py - # Failing tests. https://bitbucket.org/zzzeek/dogpile.cache/issues/116 - rm tests/cache/test_memcached_backend.py - ''; + nativeBuildInputs = [ + setuptools + ]; - dontUseSetuptoolsCheck = true; + propagatedBuildInputs = [ + decorator + stevedore + typing-extensions + ]; - nativeCheckInputs = [ pytestCheckHook mock mako ]; - - propagatedBuildInputs = [ decorator stevedore ]; + nativeCheckInputs = [ + pytestCheckHook + mako + ]; meta = with lib; { description = "A caching front-end based on the Dogpile lock"; - homepage = "https://bitbucket.org/zzzeek/dogpile.cache"; + homepage = "https://github.com/sqlalchemy/dogpile.cache"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; From 942a15a274de315bc293b24666e87db6e23b9205 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:05 +0200 Subject: [PATCH 152/752] python3Packages.draftjs-exporter: 2.1.7 -> 5.0.0 --- .../development/python-modules/draftjs-exporter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix index aac2ed2f6baf..ef94901e9aac 100644 --- a/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "draftjs-exporter"; - version = "2.1.7"; + version = "5.0.0"; src = fetchFromGitHub { repo = "draftjs_exporter"; owner = "springload"; - rev = "v${version}"; - sha256 = "sha256-tw0r9RnQdIwcY+pqnW8fcV0o2LzmxW0MZPn5drNgK80="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4="; }; passthru.optional-dependencies = { From b249bad85a5746ccac8e63cb47df7f0edc70150a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:05 +0200 Subject: [PATCH 153/752] python3Packages.duckdb-engine: 0.7.3 -> 0.9.2 --- pkgs/development/python-modules/duckdb-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index f2b49cd0ea7b..bb13b860e8e0 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.7.3"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-Z9m1+Bc/csWKdPDuwf82xX0qOiD1Y5LBgJjUlLntAO8="; + hash = "sha256-T02nGF+YlughRQPinb0I3NC6xsarh4+qRhG8YfhTvhI="; }; nativeBuildInputs = [ From 7e60aedcca28eb44435c7237799bbcbf47076b23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:05 +0200 Subject: [PATCH 154/752] python3Packages.duo-client: 4.7.1 -> 5.0.1 --- pkgs/development/python-modules/duo-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 088e9dc844cb..05f9f0c9a406 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "duo-client"; - version = "4.7.1"; + version = "5.0.1"; src = fetchFromGitHub { owner = "duosecurity"; repo = "duo_client_python"; rev = "refs/tags/${version}"; - hash = "sha256-nnKujvhOtuNnlFrbmYtD7L++S7DK0Qqrc0LyAVYe7Xg="; + hash = "sha256-G0XLZZaQTPD64WXN34wq2z+YtzECgtC2nJXzDxAlgyg="; }; postPatch = '' From e361bc26241cde96ead8a195e2502269543c2339 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:06 +0200 Subject: [PATCH 155/752] python3Packages.dynalite-devices: 0.1.48 -> 0.47 --- pkgs/development/python-modules/dynalite-devices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index cb899bb04c07..7066271182ef 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.1.48"; + version = "0.47"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ziv1234"; repo = "python-dynalite-devices"; rev = "refs/tags/v${version}"; - hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g="; + hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; }; postPatch = '' From c99859ce69aec9c22c39f83565d7b9faa18d9771 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:06 +0200 Subject: [PATCH 156/752] python3Packages.editables: 0.3 -> 0.5 --- pkgs/development/python-modules/editables/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index 0211a855b3b4..f3db3a96d26f 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook }: buildPythonPackage rec { pname = "editables"; - version = "0.3"; + version = "0.5"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; + hash = "sha256-MJYn2bXErcDmaNjG+nusG6fIxdQVwtJ/YPCB+OgNHeI="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 9b46e6be71d71ac42b3b0b7aba74cf0fcfc49ed6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:06 +0200 Subject: [PATCH 157/752] python3Packages.einops: 0.6.0 -> 0.6.1 --- .../development/python-modules/einops/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index f4364aac8307..14e8b5ec9c6d 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -4,20 +4,18 @@ , fetchFromGitHub , hatchling , jupyter -, keras - #, mxnet , nbconvert , nbformat -, nose , numpy , parameterized +, pillow , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "einops"; - version = "0.6.0"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +24,7 @@ buildPythonPackage rec { owner = "arogozhnikov"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw="; + hash = "sha256-+TaxaxOc5jAm79tIK0NHZ58HgcgdCANrSo/602YaF8E="; }; nativeBuildInputs = [ hatchling ]; @@ -34,18 +32,15 @@ buildPythonPackage rec { nativeCheckInputs = [ chainer jupyter - keras - # mxnet (has issues with some CPUs, segfault) nbconvert nbformat - nose numpy parameterized + pillow pytestCheckHook ]; - # No CUDA in sandbox - EINOPS_SKIP_CUPY = 1; + env.EINOPS_TEST_BACKENDS = "numpy,chainer"; preCheck = '' export HOME=$(mktemp -d); From 4705461a9b4e225b4627c682a13c4da4dbbbb8f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:06 +0200 Subject: [PATCH 158/752] python3Packages.elasticsearch: 7.16.3 -> 8.9.0 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index b8c25ce5ac31..a07ba8c6d188 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.16.3"; + version = "8.9.0"; src = fetchPypi { inherit pname version; - sha256 = "8adf8bc351ed55df7296be1009d38a1c999c0abc7d8700fa88533f1ad6087c5e"; + sha256 = "sha256-0zZ/wBPgT8eq00mm3p+tHuBPttYnsOeJaqUFwS/eXgQ="; }; # Check is disabled because running them destroy the content of the local cluster! From b63cb6f0187ae53cef239a4b2e9e1a5361da5545 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:06 +0200 Subject: [PATCH 159/752] python3Packages.elasticsearch-dsl: 7.4.0 -> 8.9.0 --- pkgs/development/python-modules/elasticsearch-dsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 2fe746ea7f38..e5bdc6571cc9 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.4.0"; + version = "8.9.0"; src = fetchPypi { inherit pname version; - sha256 = "c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d"; + sha256 = "sha256-ZkEK34gfArigMuilsqPuCT/e7eS4FPvwTA9s4EmbdHI="; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ]; From ea0d007b4a0b85a047af812111d84188f07c317d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:06 +0200 Subject: [PATCH 160/752] python3Packages.email-validator: 1.3.1 -> 2.0.0 --- .../email-validator/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 76b5b6fbe34a..99ae071f4ae3 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "email-validator"; - version = "1.3.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-JW6Yrotm3HjUOUtNFxRorkrJKjzuwIXwjpUuMWEyLV0="; + hash = "sha256-o7UREa+IBiFjmqx0p+4XJCcoHQ/R6r2RtoezEcWvgbg="; }; propagatedBuildInputs = [ @@ -30,18 +30,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # fails with dns.resolver.NoResolverConfiguration due to network sandboxing - "test_deliverability_no_records" - "test_deliverability_found" - "test_deliverability_fails" - "test_deliverability_dns_timeout" - "test_email_example_reserved_domain" - "test_main_single_good_input" - "test_main_multi_input" - "test_main_input_shim" - "test_validate_email__with_caching_resolver" - "test_validate_email__with_configured_resolver" + disabledTestPaths = [ + # dns.resolver.NoResolverConfiguration: cannot open /etc/resolv.conf + "tests/test_deliverability.py" + "tests/test_main.py" ]; pythonImportsCheck = [ From 9d211a8cdbc6c98876dd34a292e710ae1b1680be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 161/752] python3Packages.envisage: 6.1.0 -> 7.0.3 --- pkgs/development/python-modules/envisage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index c49579a03fe1..c2dc0c046fe7 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "envisage"; - version = "6.1.0"; + version = "7.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40="; + hash = "sha256-97GviL86j/8qmsbja7SN6pkp4/YSIEz+lK7WKwMWyeM="; }; patches = [ From 72c4aa40b7a6b60be95eed40ed00ed32df0daf9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 162/752] python3Packages.eradicate: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/eradicate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index cddeddfef8c2..511f8d17ecbe 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "eradicate"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "wemake-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pVjvzW3UVeLMLLYcU0SIE19GEHFmouoA/JKSweTZSGo="; + hash = "sha256-ikiqNe1a+OeRraNBbtAx6v3LsTajWlgxm4wR2Tcbmjk="; }; nativeCheckInputs = [ From 43fd8d29f8c42e019cf11cf3e7a358f48b630577 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 163/752] python3Packages.execnet: 1.9.0 -> 2.0.2 --- .../python-modules/execnet/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 528e849290db..eb184c180d5b 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -2,31 +2,22 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, hatchling +, hatch-vcs +, gevent , pytestCheckHook -, setuptools-scm -, apipkg -, py }: buildPythonPackage rec { pname = "execnet"; - version = "1.9.0"; - format = "setuptools"; + version = "2.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; + hash = "sha256-zFm8RCN0L9ca0icSLrDdRNtR77PcQJW0WsmgjHcAlq8="; }; - patches = [ - (fetchpatch { - # Fix test compat with pytest 7.2.0 - url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch"; - hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0="; - }) - ]; - postPatch = '' # remove vbox tests rm testing/test_termination.py @@ -38,21 +29,27 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - apipkg + hatchling + hatch-vcs ]; # sometimes crashes with: OSError: [Errno 9] Bad file descriptor doCheck = !isPyPy; nativeCheckInputs = [ - py # no longer required with 1.10.0 + gevent pytestCheckHook ]; + disabledTests = [ + # gets stuck + "test_popen_io" + # OSError: [Errno 9] Bad file descriptor + "test_stdouterrin_setnull" + ]; + + pytestFlagsArray = [ "-vvv" ]; + pythonImportsCheck = [ "execnet" ]; From 463a8396ce09f688529447cd50ffac6953e96bf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 164/752] python3Packages.ezyrb: 1.3.0.post2305 -> 1.3.0.post2309 --- pkgs/development/python-modules/ezyrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index f6d9ecaf876a..aaeda3f40e73 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2305"; + version = "1.3.0.post2309"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-uYwLz5NY+8lO8hZnAhqv+5PlcCSm6OOFWra47pwQhxg="; + hash = "sha256-9g7FCyGZc9TDR9MummM1KJJZs31Oo50N/U6HjKM90Nw="; }; propagatedBuildInputs = [ From 299f3a889661dd26078ee9b007af2dd597785efb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 165/752] python3Packages.faadelays: 0.0.7 -> 2023.8.0 --- .../python-modules/faadelays/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/faadelays/default.nix b/pkgs/development/python-modules/faadelays/default.nix index 22f764ad4ace..a4c391bf3a32 100644 --- a/pkgs/development/python-modules/faadelays/default.nix +++ b/pkgs/development/python-modules/faadelays/default.nix @@ -3,25 +3,38 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "faadelays"; - version = "0.0.7"; + version = "2023.8.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-osZqfSYlKPYZMelBR6YB331iRB4DTjCUlmX7pcrIiGk="; + hash = "sha256-VAQQI9cMRKGe7RAUxoI1bBojzRq6cRz2jpeDA+GMuUI="; }; - propagatedBuildInputs = [ aiohttp ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "faadelays" ]; + + pythonImportsCheck = [ + "faadelays" + ]; meta = with lib; { + changelog = "https://github.com/ntilley905/faadelays/releases/tag/v${version}"; description = "Python package to retrieve FAA airport status"; homepage = "https://github.com/ntilley905/faadelays"; license = licenses.mit; From 1733ac717b6d9ab5235aed2f2f345367223c123c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 166/752] python3Packages.faker: 17.3.0 -> 19.6.1 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 7e26264bc3e7..4f0a1e701352 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "17.3.0"; + version = "19.6.1"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-JrKGSlMyCU8sfzlo3uurzmm+Oe1dtNvyK0+guj0aza4="; + hash = "sha256-XWt4gLO+pwgHXd+Rk4QkRT8HBTpZ+PoEU8GHDfb/MpI="; }; propagatedBuildInputs = [ From d4d5239e1bf2486c7d80f256acb93a2db5fcc3b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 167/752] python3Packages.fastapi: 0.95.2 -> 0.103.1 --- .../python-modules/fastapi/default.nix | 77 ++++++++++++------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index c0c4b36d3439..553f313bd0b6 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,27 +1,41 @@ { lib , buildPythonPackage , fetchFromGitHub -, pydantic -, starlette -, pytestCheckHook -, pytest-asyncio -, aiosqlite -, databases -, flask -, httpx +, pythonOlder + +# build-system , hatchling -, orjson + +# dependencies +, starlette +, pydantic +, typing-extensions + +# tests +, dirty-equals +, flask , passlib -, peewee +, pytest-asyncio +, pytestCheckHook , python-jose , sqlalchemy , trio -, pythonOlder + +# optional-dependencies +, httpx +, jinja2 +, python-multipart +, itsdangerous +, pyyaml +, ujson +, orjson +, email-validator +, uvicorn }: buildPythonPackage rec { pname = "fastapi"; - version = "0.95.2"; + version = "0.103.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,40 +44,43 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wD39CqUZOgwpG/NEGz/pXgQsadzUoM/elxfEXthOlHo="; + hash = "sha256-2J8c3S4Ca+c5bI0tyjMJArJKux9qPmu+ohqve5PhSGI="; }; nativeBuildInputs = [ hatchling ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"databases[sqlite] >=0.3.2,<0.7.0",' "" \ - --replace "starlette==" "starlette>=" - ''; - propagatedBuildInputs = [ starlette pydantic + typing-extensions ]; - nativeCheckInputs = [ - aiosqlite - # databases FIXME incompatible with SQLAlchemy 2.0 - flask + passthru.optional-dependencies.all = [ httpx + jinja2 + python-multipart + itsdangerous + pyyaml + ujson orjson + email-validator + uvicorn + # pydantic-settings + # pydantic-extra-types + ] ++ uvicorn.optional-dependencies.standard; + + nativeCheckInputs = [ + dirty-equals + flask passlib - peewee - python-jose pytestCheckHook pytest-asyncio - sqlalchemy + python-jose trio - ] - ++ passlib.optional-dependencies.bcrypt - ++ pydantic.optional-dependencies.email; + sqlalchemy + ] ++ passthru.optional-dependencies.all; pytestFlagsArray = [ # ignoring deprecation warnings to avoid test failure from @@ -92,6 +109,8 @@ buildPythonPackage rec { "test_trace" # Unexpected number of warnings caught "test_warn_duplicate_operation_id" + # assert state["except"] is True + "test_dependency_gets_exception" ]; pythonImportsCheck = [ From 4b129dcef2a94a1e5a3f264681727dbccd76d00a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:08 +0200 Subject: [PATCH 168/752] python3Packages.fastavro: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/fastavro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 85b9eecb57e8..54a475c08b01 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UPnWVYiZJdP6r7Bm1H9DMXpLi26c9tpXeEkLXVJxWdM="; + hash = "sha256-W+fFZAQU7W6gDqB6LOrG8se6mBATFZWmepTt1HSphbE="; }; preBuild = '' From 19d91b01ca45575f12ea6f9d258fbc84b2d760de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:08 +0200 Subject: [PATCH 169/752] python3Packages.faster-whisper: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/faster-whisper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 563c4b7e4f48..b632f9f28772 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "guillaumekln"; repo = "faster-whisper"; - rev = "v${version}"; - hash = "sha256-NTk0S+dMChygnC7Wix62AFO4NNSPJuKXyqoEyWiQhII="; + rev = "refs/tags/v${version}"; + hash = "sha256-MVcopBIwmgoklVROfIp35uvFgNQDVDNDfJwITV9sLSQ="; }; postPatch = '' From b9b9f0d5f03c081e85a306f607571ec8519165d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:08 +0200 Subject: [PATCH 170/752] python3Packages.filelock: 3.12.2 -> 3.12.4 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 3215a9010882..74cd6e727dbd 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.12.2"; + version = "3.12.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ACdAUY2KpZomsMduEPuMbhXq6CXTS2/fZwMz/XuTjYE="; + hash = "sha256-Lm8knx82VCkWBuBGsJ8f1erDmzYGZMJ/Wq0HIBL4vL0="; }; nativeBuildInputs = [ From 44be94515b9549eb67d4d0aefd25706318195b60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:08 +0200 Subject: [PATCH 171/752] python3Packages.finvizfinance: 0.14.5 -> 0.14.6 --- pkgs/development/python-modules/finvizfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 064b8291b8ce..1491b254e835 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "0.14.5"; + version = "0.14.6"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-yhOa/CS+9UdI+TVMObBsOqIp9XggMJvNjteSMa5DJcM="; + hash = "sha256-YRdOj0n2AUGRicQCENoXWad5MnRyTqQFxqisTFnClac="; }; postPatch = '' From 30373713b14dff1cd5fe1ff7f731878010a10403 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:09 +0200 Subject: [PATCH 172/752] python3Packages.flask-appbuilder: 4.3.1 -> 4.3.6 --- pkgs/development/python-modules/flask-appbuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index eaf132e943c3..6309e0ddd2c0 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.3.1"; + version = "4.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-FP92HEGOsufHtaIySqDiScD3QUu3iQhWdtvkOecUvuI="; + hash = "sha256-jKlxD6fScEdH0ZXhG0h9RaVx9AVZ2DmdnV36QuofPHg="; }; propagatedBuildInputs = [ From c43b406bdd1ff1b5b2418ed19f193b079ffb6d08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:09 +0200 Subject: [PATCH 173/752] python3Packages.flask: 2.2.5 -> 2.3.3 --- pkgs/development/python-modules/flask/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index b7914ad3777e..154625f6c52a 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , asgiref +, blinker , click +, flit-core , importlib-metadata , itsdangerous , jinja2 @@ -19,16 +21,21 @@ buildPythonPackage rec { pname = "flask"; - version = "2.2.5"; + version = "2.3.3"; + format = "pyproject"; src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + inherit pname version; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ click + blinker itsdangerous jinja2 werkzeug From c87f464efa105088160ebc17f0f71cb9d986a66f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:09 +0200 Subject: [PATCH 174/752] python3Packages.flask-limiter: 3.3.1 -> 3.5.0 --- pkgs/development/python-modules/flask-limiter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 1305234e43f7..ff532ffd12d9 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "flask-limiter"; - version = "3.3.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-UtmMd180bwFm426YevARq6r7DL182dI7dGAUPFKLWuM="; + hash = "sha256-ZaHw8+l1sBCeNj0tYdUw1f4BUvEj6plOSoH0GUzNg+0="; }; postPatch = '' From d04ed91a7dd49053457af3550c364db1293b04d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:09 +0200 Subject: [PATCH 175/752] python3Packages.flask-migrate: 4.0.4 -> 4.0.5 --- pkgs/development/python-modules/flask-migrate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 819c9d239231..a7a5da621630 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-Migrate"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-fdnoX7ypTpH2mQ+7Xuhzdh706Of7PIVhHQGVbe0jv1s="; }; From 30a98e35b2221796dd9544dfe8c09a7ba640f6be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:09 +0200 Subject: [PATCH 176/752] python3Packages.flask-security-too: 5.1.2 -> 5.3.0 --- .../development/python-modules/flask-security-too/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index e18cc8579ba9..529a1a63913a 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.1.2"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; + hash = "sha256-n12DCRPqxm8YhFeVrl99BEvdDYNq6rzP662rain3k1Q="; }; postPatch = '' From e3c8226822304107b0d05243de79ec46e6bf1e16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:09 +0200 Subject: [PATCH 177/752] python3Packages.flask-sqlalchemy: 3.0.3 -> 3.1.1 --- .../python-modules/flask-sqlalchemy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 550d9adf416f..7146c38e5a30 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -3,7 +3,7 @@ , fetchPypi , flask , mock -, pdm-pep517 +, flit-core , pytestCheckHook , pythonOlder , sqlalchemy @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "flask-sqlalchemy"; - version = "3.0.3"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { - pname = "Flask-SQLAlchemy"; + pname = "flask_sqlalchemy"; inherit version; - hash = "sha256-J2QzXzydfr3J7WBEr6+Yqun6UNegdM71Xd4wfslZA+w="; + hash = "sha256-5LaLuIGALdoafYeLL8hMBtHuV/tAuHTT3Jfav6NrgxI="; }; nativeBuildInputs = [ - pdm-pep517 + flit-core ]; propagatedBuildInputs = [ From 2486099a89ac379feaea9a4bc80bbfe337dddfc3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:09 +0200 Subject: [PATCH 178/752] python3Packages.flax: 0.6.5 -> 0.7.4 --- pkgs/development/python-modules/flax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index bea9667a1a18..0a6b086fe516 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.6.5"; + version = "0.7.4"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Vv68BK83gTIKj0r9x+twdhqmRYziD0vxQCdHkYSeTak="; + hash = "sha256-i48omag/1Si3mCCGfsUD9qeejyeCLWzvvwKJqH8vm8k="; }; nativeBuildInputs = [ jaxlib pythonRelaxDepsHook ]; From c1bcce3bacbfc6ec8e84476b30d5a66015fc4600 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:10 +0200 Subject: [PATCH 179/752] python3Packages.flet-core: 0.7.4 -> 0.10.1 --- pkgs/development/python-modules/flet-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index ed55629dca03..bf1e8b2d693a 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.7.4"; + version = "0.10.1"; format = "pyproject"; src = fetchPypi { pname = "flet_core"; inherit version; - hash = "sha256-8WG7odYiGrew4GwD+MUuzQPmDn7V/GmocBproqsbCNw="; + hash = "sha256-YLtHnKBlXkUJJkQzxnDkfl6+gSGm05GXYPGEU3XO/jI="; }; nativeBuildInputs = [ From 54acf881fe49e73d29c9f320a520f15baa233732 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:10 +0200 Subject: [PATCH 180/752] python3Packages.flet: 0.7.4 -> 0.10.1 --- pkgs/development/python-modules/flet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 4c41e5972600..c6541372d66b 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "flet"; - version = "0.7.4"; + version = "0.10.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-vFPjN+5wIygtP035odAOSdF9PQe6eXz6CJ9Q0d8ScFo="; + hash = "sha256-Ogy4F9/beSb3GCpwPsN+8hsVroRoHTSojqg+5eXwcRI="; }; postPatch = '' From a4d625fe7c70f8b7224e952a6a5e0c1e1ff5a742 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:10 +0200 Subject: [PATCH 181/752] python3Packages.flow-record: 3.11 -> 3.12 --- pkgs/development/python-modules/flow-record/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 0f4cea423e46..c4f91da48981 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.11"; + version = "3.12"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-/mrsm7WoqnTIaGOHuIZk1eMXAMi38eVpctgi6+RQ3WQ="; + hash = "sha256-b9MCgs3Imo0DHtPyvQuRgYvsLWe8N2Y9TIWdU1E04L8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From edbbbdecbcd54e12f8b41180a1b4fac8e018b476 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:10 +0200 Subject: [PATCH 182/752] python3Packages.fontmake: 3.5.1 -> 3.7.1 --- pkgs/development/python-modules/fontmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 1f684becb94c..a6bd37c0153e 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.5.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - hash = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; + hash = "sha256-Nb09/BRPR0H3rHrbDIhcrgOyJp55KCIdPvUr/vh2Z0U="; extension = "zip"; }; From 5f92ed9650fb22ed99ed209ac6a48b67bb2ccbc3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:10 +0200 Subject: [PATCH 183/752] python3Packages.fonttools: 4.38.0 -> 4.42.1 --- pkgs/development/python-modules/fonttools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 845ca18e4a62..3c167debba37 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.38.0"; + version = "4.42.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; + hash = "sha256-fcFFJi9Hr0m74LwFIhhhm/bMfxepAvg4/ymU53MmsPg="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -60,6 +61,7 @@ buildPythonPackage rec { ] ++ lib.concatLists (lib.attrVals ([ "woff" "interpolatable" + "ufo" ] ++ lib.optionals (!skia-pathops.meta.broken) [ "pathops" # broken ] ++ [ From db2078b108e7dd6fc45747963f251c1a9e4b883f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:10 +0200 Subject: [PATCH 184/752] python3Packages.formulaic: 0.5.2 -> 0.6.4 --- pkgs/development/python-modules/formulaic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index 3cfe44c55d53..fcb8ddc1b00b 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "formulaic"; - version = "0.5.2"; + version = "0.6.4"; format = "pyproject"; src = fetchFromGitHub { owner = "matthewwardrop"; repo = "formulaic"; - rev = "v${version}"; - hash = "sha256-sIvHTuUS/nkcDjRgZCoEOY2negIOsarzH0PeXJsavWc="; + rev = "refs/tags/v${version}"; + hash = "sha256-lpza5FDO/QOsiLYdxNT1o62lHfFeD6YahFz/zgH3K0I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 66b971f2a1c2e6dbedc516588fdf3a919470d4a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:11 +0200 Subject: [PATCH 185/752] python3Packages.frozenlist: 1.3.3 -> 1.4.0 --- .../python-modules/frozenlist/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 957e9f5d057a..06ff0d1c7dcc 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -4,33 +4,32 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "frozenlist"; - version = "1.3.3"; - format = "setuptools"; + version = "1.4.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - hash = "sha256-lJWRdXvuzyvJwNSpv0+ojY4rwws3jwDtlLOqYyLPrZc="; + rev = "refs/tags/v${version}"; + hash = "sha256-sI6jnrTxDbW0sNVodpCjBnA31VAAmunwMp9s8GkoHGI="; }; nativeBuildInputs = [ cython - ]; - - nativeCheckInputs = [ - pytestCheckHook + setuptools + wheel ]; postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov=frozenlist" "" + sed -i "/addopts =/d" pytest.ini ''; preBuild = '' @@ -41,6 +40,10 @@ buildPythonPackage rec { "frozenlist" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Python module for list-like structure"; homepage = "https://github.com/aio-libs/frozenlist"; From 5fd1c736ecad1e7fd00581b5e2bf358b828d8e8c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:11 +0200 Subject: [PATCH 186/752] python3Packages.fugashi: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/fugashi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 6a8c1ac9db2d..264771ed5a4b 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "fugashi"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "polm"; repo = "fugashi"; rev = "refs/tags/v${version}"; - hash = "sha256-VDqRhJiNDbKFE284EAUS0d5T9cl8kgyHjh+r/HjjDY8="; + hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d8fd91aae0a3cd9d8541eb3cbc4492252bef309e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:11 +0200 Subject: [PATCH 187/752] python3Packages.gentools: 1.1.0 -> 1.2.1 --- pkgs/development/python-modules/gentools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index d3f45cdea7f0..c53dd68fb815 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "gentools"; - version = "1.1.0"; + version = "1.2.1"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "ariebovenberg"; repo = pname; - rev = "v${version}"; - sha256 = "1sm6cqi7fv2k3pc68r7wvvjjz8y6cjmz8bvxgqfa4v4wxibwnwrl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RBUIji3FOIRjfp4t7zBAVSeiWaYufz4ID8nTWmhDkf8="; }; propagatedBuildInputs = From 6f8245d4d9891db90277b313163f4a4502506c23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:11 +0200 Subject: [PATCH 188/752] python3Packages.geoalchemy2: 0.13.3 -> 0.14.1 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index d216f43f76ac..c29d6d4bec09 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.13.3"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "GeoAlchemy2"; inherit version; - hash = "sha256-2Fp96qmiMJAXM/dBnWv/VnS4cwZR3hoH8rZCOqSSXQk="; + hash = "sha256-Ygsxy/l6NoskhtvPzTbaIIGCfpM9QWO8uUIEO3m1Reg="; }; nativeBuildInputs = [ From 660c096b8c103fa4312b59ff17d322361ab3f738 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:12 +0200 Subject: [PATCH 189/752] python3Packages.gitpython: 3.1.33 -> 3.1.35 --- pkgs/development/python-modules/gitpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index 8721df4bf36a..c783e7a00f01 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.33"; + version = "3.1.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = "refs/tags/${version}"; - hash = "sha256-SqpoI8QnynHRHUdenMrOAGib/SDpix4rSXfEes4xt/Y="; + hash = "sha256-bKyimi7INXgd1Km4B/tQh/VFVcZLjdOLts2dXhqOtvY="; }; propagatedBuildInputs = [ From 4854d996d16c5f81675f3ac947a0bf8c2e32d95c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:12 +0200 Subject: [PATCH 190/752] python3Packages.glean-parser: 7.2.1 -> 9.0.0 --- pkgs/development/python-modules/glean-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 71ff271a1419..7ab2855d8d73 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "7.2.1"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-EUlqwAT+QhuRTH+9yaHWIOSCHVbh2fZVI9OFjNuQe70="; + hash = "sha256-dwBKds89CaanZA4b5I6u01Q2s23joQp5SOCjdTXn/Xc="; }; postPatch = '' From eea3c156c950b0e6b85701922932a05cab7c35fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:12 +0200 Subject: [PATCH 191/752] python3Packages.glfw: 2.5.9 -> 2.6.2 --- pkgs/development/python-modules/glfw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index 12a2e40aecc5..db9f369a3497 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.9"; + version = "2.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-IQcUL+vVIjI/c8/GFkmw7kMmOJG/xAlxudgspC8pDvI="; + hash = "sha256-3K+mDSz4ifVYkUvhd2XDPbhh6UCY4y54YqNLoAYDsP0="; }; # Patch path to GLFW shared object From bd1c416dbb49eacd9da3779a26e456a6429d366d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:12 +0200 Subject: [PATCH 192/752] python3Packages.google-api-python-client: 2.97.0 -> 2.99.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 24bf908942fc..ecf2b36ab9db 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.97.0"; + version = "2.99.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SCdykYlIdqHKftQSfgVegfgeY0PO0bVEpyAK4sEZ3Nc="; + hash = "sha256-5zP9DyyHk7GgANXmmsgbG57AZltEW37YO9u7ADiXMwY="; }; propagatedBuildInputs = [ From 988637c29ad06751087f4c8b9a54be9330c5b3d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:12 +0200 Subject: [PATCH 193/752] python3Packages.googleapis-common-protos: 1.58.0 -> 1.60.0 --- .../python-modules/googleapis-common-protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index dbf098fae7be..64dc4d2c7182 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.58.0"; + version = "1.60.0"; src = fetchPypi { inherit pname version; - hash = "sha256-xyclHsAllH1UUYS6F+NXiED8OiSgUWoCBHntq2YEV98="; + hash = "sha256-5z67QECY20BbqV0eGuCqkcPhWnHaAxou62suI+e8Nwg="; }; propagatedBuildInputs = [ grpc protobuf ]; From 364b9b8fcc6f0606915d851533e51ba2403a0a52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:13 +0200 Subject: [PATCH 194/752] python3Packages.google-auth-oauthlib: 1.0.0 -> 1.1.0 --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 5d5c56188c88..1c82976317b1 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-43UGSWSCC0ciGn4bfuH9dwUbYyPD+ePhl4X3irZ+z8U="; + hash = "sha256-g+qMOwiB5FN5C6/0RI6KYRKsh3jR3p2gtoAQuEOTevs="; }; propagatedBuildInputs = [ From 7bf753ea01f4c5f89ac3d6d04b5554de882d8357 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:14 +0200 Subject: [PATCH 195/752] python3Packages.gphoto2: 2.3.4 -> 2.5.0 --- pkgs/development/python-modules/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index bea5b01ab152..a9c49b57063d 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.3.4"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-mEbF/fOtw0cU/bx7DgQcmmJ/yqal8Hs/1KaLGC3e4/c="; + hash = "sha256-l9B6PEIGf8rkUlYApOytW2s9OhgcxMHVlDgfQR5ZnoA="; }; nativeBuildInputs = [ pkg-config ]; From f184e77321b5fbfc7865e485f159c565c7d6f0ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:14 +0200 Subject: [PATCH 196/752] python3Packages.gptcache: 0.1.37 -> 0.1.41 --- pkgs/development/python-modules/gptcache/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index 9fd2c80c3c49..3172e8d7bc89 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -4,12 +4,14 @@ , cachetools , numpy , pythonOlder +, redis +, redis-om , requests }: buildPythonPackage rec { pname = "gptcache"; - version = "0.1.37"; + version = "0.1.41"; format = "setuptools"; disabled = pythonOlder "3.8.1"; @@ -18,12 +20,14 @@ buildPythonPackage rec { owner = "zilliztech"; repo = "GPTCache"; rev = "refs/tags/${version}"; - hash = "sha256-eQu3O6jPL1BRObA99XA2EOznn9NaArVRouqD1Ypz/4w="; + hash = "sha256-0jQziywoDQQuNaB1G7YovX7473PfI7u5fTRQMidf3NA="; }; propagatedBuildInputs = [ cachetools numpy + redis + redis-om requests ]; From f31870f64e65b8d7197b426f1f675d2a3ddc389e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:14 +0200 Subject: [PATCH 197/752] python3Packages.gpustat: 1.1 -> 1.1.1 --- pkgs/development/python-modules/gpustat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gpustat/default.nix b/pkgs/development/python-modules/gpustat/default.nix index beada3b4a351..8952e84c5c12 100644 --- a/pkgs/development/python-modules/gpustat/default.nix +++ b/pkgs/development/python-modules/gpustat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gpustat"; - version = "1.1"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yPwQVASqwRiE9w7S+gbP0hDTzTicyuSpvDhXnHJGDO4="; + hash = "sha256-wY0+1VGPwWMAxC1pTevHCuuzvlXK6R8dtk1jtfqK+dg="; }; pythonRelaxDeps = [ From b4bdb7847e0cf152edbeb97e3e4d753264e16ca0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:15 +0200 Subject: [PATCH 198/752] python3Packages.gradio: 3.43.1 -> 3.44.3 --- pkgs/development/python-modules/gradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index c09b55496bef..5d051ef80ec2 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "3.43.1"; + version = "3.44.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -62,7 +62,7 @@ buildPythonPackage rec { # and has more frequent releases compared to github tags src = fetchPypi { inherit pname version; - hash = "sha256-a8eHw8jedrse1dpgup9BL60oXx4wvOk8X5z5DP1DWOs="; + hash = "sha256-3mXs9PwlzUo89VosBWtnsOzDQf/T22Yv7s5j6OLLp3M="; }; # fix packaging.ParserSyntaxError, which can't handle comments From 198c03eca810a488f67cf7814f81c237cfb4b139 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:15 +0200 Subject: [PATCH 199/752] python3Packages.graspologic: 2.0.1 -> 3.2.0 --- pkgs/development/python-modules/graspologic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 5ea1e5c55eb9..afc5b2edad2e 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "2.0.1"; + version = "3.2.0"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "refs/tags/v${version}"; - hash = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; + hash = "sha256-yXhEI/8qm526D+Ehqqfb+j+sbbh83Q4OWC+UM7cgCjU="; }; propagatedBuildInputs = [ From 4c93a7eb8354b3d9bc7d334fb1da07b4a424cd83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:15 +0200 Subject: [PATCH 200/752] python3Packages.grpcio-health-checking: 1.56.2 -> 1.58.0 --- .../python-modules/grpcio-health-checking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index c202a1f7c659..ce1a78f02cfd 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.56.2"; + version = "1.58.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-XNodihNovizaBPkoSotzzuCf8+J37sjd2avPL+92s3I="; + hash = "sha256-B9WGI/J77PGGyGLLrn39elS9Y/SzdZTHfIuPyTPxHC8="; }; propagatedBuildInputs = [ From e4e910fc9fa4f2cd2b0a1d4353e2b24d02129cfa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:15 +0200 Subject: [PATCH 201/752] python3Packages.grpcio-status: 1.57.0 -> 1.58.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 991549ea9ed9..c03c1faa9d4f 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.57.0"; + version = "1.58.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sJjamd8e6+WDN/j3jlDfmQJzzKzBIm/d60fFkOPfngI="; + hash = "sha256-C0LnDAQFpmqC2emGf6JV/lnmGJZKYJmyBWjDHdkJl2Y="; }; postPatch = '' From 9043338f9c5d5cd95d6b3c0844a7ff062f0de94e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:15 +0200 Subject: [PATCH 202/752] python3Packages.grpcio-testing: 1.57.0 -> 1.58.0 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 9e7b61e12b9e..904c0b24a0ab 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.57.0"; + version = "1.58.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xFMqJlY+Ehn0K3bXqdiGEvL2X3Pm7IPhHHPWTi8ecOk="; + hash = "sha256-ABZMp+VTsyf2HE50cnHf9wdCOeGlAqpbuMWlbsWE/qY="; }; postPatch = '' From 8a42a8f04dbb99b4b7aacac1ffb8d975ad31e1b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:15 +0200 Subject: [PATCH 203/752] python3Packages.grpcio-tools: 1.57.0 -> 1.58.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 78e3cdaae7f1..285f3477deaa 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.57.0"; + version = "1.58.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LxYTDYac4n7NYjGUVHtkndZXMz7H6GRMxXHGRXgam4U="; + hash = "sha256-b02AzrWR4xyk3O7HR9vlYTLhOSoKm7HI/gAdG1ysiYo="; }; postPatch = '' From 189036b128001bb9f680adcb895ababa76b93aa7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:15 +0200 Subject: [PATCH 204/752] python3Packages.gssapi: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/gssapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 30619532a4a5..56b79e8c08b6 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.8.2"; + version = "1.8.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; + hash = "sha256-H1JfdvxJvX5dmC9aTqIOkjAqFEL44KoUXEhoYj2uRY8="; }; # It's used to locate headers From 4a015d4ab9c89e7c808daf1002f7616378ff16e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:16 +0200 Subject: [PATCH 205/752] python3Packages.h5netcdf: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/h5netcdf/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 680e94028c09..1c97861f1eee 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -1,29 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , h5py , pytestCheckHook , netcdf4 , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "h5netcdf"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kyw7Vzvtc3Dr/J6ALNYPGk2lI277EbNu7/iXMk12v1Y="; + hash = "sha256-f2snM73gbqJXW3mmRQ2b1cOJGP9MsqNVvyK76Mhsa88="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm ]; From 5105b6f08e5e4e2bdf9526c7634ed6b4e8b9b24c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:16 +0200 Subject: [PATCH 206/752] python3Packages.h5py: 3.8.0 -> 3.9.0 --- pkgs/development/python-modules/h5py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 427caf0211e6..3fb20fad4c3b 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -21,7 +21,7 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.8.0"; + version = "3.9.0"; pname = "h5py"; format = "pyproject"; @@ -29,7 +29,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-b+rYLwxAAM841T+cAweA2Bv6AiAhiu4TuQt3Ack32V8="; + hash = "sha256-5gTbZSHB42fGvX+tI5yEf1PMRmRvLSZRNy0Frl6V+Bc="; }; # avoid strict pinning of numpy From c9aa0255e66f6e534bd571c40cddbef68ed28a91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:16 +0200 Subject: [PATCH 207/752] python3Packages.hacking: 5.0.0 -> 6.0.1 --- pkgs/development/python-modules/hacking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index 3ea0b24f0684..bd92a2712228 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hacking"; - version = "5.0.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; + hash = "sha256-YdeEb8G58m7CFnjpkHQmkJX5ZNe72M1kbrbIxML4jcE="; }; postPatch = '' From 298cb4522f3c702919dd3613d3280e2c4a935b34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:16 +0200 Subject: [PATCH 208/752] python3Packages.hatch-jupyter-builder: 0.8.2 -> 0.8.3 --- .../python-modules/hatch-jupyter-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index 8ce6f73c547b..fe641977812f 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hatch-jupyter-builder"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyterlab"; repo = "hatch-jupyter-builder"; rev = "refs/tags/v${version}"; - hash = "sha256-Ns5jrVfTAA7NuvUok3/13nIpXSSVZ6WRkgHyTuxkSKA="; + hash = "sha256-UywhFJ8d1+lSFOF5ECsknDeQuO7ppckdy5IqAT14ius="; }; nativeBuildInputs = [ From 4f29b6dd64d749d1de1630db822f077dc29ba7fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:16 +0200 Subject: [PATCH 209/752] python3Packages.hatch-nodejs-version: 0.3.1 -> 0.3.2 --- .../python-modules/hatch-nodejs-version/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix index ed849eaa52aa..806bffe56cc1 100644 --- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatch-nodejs-version"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "agoose77"; repo = "hatch-nodejs-version"; rev = "refs/tags/v${version}"; - hash = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; + hash = "sha256-hknlb11DCe+b55CfF3Pr62ccWPxVrjQ197ZagSiH/zU="; }; propagatedBuildInputs = [ From ba22ff366f1f7d24537bbe7e5a2679e2ecff36a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:16 +0200 Subject: [PATCH 210/752] python3Packages.hatch-requirements-txt: 0.3.0 -> 0.4.0 --- .../python-modules/hatch-requirements-txt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix index af74b15b0214..a6246b3a4746 100644 --- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hatch-requirements-txt"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "repo-helper"; repo = "hatch-requirements-txt"; rev = "refs/tags/v${version}"; - hash = "sha256-Gyt5Fs8uqVe0cOKtxFeg1n1WMyeK5Iokh71ynb2i5cM="; + hash = "sha256-qk+70o/41BLxCuz3SOXkGYSEmUZOG1oLYcFUmlarqmY="; }; nativeBuildInputs = [ From 154938c6a5b83e46ea2510db2d17ed3f68de3ad8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:17 +0200 Subject: [PATCH 211/752] python3Packages.hdbscan: 0.8.28 -> 0.8.33 --- pkgs/development/python-modules/hdbscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 1971516a00fa..75d8a4a990ce 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.28"; + version = "0.8.33"; src = fetchPypi { inherit pname version; - hash = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo="; + hash = "sha256-V/q8Xw5F9I0kB7NccxGSq8iWN2QR/n5LuDb/oD04+Q0="; }; patches = [ # should be included in next release From 2505ae8a42081f34537d602b8453e9420c82100f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:17 +0200 Subject: [PATCH 212/752] python3Packages.hdf5plugin: 4.1.3 -> 4.2.0 --- pkgs/development/python-modules/hdf5plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index 5d231b2b0a60..38782e3240c0 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.1.3"; + version = "4.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-0emCZ+r5dCRBT2xaNsgYskcGcLF/9Jf6K7FFi/PA+60="; + hash = "sha256-y0iDPAfm66FdclPREPnvurupWd9ZUgz8PqFd/JoapDc="; }; propagatedBuildInputs = [ From 5d0ae485dcb725f65890a5943a9315ba2c27161d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:17 +0200 Subject: [PATCH 213/752] python3Packages.holidays: 0.29 -> 0.32 --- pkgs/development/python-modules/holidays/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 0f3f8ae66054..976766f0a4df 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , hijri-converter , korean-lunar-calendar +, polib , pytestCheckHook , python-dateutil , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.29"; + version = "0.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v.${version}"; - hash = "sha256-ijhqu0LzQzpjDSe9ZjNhgdjq/DJuD7oVbRTLX97nGHM="; + hash = "sha256-YAh5gR4KcUgXzeXy3xyGeokDFsyd9FqRQ5j1TC6wCQY="; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + polib pytestCheckHook ]; From 986a7985530e13ec2f4e37500e4d5a01ba36be29 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 02:36:19 +0200 Subject: [PATCH 214/752] python311Packages.flasgger: init at 0.9.5 packaged up for httpbin --- .../python-modules/flasgger/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/flasgger/default.nix diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix new file mode 100644 index 000000000000..4bb5e9fe30d9 --- /dev/null +++ b/pkgs/development/python-modules/flasgger/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +# dependencies +, flask +, jsonschema +, mistune +, pyyaml +, six +, werkzeug + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flasgger"; + version = "0.9.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "flasgger"; + repo = "flasgger"; + rev = version; + hash = "sha256-cYFMKZxpi69gVWqyZUltCL0ZwcfIABNsJKqAhN2TTSg="; + }; + + patches = [ + (fetchpatch { + # flask 2.3 compat + url = "https://github.com/flasgger/flasgger/commit/ab77be7c6de1d4b361f0eacfa37290239963f890.patch"; + hash = "sha256-ZbE5pPUP23nZAP/qcdeWkwzrZgqJSRES7oFta8U1uVQ="; + }) + ]; + + propagatedBuildInputs = [ + flask + jsonschema + mistune + pyyaml + six + werkzeug + ]; + + pythonImportsCheck = [ + "flasgger" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + doCheck = false; # missing flex dependency + + meta = with lib; { + description = "Easy OpenAPI specs and Swagger UI for your Flask API"; + homepage = "https://github.com/flasgger/flasgger/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78847f3f9850..d3e300204e26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3887,6 +3887,8 @@ self: super: with self; { flammkuchen = callPackage ../development/python-modules/flammkuchen { }; + flasgger = callPackage ../development/python-modules/flasgger { }; + flashtext = callPackage ../development/python-modules/flashtext { }; flask-admin = callPackage ../development/python-modules/flask-admin { }; From 00575d3be2276e68902fff91eeae0fec3bc29d9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:17 +0200 Subject: [PATCH 215/752] python3Packages.httpbin: 0.7.0 -> 0.10.1 --- .../python-modules/httpbin/default.nix | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 570b75eddc46..cc15e00748c0 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,43 +1,40 @@ { lib -, brotlipy +, brotlicffi , buildPythonPackage , decorator -, fetchpatch , fetchPypi , flask , flask-limiter +, flasgger , itsdangerous , markupsafe , raven , six , pytestCheckHook +, setuptools , werkzeug }: buildPythonPackage rec { pname = "httpbin"; - version = "0.7.0"; - format = "setuptools"; + version = "0.10.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; + hash = "sha256-e4WWvrDnWntlPDnR888mPW1cR20p4d9ve7K3C/nwaj0="; }; - patches = [ - (fetchpatch { - # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility - # https://github.com/postmanlabs/httpbin/pull/674 - url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; - hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ - brotlipy + brotlicffi decorator flask flask-limiter + flasgger itsdangerous markupsafe raven @@ -49,10 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "test_httpbin.py" - ]; - disabledTests = [ # Tests seems to be outdated "test_anything" @@ -70,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP Request and Response Service"; - homepage = "https://github.com/kennethreitz/httpbin"; + homepage = "https://github.com/psf/httpbin"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 878f1dac8d852b764f5a01454aa487ae6473f0d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:17 +0200 Subject: [PATCH 216/752] python3Packages.httpcore: 0.17.2 -> 0.18.0 --- .../python-modules/httpcore/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 9f3905f55182..91cd904e3afe 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , certifi , fetchFromGitHub +, hatchling +, hatch-fancy-pypi-readme , h11 , h2 , pproxy @@ -20,8 +22,8 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.17.2"; - format = "setuptools"; + version = "0.18.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,9 +31,14 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qAoORhzBbjXxgtzTqbAxWBxrohzfwDWm5mxxrgeXt48="; + hash = "sha256-UEpERsB7jZlMqRtyHxLYBisfDbTGaAiTtsgU1WUpvtA="; }; + nativeBuildInputs = [ + hatchling + hatch-fancy-pypi-readme + ]; + propagatedBuildInputs = [ anyio certifi @@ -57,18 +64,19 @@ buildPythonPackage rec { ] ++ passthru.optional-dependencies.http2 ++ passthru.optional-dependencies.socks; - pythonImportsCheck = [ - "httpcore" + disabledTests = [ + # https://github.com/encode/httpcore/discussions/813 + "test_connection_pool_timeout_during_request" + "test_connection_pool_timeout_during_response" + "test_h11_timeout_during_request" + "test_h11_timeout_during_response" + "test_h2_timeout_during_handshake" + "test_h2_timeout_during_request" + "test_h2_timeout_during_response" ]; - preCheck = '' - # remove upstreams pytest flags which cause: - # httpcore.ConnectError: TLS/SSL connection has been closed (EOF) (_ssl.c:997) - rm setup.cfg - ''; - - pytestFlagsArray = [ - "--asyncio-mode=strict" + pythonImportsCheck = [ + "httpcore" ]; __darwinAllowLocalNetworking = true; From d5e357c0ec555351d82641ec829aeedb58b740f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:17 +0200 Subject: [PATCH 217/752] python3Packages.httpx: 0.24.1 -> 0.25.0 --- pkgs/development/python-modules/httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 11204ec8b9b4..7e451532af04 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.24.1"; + version = "0.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qG6fgijNgQKjpSG6sg0+0yqeAU6qV7czR8NgWe63LIg="; + hash = "sha256-zQVavjU66ksO0FB1h32e0YUhOGiQ4jHPvjgLhtxjU6s="; }; nativeBuildInputs = [ From 06b319c8f07c7c8f403c9188996c1b62745b2dbb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:17 +0200 Subject: [PATCH 218/752] python3Packages.httpx-socks: 0.7.6 -> 0.7.8 --- pkgs/development/python-modules/httpx-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 992ddf1c6932..58e6fded6e1a 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.6"; + version = "0.7.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rLcYC8IO2eCWAL4QIiUg/kyigybq6VNTUjNDXx4KPHc="; + hash = "sha256-I00+yB+aRnIMUQIJ7Lvr6LsHpf+gibkHh+2XgpeQn5U="; }; nativeBuildInputs = [ From 217c4c162f80195c1c86435ba354e449b3eee6c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:18 +0200 Subject: [PATCH 219/752] python3Packages.huggingface-hub: 0.16.4 -> 0.17.0 --- pkgs/development/python-modules/huggingface-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 9fc7e657468d..72e2289569cd 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.16.4"; + version = "0.17.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-fWvEvYiaLiVGmDdfibIHJAsu7nUX+eaE0QGolS3LHO8="; + hash = "sha256-xtonZVaUVjxUNCl2jJnBlP8wh4s92VeD958x9dZM19U="; }; propagatedBuildInputs = [ From 525a7ff7e7ee0b07930bf2a5ae7cbd20061b5d76 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:18 +0200 Subject: [PATCH 220/752] python3Packages.hupper: 1.11 -> 1.12 --- pkgs/development/python-modules/hupper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index da287226ff53..11f37dcac28e 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - hash = "sha256-FcEb13XY+YCVt0W05lihfCXIbjtzJ1yuiWrByNUzyxg="; + hash = "sha256-GLFlPZgyyfjn00AZhsfnryrmeDYWvgvEBr/gsUE0pcY="; }; # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent From b319a35bd8225832212fd47eb6a0a89f6281fc3e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:18 +0200 Subject: [PATCH 221/752] python3Packages.hvac: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 7f8c9c5bea8a..6fe396897114 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b1qg1rgTi1hdRlbR/gG12HYWMQyASEuQnMhMLLjwZP0="; + hash = "sha256-x4bj36HzUjmBDlMXzMrb41j0m4yQAaHy9ot5olC5+KE="; }; nativeBuildInputs = [ From f6efff3bab3c2eb5a329654d87d4efcfac3275e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:18 +0200 Subject: [PATCH 222/752] python3Packages.hypothesis-auto: 1.1.4 -> 1.1.5 --- .../hypothesis-auto/default.nix | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 49638e825823..ad6ae8dbd96c 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -1,41 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , hypothesis , poetry-core , pydantic , pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "hypothesis-auto"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-XiwvsJ3AmEJRLYBjC7eSNZodM9LARzrUfuI9oL6eMrE="; + pname = "hypothesis_auto"; + inherit version; + hash = "sha256-U0vcOB9jXmUV5v2IwybVu2arY1FpPnKkP7m2kbD1kRw="; }; - patches = [ - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/timothycrosley/hypothesis-auto/commit/8277b4232617c0433f80e9c2844452b9fae67a65.patch"; - hash = "sha256-/0z0nphtQnUBiLYhhzLZT59kQgktSugaBg+ePNxy0qI="; - }) - ]; - - postPatch = '' - # https://github.com/timothycrosley/hypothesis-auto/pull/20 - substituteInPlace pyproject.toml \ - --replace 'pydantic = ">=0.32.2<2.0.0"' 'pydantic = ">=0.32.2, <2.0.0"' \ - --replace 'hypothesis = ">=4.36<6.0.0"' 'hypothesis = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -50,6 +36,10 @@ buildPythonPackage rec { "hypothesis_auto" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; From 390d6e9c4689c930a38d06cdadc87633fddf22d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:18 +0200 Subject: [PATCH 223/752] python3Packages.hyppo: 0.3.2 -> 0.4.0 --- pkgs/development/python-modules/hyppo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 223ef9fe7a43..709c7180f004 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.3.2"; + version = "0.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "neurodata"; repo = pname; - rev = "v${version}"; - hash = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; + rev = "refs/tags/v${version}"; + hash = "sha256-QRE3oSxTEobTQ/7DzCAUOdjzIZmWUn9bgPmJWj6JuZg="; }; propagatedBuildInputs = [ From b9f2aa31ae111f656cea317717a9ffe4b4b5d313 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:19 +0200 Subject: [PATCH 224/752] python3Packages.ifcopenshell: 210410 -> 230915 --- pkgs/development/python-modules/ifcopenshell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index e2c945c2834e..eb1c71601c92 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "ifcopenshell"; - version = "210410"; + version = "230915"; format = "other"; src = fetchFromGitHub { owner = "IfcOpenShell"; repo = "IfcOpenShell"; - rev = "blenderbim-${version}"; + rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "1g52asxrqcfj01iqvf03k3bb6rg3v04hh1wc3nmn329a2lwjbxpw"; + sha256 = "sha256-dHw+5AlJbeuUeaxv7eE2XfLjR/K5S00dMSCtoWVcEB8="; }; nativeBuildInputs = [ gcc10 cmake ]; From 518b999ae3f484d0043d1fc3b46c6095e3cd703d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:19 +0200 Subject: [PATCH 225/752] python3Packages.image-go-nord: 0.1.5 -> 0.1.7 --- pkgs/development/python-modules/image-go-nord/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/image-go-nord/default.nix b/pkgs/development/python-modules/image-go-nord/default.nix index 519ac772a59e..ff7c654c9ea3 100644 --- a/pkgs/development/python-modules/image-go-nord/default.nix +++ b/pkgs/development/python-modules/image-go-nord/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "image-go-nord"; - version = "0.1.5"; + version = "0.1.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Schrodinger-Hat"; repo = "ImageGoNord-pip"; - rev = "v${version}"; - hash = "sha256-O34COlGsXExJShRd2zvhdescNfYXWLNuGpkjcH3koPU="; + rev = "refs/tags/v${version}"; + hash = "sha256-vXABG3aJ6bwT37hfo909oF8qfAY3ZW18xvr1V8vSy5w="; }; propagatedBuildInputs = [ pillow ]; From 2e0ebb17cab71d44d9c5f87ace1cfa478dc178fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:19 +0200 Subject: [PATCH 226/752] python3Packages.imageio: 2.28.1 -> 2.31.3 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 6989a12bf865..083170fd438b 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.28.1"; + version = "2.31.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XbUIe+XIFOz34sfTChoVyX7Kl9jCbzHdxU12fUpDvOg="; + hash = "sha256-dMaoMtgbetWoqAl23qWO4DPT4rmaVJkMvXibTLCzFGE="; }; patches = lib.optionals (!stdenv.isDarwin) [ From a43bae5ae44a52d77e476a86bd8f826a46b8803d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:19 +0200 Subject: [PATCH 227/752] python3Packages.imageio-ffmpeg: 0.4.8 -> 0.4.9 --- pkgs/development/python-modules/imageio-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index cdffa669edcf..3f2b7de89dde 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-/aoFrRD+Bwt/qOX2FcsNKPO5t5HQCvbSoR5pQVjRCqk="; + hash = "sha256-ObzRZgEY7zYPpAR0VlAQcTZGYaqdkCHT0mxY8e4ggfU="; }; patches = [ From 0b73de4439bb5271f4524c4f1ee92ff3bcae08c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:19 +0200 Subject: [PATCH 228/752] python3Packages.iminuit: 2.21.3 -> 2.24.0 --- .../python-modules/iminuit/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index c1d896f698e1..3969b1c9ca51 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -1,27 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, cmake -, numpy -, pytestCheckHook , pythonOlder + +# build-system +, cmake +, scikit-build-core +, pybind11 +, pathspec +, ninja +, pyproject-metadata + +# dependencies +, numpy + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "iminuit"; - version = "2.21.3"; - format = "setuptools"; + version = "2.24.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+zE/DMJ+IhubIhvNd5s6Zo+0x3sPkKv9UzaDPsvawBY="; + hash = "sha256-JatjHDyOAksbzHyW9mM4yqxUpKIyTVXx47pWF4FuRP0="; }; nativeBuildInputs = [ cmake - ]; + scikit-build-core + pybind11 + pathspec + ninja + pyproject-metadata + ] ++ scikit-build-core.optional-dependencies.pyproject; propagatedBuildInputs = [ numpy From 3c86835248f537ff4cececc79df2346123d76645 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:19 +0200 Subject: [PATCH 229/752] python3Packages.importlib-resources: 5.12.0 -> 6.0.1 --- .../python-modules/importlib-resources/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index b470eb12a4ea..8b6afb522b6a 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.12.0"; + version = "6.0.1"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-S+glib9cHXmZrt8qRRWdEMs8pPGbInH4eSvI5tp7IvY="; + hash = "sha256-Q1lFfkJwhGK5YmoEZXxiCK15nOtB5cWMV/+g5qCYpdQ="; }; nativeBuildInputs = [ From e6fe97b972446d3d9ecf9ad905c8bdf5b58292fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:19 +0200 Subject: [PATCH 230/752] python3Packages.inflect: 6.0.4 -> 7.0.0 --- pkgs/development/python-modules/inflect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 9805f72ef830..10f5a56763ef 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "inflect"; - version = "6.0.4"; + version = "7.0.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-GEJkmhe2ytZoEqXJvfrLYxDh57bdijHwJnZt8bYmEus="; + hash = "sha256-Y9qTJa0p2oHsI+BVtBIleVq3k7TstIO+XcH6Nj/UcX4="; }; nativeBuildInputs = [ setuptools-scm ]; From 62a975fb4915f8606fc6012d3549ec0afd256b69 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 231/752] python3Packages.ipykernel: 6.21.2 -> 6.25.2 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index aeb19ec9f2bd..74cb52629af5 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.21.2"; + version = "6.25.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bpITSE5M4fsUJn7kNeGPI8w6BjTmNbn7TtRne4Tg/fg="; + hash = "sha256-9Gjd0fF6y0jIzmf8+km6bUbU+awEOMH0Qb58PRNyIws="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 From 0408f7e5ab6a22d7b63520d3a6dab5d4f1b2448c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 232/752] python3Packages.ipython: 8.11.0 -> 8.15.0 --- .../python-modules/ipython/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index d0fd08146bcf..a730531bf873 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder # Build dependencies @@ -12,6 +11,7 @@ , appnope , backcall , decorator +, exceptiongroup , jedi , matplotlib-inline , pexpect @@ -20,6 +20,7 @@ , pygments , stack-data , traitlets +, typing-extensions # Test dependencies , pytestCheckHook @@ -28,13 +29,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.11.0"; + version = "8.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04"; + sha256 = "sha256-K661vmlJ7uv1MhUPgXRvgzPizM4C3hx+7d4/I+1enx4="; }; nativeBuildInputs = [ @@ -52,6 +53,10 @@ buildPythonPackage rec { pygments stack-data traitlets + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ] ++ lib.optionals stdenv.isDarwin [ appnope ]; @@ -64,8 +69,8 @@ buildPythonPackage rec { export HOME=$TMPDIR # doctests try to fetch an image from the internet - substituteInPlace pytest.ini \ - --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py" + substituteInPlace pyproject.toml \ + --replace '"--ipdoctest-modules",' '"--ipdoctest-modules", "--ignore=IPython/core/display.py",' ''; nativeCheckInputs = [ @@ -83,6 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; + downloadPage = "https://github.com/ipython/ipython/"; homepage = "https://ipython.org/"; changelog = "https://github.com/ipython/ipython/blob/${version}/docs/source/whatsnew/version${lib.versions.major version}.rst"; license = licenses.bsd3; From d41ef584108c61f0df8cb7af841ddb1026010fe5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 233/752] python3Packages.ipywidgets: 8.0.6 -> 8.1.1 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 5432d31c5472..0de6db55b941 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.0.6"; + version = "8.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3n13nyBF1g3p9sJfZT/a4tuleJjmoShElLO6ILaJO7g="; + hash = "sha256-QCEe+1Vq3sb6RQzMKnfVnKRKBg9PnxNoM99ZyfU45ug="; }; propagatedBuildInputs = [ From fff4fd6ca8c06dc13a64851cc39760c9ce4f45c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 234/752] python3Packages.iso8601: 1.1.0 -> 2.0.0 --- pkgs/development/python-modules/iso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index c3e022cdb38b..ade0c71ee887 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "iso8601"; - version = "1.1.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MoEee4He7iBj6m0ulPiBmobR84EeSdI2I6QfqDK+8D8="; + hash = "sha256-c5lg03x0x3vZvVRqdlYsy1gf49SCD/XDFB60nIOf2o8="; }; nativeBuildInputs = [ From ac7549262912fb7d2522c7408a0302e8c11ab41f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 235/752] python3Packages.jaraco-classes: 3.1.1 -> 3.3.0 --- .../development/python-modules/jaraco-classes/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 8c9b32fb11ee..317fc3e3dc1a 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -6,14 +6,16 @@ buildPythonPackage rec { pname = "jaraco-classes"; - version = "3.1.1"; + version = "3.3.0"; + format = "pyproject"; + disabled = isPy27; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.classes"; - rev = "v${version}"; - sha256 = "0wzrcsxi9gb65inayg0drm08iaw37jm1lqxhz3860i6pwjh503pr"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DW8qf6G6997vBOaO1+Bdx4LBvKfpl/MiiFqWJYKE/pg="; }; pythonNamespaces = [ "jaraco" ]; From 21d90b6be6754ac92242db6e18087b84f77574ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 236/752] python3Packages.jaraco-functools: 3.6.0 -> 3.9.0 --- pkgs/development/python-modules/jaraco-functools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix index 9cd5e9988f66..0cc2fa124db5 100644 --- a/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jaraco-functools"; - version = "3.6.0"; + version = "3.9.0"; format = "pyproject"; src = fetchPypi { pname = "jaraco.functools"; inherit version; - hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; + hash = "sha256-ixN7D+rMF/70us7gTAEcnobyNBCZyHCh0S0743sypjg="; }; nativeBuildInputs = [ setuptools-scm ]; From 57becb34f249ac5eacdca2eeb47fbabe1f8322d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 237/752] python3Packages.jaraco-itertools: 6.2.1 -> 6.4.1 --- pkgs/development/python-modules/jaraco-itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-itertools/default.nix b/pkgs/development/python-modules/jaraco-itertools/default.nix index 906733508c25..23722cc20c4b 100644 --- a/pkgs/development/python-modules/jaraco-itertools/default.nix +++ b/pkgs/development/python-modules/jaraco-itertools/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "jaraco-itertools"; - version = "6.2.1"; + version = "6.4.1"; format = "pyproject"; src = fetchPypi { pname = "jaraco.itertools"; inherit version; - hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; + hash = "sha256-MU/OVi67RepIIqmLvXsi5f6sfVEY28Gk8ess0Ea/+kc="; }; pythonNamespaces = [ "jaraco" ]; From 6265122b3f31fad045ebc534befd3088bdce22c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:20 +0200 Subject: [PATCH 238/752] python3Packages.jaxopt: 0.5.5 -> 0.8 --- pkgs/development/python-modules/jaxopt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 70d802019e3f..22b548e1e76e 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jaxopt"; - version = "0.5.5"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-WOsr/Dvguu9/qX6+LMlAKM3EANtYPtDu8Uo2157+bs0="; + rev = "refs/tags/jaxopt-v${version}"; + hash = "sha256-y3F2uXe1/TYy42WJl5Toj+CjY2FqYVK8D33apRdNvf4="; }; propagatedBuildInputs = [ From 4f842d36d25f8ac7f23d34b46e3371450cb1c02e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:21 +0200 Subject: [PATCH 239/752] python3Packages.jedi-language-server: 0.40.0 -> 0.41.0 --- .../python-modules/jedi-language-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 35749407a36e..10969de0673e 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -9,14 +9,14 @@ , pydantic , pyhamcrest , pytestCheckHook -, python-jsonrpc-server +, python-lsp-jsonrpc , pythonOlder , pythonRelaxDepsHook }: buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.40.0"; + version = "0.41.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; + hash = "sha256-1ujEhoxWcCM1g640aLE60YGiNQLB+G7t7oLVZXW8AMM="; }; pythonRelaxDeps = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyhamcrest - python-jsonrpc-server + python-lsp-jsonrpc ]; preCheck = '' From f63e8f4ca9168511609a42b964e439f4e83b4ae7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:21 +0200 Subject: [PATCH 240/752] python3Packages.jiwer: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/jiwer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix index b92d1e71755a..d042726daa6a 100644 --- a/pkgs/development/python-modules/jiwer/default.nix +++ b/pkgs/development/python-modules/jiwer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jiwer"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jitsi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z+M0/mftitLV2OaaQvTdRehtt16FFeBjqR//S5ad1XE="; + hash = "sha256-32bpSBYl6yxb4lJhHnfnYhtye7DaBZT0VAe9rDcleTc="; }; nativeBuildInputs = [ From 618254d0f6da5ea81be53a9f2ba10327a92d239d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:21 +0200 Subject: [PATCH 241/752] python3Packages.jsonpickle: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/jsonpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index d60fd41d7045..4fc2f49119dc 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - hash = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; + hash = "sha256-43q7pL+zykpGR9KLufRwZDb3tGyKgzO0pxirr6jkazc="; }; nativeCheckInputs = [ pytest ]; From d4d07bf40c54df322b0336120116a63d0c80cec5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:21 +0200 Subject: [PATCH 242/752] python3Packages.jsonpointer: 2.3 -> 2.4 --- pkgs/development/python-modules/jsonpointer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index 646824b064a7..f05b886cfb12 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.3"; + version = "2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-l8ulFSbIKSgiGP65nasbHmvfjv0cQ9ydV74JPA1pyZo="; + hash = "sha256-WFzugrcCEfqeYEO3u4nbbhqklSQ0Dd6K1rYyBuponYg="; }; meta = with lib; { From ed4c01f01c7406e7f5f8e4c9788f44042d8ef9ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:21 +0200 Subject: [PATCH 243/752] python3Packages.jsonschema: 4.18.4 -> 4.19.0 --- pkgs/development/python-modules/jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 0f3d69b18d8c..d8c235efed23 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.18.4"; + version = "4.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+zZCc1OZ+pWMDSqtcFeQFVRZbGM0n09rKDxJPPaSol0="; + hash = "sha256-bh51aawTvoE5st0sIaVdNQBm7j+A3wbGCLOYzcbzDo8="; }; postPatch = '' From b9f6dfd23c4cbff77071b36aaa17b75ec00e0c7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:22 +0200 Subject: [PATCH 244/752] python3Packages.jsonschema-spec: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/jsonschema-spec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 3353e5ec4380..0da22f2cf98f 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jsonschema-spec"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sa97DwPnGMLmT00hVdkoGO7C0vrvtwxvUvv9lq4nCY4="; + hash = "sha256-1Flb3XQCGhrAYzTvriSVhHDb/Z/uvCyZdbav2u7f3sg="; }; postPatch = '' From 8f36a246f8a072081cec9ac6b1acd8154dea9e7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:22 +0200 Subject: [PATCH 245/752] python3Packages.jupyter_client: 8.0.3 -> 8.3.1 --- pkgs/development/python-modules/jupyter-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 5aa400a1694c..2d7234051d23 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "8.0.3"; + version = "8.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7WVJi+pth2752No+DbPdM8XRKfWyZF9WrgOZN4KWa9A="; + hash = "sha256-YClLLVuGk1bIk/V7God+plENYNRc9LOAV/FnLYVpmsk="; }; nativeBuildInputs = [ From e57a600fc32e3305ffcc1d1b74d36c0d6114a3a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:22 +0200 Subject: [PATCH 246/752] python3Packages.jupyter-collaboration: 1.1.0 -> 1.2.0 --- .../python-modules/jupyter-collaboration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index de73ea621b47..6c2842eb6d0c 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-3OxduJ93TmbS/fKSKmVXs5vj2IZMX5MqKPTeGklFCbM="; + hash = "sha256-qhcCPAgHlBwt+Lt8NdDa+ZPhNNotCvNtz9WQx6OHvOc="; }; postPatch = '' From 5a5b19deeba87ee8f54eca7f4f89ef69e9e14eb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:22 +0200 Subject: [PATCH 247/752] python3Packages.jupyter-core: 5.2.0 -> 5.3.1 --- .../python-modules/jupyter-core/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index a25681dda45a..fb5880a4f226 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , hatchling , platformdirs , traitlets @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.2.0"; + version = "5.3.1"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -20,16 +19,11 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-X3P3bTLhpWIa6EHdxZ/KFiQNAnhszha2cfZ8PynZPRs="; + hash = "sha256-kQ7oNEC5L19PTPaX6C2bP5FYuzlsFsS0TABsw6VvoL8="; }; patches = [ ./tests_respect_pythonpath.patch - (fetchpatch { - # add support for platformdirs>=3 - url = "https://github.com/jupyter/jupyter_core/commit/ff4086cdbdac2ea79c18632e4e35acebc1f7cf57.patch"; - hash = "sha256-UhHO58xZ4hH47NBhOhsfBjgsUtA+1EIHxPBvnKA5w28="; - }) ]; nativeBuildInputs = [ From b984e5764f896443759c153121a000ee1811a3ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:22 +0200 Subject: [PATCH 248/752] python3Packages.jupyter-events: 0.6.3 -> 0.7.0 --- pkgs/development/python-modules/jupyter-events/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index a60983e40420..98e6ea22df6e 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.6.3"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; rev = "refs/tags/v${version}"; - hash = "sha256-k+OyCKUN9hC6J1Ff2DDb2ECLvmWkkK1HtNxfKVXyl8g="; + hash = "sha256-hOx2/WiFpDjtmP+qC6Ew2VY4/gdvXuv2k76qtmS+61M="; }; nativeBuildInputs = [ From 1702e3e5e354f292db825b76eae6779f7d038aee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:22 +0200 Subject: [PATCH 249/752] python3Packages.jupyterlab: 4.0.3 -> 4.0.6 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 81c7f862f6ad..a99d4d468c95 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.3"; + version = "4.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4U0c5GphMCgRHQ1Hah19awlAA7dGK6xmn1tHgxeryzk="; + hash = "sha256-bEOuWmof0v36/LNFQASVi95tp2Mxq7RM/8b55Daxm6E="; }; nativeBuildInputs = [ From bae333d8ad9e4a933b0649357065adf4a0b92488 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:22 +0200 Subject: [PATCH 250/752] python3Packages.jupyterlab-git: 0.41.0 -> 0.42.0 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index e894a8c88d8d..7c0522c75401 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.41.0"; + version = "0.42.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - hash = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; + hash = "sha256-GFnox6KnwKWFqsUWY0QYzMShXlH9KFSY3rRJA4RAiCk="; }; nativeBuildInputs = [ From 0239f7b3e34830e22cae3f68107cac235ec4c176 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:23 +0200 Subject: [PATCH 251/752] python3Packages.jupyterlab_server: 2.24.0 -> 2.25.0 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 2ec4ccf47e7e..6deb3912730b 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.24.0"; + version = "2.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tm+Z4KVXm7vDLkScTbsDlWHU8aeCfVczJz7VZzjyHwc="; + hash = "sha256-d8Lx8oLWEPleSW4g1b8dKncGgm37exjzN4rihw0nL7c="; }; nativeBuildInputs = [ From c47685b223977585e6e657c8156181341fbfb0fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:23 +0200 Subject: [PATCH 252/752] python3Packages.jupyterlab-widgets: 3.0.7 -> 3.0.9 --- .../development/python-modules/jupyterlab-widgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 2418b8db4d35..4d668da9bde6 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.7"; + version = "3.0.9"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-w6UO1b9Sigx6hpCWUDr1RwL4bdodtGmu4cktwMAbQ8o="; + hash = "sha256-YAWk6XTHvu6EBg/fujQaMhhJUEbeiuPsZIiOX+Gf20w="; }; nativeBuildInputs = [ From cd1b2049e0bd97682bde4b7d27e0fea270d66928 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:23 +0200 Subject: [PATCH 253/752] python3Packages.justnimbus: 0.6.0 -> 0.7.2 --- pkgs/development/python-modules/justnimbus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/justnimbus/default.nix b/pkgs/development/python-modules/justnimbus/default.nix index cc302cc5865b..ecea9ef4a549 100644 --- a/pkgs/development/python-modules/justnimbus/default.nix +++ b/pkgs/development/python-modules/justnimbus/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "justnimbus"; - version = "0.6.0"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kvanzuijlen"; repo = pname; - rev = version; - hash = "sha256-uQ5Nc5sxqHeAuavyfX4Q6Umsd54aileJjFwOOU6X7Yg="; + rev = "refs/tags/${version}"; + hash = "sha256-arUdjZiEJx0L1YcCNxqlE4ItoTEzd/TYVgqDPIqomMg="; }; nativeBuildInputs = [ From 7f83918396be90c9e6504735ad8dc081111d5163 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:23 +0200 Subject: [PATCH 254/752] python3Packages.kaggle: 1.5.13 -> 1.5.16 --- pkgs/development/python-modules/kaggle/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 42cb7f83bb85..270ed1fb375f 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, bleach , certifi , fetchPypi , lib @@ -12,11 +13,11 @@ buildPythonPackage rec { pname = "kaggle"; - version = "1.5.13"; + version = "1.5.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g2TFbDYSXLgZWHbZEdC8nvvBcxZ+ljuenveTeJupp/4="; + sha256 = "sha256-prNUL1kM80GlrUQdWuAhvpO9ZEQclsdYsVSQNJWjpgA="; }; # The version bounds in the setup.py file are unnecessarily restrictive. @@ -28,6 +29,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + bleach certifi python-dateutil python-slugify From ea62d5a2ff4412d1e38cb7632d363ecfcfc2f312 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:23 +0200 Subject: [PATCH 255/752] python3Packages.sapi-python-client: 0.5.0 -> 0.7.1 --- pkgs/development/python-modules/kbcstorage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 199ab908efd7..162d530bd4bb 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.5.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "keboola"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; + hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 18309a8c4189058e992978f0b3468830e8f6bcfe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:23 +0200 Subject: [PATCH 256/752] python3Packages.keras: 2.11.0 -> 2.14.0 --- pkgs/development/python-modules/keras/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index a2a90aa851d3..f5275ea1a2a6 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,14 @@ buildPythonPackage rec { pname = "keras"; - version = "2.11.0"; + version = "2.14.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - hash = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; + hash = "sha256-10KdHSExzH6x8uouwzAifH2dONqz398ueN7+5OzEP80="; + python = "py3"; + dist = "py3"; }; nativeCheckInputs = [ From e70d9773116a7c710562e2fcaa24ddcbdbd4c3e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:23 +0200 Subject: [PATCH 257/752] python3Packages.keystoneauth1: 5.1.2 -> 5.3.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 71faf0c4cf18..504cc8ee4c66 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.1.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-2fdIStX8mwu7fsw8vzeVoXBpT72EglEzHlS6SLvuzHI="; + hash = "sha256-AXwrm1mUU8kpQHUO27IPF2hxIbKJARS/nTbfFKBicRc="; }; postPatch = '' From 63570fbaaffcc427d706f9d6d4f3295547339f15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:24 +0200 Subject: [PATCH 258/752] python3Packages.kiwisolver: 1.4.4 -> 1.4.5 --- pkgs/development/python-modules/kiwisolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 0a985bc3dee0..bc905e77269a 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.4.4"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; + hash = "sha256-5X5WOlf7IqFC2jTziswvwaXIZLwpyhUXqIq8lj5g1uw="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; From 6d0ad263ecabf5b50cb76d13600f7da39e0b7bfe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:24 +0200 Subject: [PATCH 259/752] python3Packages.kubernetes: 26.1.0 -> 27.2.0 --- pkgs/development/python-modules/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 8e97d083cd9e..2b28f76d051a 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "26.1.0"; + version = "27.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-2QkQGZ4Dho2PykH90ijosWWBzhQoCHoWhRL3ruOiDBg="; + hash = "sha256-KqQ7wUu5Se4WYOdtk9vMU3M5oyz0WgIltSEliCD7s10="; }; propagatedBuildInputs = [ From 6882f66aeec0cf74c052799d3c5f405130c3e754 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:24 +0200 Subject: [PATCH 260/752] python3Packages.labelbox: 3.38.0 -> 3.52.0 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index f5c9bdfed9e2..c0b635abf460 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.38.0"; + version = "3.52.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-AyQPI19As49GML3kVXtHtRNOKthrpkQ7MCmww+F6owc="; + hash = "sha256-t0Q+6tnUPK2oqjdAwwYeSebgn2EQ1fBivw115L8ndOg="; }; postPatch = '' From e0cec3554dcf1c53410ad976753f9ed93fccef2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:24 +0200 Subject: [PATCH 261/752] python3Packages.labgrid: 0.4.1 -> 23.0.3 --- pkgs/development/python-modules/labgrid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index bcae9b88398d..0e96bf2fe9ae 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "labgrid"; - version = "0.4.1"; + version = "23.0.3"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; - rev = "v${version}"; - sha256 = "0ih04lh1q3dysps4vfmk2rhqqrsimssadsxvbxdsnim2yihrrw47"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-yhlBqqCLOt6liw4iv8itG6E4QfIa7cW76QJqefUM5dw="; }; patches = [ From 3813053276429d143985bf1eb4c176f8ebeb39c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:24 +0200 Subject: [PATCH 262/752] python3Packages.langchain: 0.0.285 -> 0.0.291 --- pkgs/development/python-modules/langchain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 865ce51b07db..6f77951ccec5 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.285"; + version = "0.0.291"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -95,7 +95,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-3vOfwn8qvPd9dPRnsX14bVSLQQKHLPS5r15S8yAQFpw="; + hash = "sha256-Ilmu4l+DCu2soX5kANegk/DMvr2x9AXUcQ1aZOKbQJc="; }; sourceRoot = "${src.name}/libs/langchain"; From 1723f25cdf1e9b0e45fee916783c33cef4f95752 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:24 +0200 Subject: [PATCH 263/752] python3Packages.langchainplus-sdk: 0.0.20 -> 0.0.21 --- pkgs/development/python-modules/langchainplus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchainplus-sdk/default.nix b/pkgs/development/python-modules/langchainplus-sdk/default.nix index 1ea97ccdb11e..8747c0a8d9e8 100644 --- a/pkgs/development/python-modules/langchainplus-sdk/default.nix +++ b/pkgs/development/python-modules/langchainplus-sdk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "langchainplus-sdk"; - version = "0.0.20"; + version = "0.0.21"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "langchainplus_sdk"; - hash = "sha256-PTAOLjKQ9ozJ2ELAWflFjeumDndsnnkDCWiMrRv7shk="; + hash = "sha256-frjZnQnOe6IHKrQk+Q/xMc5Akb+eBQ/eBzP545Fq6Xk="; }; nativeBuildInputs = [ From ad5c1e380252030bab308ca8e521ab4c9f901501 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:24 +0200 Subject: [PATCH 264/752] python3Packages.langsmith: 0.0.35 -> 0.0.37 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index cdb89dc49121..062815772653 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.35"; + version = "0.0.37"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-TR4vBsRImMLs7CTlBt1NHL+n65jXxBNbOY7wIlfFBfM="; + hash = "sha256-xtyGL1Voyoik3fN//xhPNetC+yera4Wd+DZJTnLhW7g="; }; sourceRoot = "${src.name}/python"; From 158da247b6ca5ea3e86903d56a6f56df57b3e2b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:25 +0200 Subject: [PATCH 265/752] python3Packages.lark: 1.1.5 -> 1.1.7 --- .../python-modules/lark/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index b5ba6c7583f1..3158b626c2a6 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -1,23 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, python +, fetchpatch , regex , pytestCheckHook , js2py +, setuptools }: buildPythonPackage rec { pname = "lark"; - version = "1.1.5"; + version = "1.1.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = "refs/tags/${version}"; - hash = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; + hash = "sha256-k74tozIgJuwtUqKKmYHlfLpCWyT2hdoygRJiIpw+GDE="; }; + patches = [ + # include .lark files in package data + # https://github.com/lark-parser/lark/pull/1308 + (fetchpatch { + url = "https://github.com/lark-parser/lark/commit/656334cb8793fd4e08a12843eaced5a7bb518be3.patch"; + hash = "sha256-pYeNnFfXJ8xkR0KsU/KMWJ8nF+BhP9PXEANiVhT254s="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + # Optional import, but fixes some re known bugs & allows advanced regex features propagatedBuildInputs = [ regex ]; From bccd14d7c855a1499f6ae198cbaf87ef47803db0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:25 +0200 Subject: [PATCH 266/752] python3Packages.ledger-bitcoin: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/ledger-bitcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix index edfc9c7f22f2..afffe79b26bc 100644 --- a/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ledger-bitcoin"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit version; pname = "ledger_bitcoin"; - hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; + hash = "sha256-MEZuwIthIOwBkRdR7dEsEznO+GVBeOf7/5xmwNW1SvI="; }; nativeBuildInputs = [ From 338a12fa3afffd5d289a0671dd2c40e431a217fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:25 +0200 Subject: [PATCH 267/752] python3Packages.ledgercomm: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/ledgercomm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgercomm/default.nix b/pkgs/development/python-modules/ledgercomm/default.nix index 092378a142b8..15bac008f0d5 100644 --- a/pkgs/development/python-modules/ledgercomm/default.nix +++ b/pkgs/development/python-modules/ledgercomm/default.nix @@ -2,20 +2,22 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "ledgercomm"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-izOPbwv+34Xq8mpq9+QRIGhd+z4pVnGJSMnYOktRVbs="; + hash = "sha256-HunJjIRa3IpSL/3pZPf6CroLxEK/l7ihh737VOAILgU="; }; nativeBuildInputs = [ setuptools + setuptools-scm ]; pythonImportsCheck = [ From c19b8ff91f82e7b41f89c0bc72964176b75dbaa9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:25 +0200 Subject: [PATCH 268/752] python3Packages.libarchive-c: 4.0 -> 5.0 --- pkgs/development/python-modules/libarchive-c/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 943ed138f991..43f2e11ef3df 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "4.0"; + version = "5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; - rev = version; - sha256 = "1ar7lj1lpisklq2q07d95yhlbfq25g9g61hcj8whj17mq8vrvml1"; + rev = "refs/tags/${version}"; + sha256 = "sha256-8e3Tnek5q5NJneSVIrbFNTQPjHZ7Ieb14uiKjQwufTE="; }; LC_ALL="en_US.UTF-8"; From b5b1507a027da8539cc4ac7c95ef33ef43c69abe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:25 +0200 Subject: [PATCH 269/752] python3Packages.librosa: 0.10.0 -> 0.10.1 --- .../python-modules/librosa/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 03cdeea14e51..a93b6b0d99cb 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { @@ -41,22 +41,23 @@ buildPythonPackage rec { repo = "librosa"; rev = "refs/tags/${version}"; fetchSubmodules = true; # for test data - hash = "sha256-MXzPIcbG8b1JwhEyAZG4DRObGaHq+ipVHMrZCzaxLdE="; + hash = "sha256-zbmU87hI9A1CVcBZ/5FU8z0t6SS4jfJk9bj9kLe/EHI="; }; - patches = [ - # https://github.com/librosa/librosa/pull/1731 - (fetchpatch { - name = "support-scipy-1.11.patch"; - url = "https://github.com/librosa/librosa/commit/12dee8eabed7df14c5622b52c05393ddfeb11f4b.patch"; - hash = "sha256-JxTXU0Mc+QYpsafjoGLaIccD7EdCYJvIVianeosYpw4="; - }) - ]; - nativeBuildInputs = [ setuptools ]; + patches = [ + (fetchpatch { + # https://github.com/librosa/librosa/issues/1754 + # https://github.com/librosa/librosa/pull/1755 + name = "matplotlib-3.8-compat.patch"; + url = "https://github.com/librosa/librosa/commit/beef47885ce1255b43b65e48ea2054ddace37c6c.patch"; + hash = "sha256-rrnlUHXHY2me4BWGs3wFq8WJmz75CbXTWKFp3VdJKzE="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov-report term-missing --cov librosa --cov-report=xml " "" From 8db51662f206d99873fbc1d28d5461a0dd69417a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:25 +0200 Subject: [PATCH 270/752] python3Packages.lightgbm: 3.3.5 -> 4.1.0 --- .../python-modules/lightgbm/default.nix | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 38ec2aaa5b40..d2fc8cbc13a2 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -2,33 +2,47 @@ , stdenv , buildPythonPackage , fetchPypi + +# build-system , cmake +, ninja +, pathspec +, pyproject-metadata +, scikit-build-core + +# dependencies +, llvmPackages , numpy , scipy , scikit-learn -, llvmPackages ? null , pythonOlder -, python + +# optionals: gpu +, boost +, cudatoolkit , ocl-icd , opencl-headers -, boost , gpuSupport ? stdenv.isLinux }: buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.5"; - format = "setuptools"; + version = "4.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; + hash = "sha256-vuWd0mmpOwk/LGENSmaDp+qHxj0+o1xiISPOLAILKrw="; }; nativeBuildInputs = [ cmake + ninja + pathspec + pyproject-metadata + scikit-build-core ]; dontUseCmakeConfigure = true; @@ -37,6 +51,7 @@ buildPythonPackage rec { llvmPackages.openmp ]) ++ (lib.optionals gpuSupport [ boost + cudatoolkit ocl-icd opencl-headers ]); @@ -47,13 +62,7 @@ buildPythonPackage rec { scikit-learn ]; - buildPhase = '' - runHook preBuild - - ${python.pythonForBuild.interpreter} setup.py bdist_wheel ${lib.optionalString gpuSupport "--gpu"} - - runHook postBuild - ''; + pypaBuildFlags = lib.optionalString gpuSupport "--config-setting=cmake.define.USE_CUDA=ON"; postConfigure = '' export HOME=$(mktemp -d) From 2a3a78f699a6d70d1acf8a80d619d1b61bdf8697 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:26 +0200 Subject: [PATCH 271/752] python3Packages.limits: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 8ee100670418..2146f1b9a0bc 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-O4yENynvon9xM8F/r0NMSpSh6Hl2EoTcXgldrwzo24M="; + hash = "sha256-VLfFWFcwLgEEvPUKQ00QjEq1HN28OpE6Eu1eyF+TwXU="; }; propagatedBuildInputs = [ From 5822c0e87526643f7a1dd33439f04adc50b0337e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:26 +0200 Subject: [PATCH 272/752] python3Packages.linear_operator: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/linear_operator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/linear_operator/default.nix b/pkgs/development/python-modules/linear_operator/default.nix index f42522016c1f..1bf11865dfc0 100644 --- a/pkgs/development/python-modules/linear_operator/default.nix +++ b/pkgs/development/python-modules/linear_operator/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "linear_operator"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; - rev = "v${version}"; - hash = "sha256-7NkcvVDwFaLHBZZhq7aKY3cWxe90qeKmodP6cVsdrPM="; + rev = "refs/tags/v${version}"; + hash = "sha256-OuE6jx9Q4IU+b2a+mrglRdBOReN1tt/thetNXxwk1GI="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From 88fbe4147214af6ad7dc77d640a5aac5aa4de50d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:26 +0200 Subject: [PATCH 273/752] python3Packages.linkify-it-py: 2.0.0 -> 2.0.2 --- .../python-modules/linkify-it-py/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index 21c99442f7bd..660e3cd2d9b9 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -4,12 +4,13 @@ , pythonOlder , pytestCheckHook , uc-micro-py +, setuptools }: buildPythonPackage rec { pname = "linkify-it-py"; - version = "2.0.0"; - format = "setuptools"; + version = "2.0.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,13 +18,24 @@ buildPythonPackage rec { owner = "tsutsu3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3bgkhIC6tHl5zieiyllvqFCKwLms55m8MGt1xGhQ4Dk="; + hash = "sha256-e3k2RblqvzWSSIrJL6ib2dxFw7T5vXlN8DrCV1qEr6w="; }; - propagatedBuildInputs = [ uc-micro-py ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "linkify_it" ]; + propagatedBuildInputs = [ + uc-micro-py + ]; + + pythonImportsCheck = [ + "linkify_it" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Links recognition library with full unicode support"; From c91cbeab267ecdbed1b756f7c78807deeccd74a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:26 +0200 Subject: [PATCH 274/752] python3Packages.linode-api: 5.0.0 -> 5.7.2 --- pkgs/development/python-modules/linode-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 906f5eb40a06..4c1b77bf86a9 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.0.0"; + version = "5.7.2"; disabled = pythonOlder "3.6"; # Sources from Pypi exclude test fixtures src = fetchFromGitHub { owner = "linode"; repo = "python-linode-api"; - rev = version; - sha256 = "0lqi15vks4fxbki1l7n1bfzygjy3w17d9wchjxvp22ijmas44yai"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RU/GyNYV05iYVNanMqKMmoksXWrxTQ2H2XvaIwSSslA="; }; propagatedBuildInputs = [ requests ]; From 91a98133db0acf6972a083453020ec7d076bc81a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:26 +0200 Subject: [PATCH 275/752] python3Packages.lit: 15.0.6 -> 16.0.6 --- pkgs/development/python-modules/lit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index b4dee1e20b55..62befc8c9721 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lit"; - version = "15.0.6"; + version = "16.0.6"; src = fetchPypi { inherit pname version; - hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k="; + hash = "sha256-hGI8nCO2sUdj1jf05j5rchs0Rq2kC/cAHY/ucLjnepo="; }; passthru = { From ce37d02ffad2a185f2e2217af7aeec032e605b88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:26 +0200 Subject: [PATCH 276/752] python3Packages.localstack-ext: 1.4.0 -> 2.2.0 --- pkgs/development/python-modules/localstack-ext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index ed9b190b80f1..2e19ff0d9b34 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "1.4.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-/uesHiB/54wEfcWf4e9BW1ZvcVfAgAD7yGAlfYxv+6g="; + hash = "sha256-BLK41TRaYNtpeeDeGZhlvnvkQwWo0uGB19g34waRqFk="; }; postPatch = '' From 3f02f3869c8f0e7116d8daf8112c161c389d849b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:26 +0200 Subject: [PATCH 277/752] python3Packages.loguru: 0.7.0 -> 0.7.2 --- pkgs/development/python-modules/loguru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 75cc1f9b2c61..93e9d8937bd8 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.7.0"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Delgan"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JwhJPX58KrPdX237L43o77spycLAVFv3K9njJiRK30Y="; + hash = "sha256-1xcPAOOhjFmWSxmPj6NICRur3ITOuQRNNKPJlfp89Jw="; }; nativeCheckInputs = [ From 5d4811f9a3fb7b6c4bfca7549bbcb1de79d91642 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:27 +0200 Subject: [PATCH 278/752] python3Packages.m2r: 0.2.1 -> 0.3.1 --- pkgs/development/python-modules/m2r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 942699156a93..02dd3c540ac4 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "m2r"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; + sha256 = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; }; patches = [ From d944dc08fabae2dffd91314c445ef980bdc41ebf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:27 +0200 Subject: [PATCH 279/752] python3Packages.magic-wormhole: 0.12.0 -> 0.13.0 https://github.com/magic-wormhole/magic-wormhole/blob/0.13.0/NEWS.md --- .../python-modules/magic-wormhole/default.nix | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 95635b94d505..d25daaf21bc0 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,6 +2,11 @@ , stdenv , buildPythonPackage , fetchPypi + +# build-system +, setuptools + +# dependencies , spake2 , pynacl , six @@ -9,11 +14,15 @@ , twisted , autobahn , automat -, hkdf , tqdm , click , humanize , txtorcon + +# optional-dependencies +, noiseprotocol + +# tests , nettools , mock , magic-wormhole-transit-relay @@ -23,13 +32,18 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.12.0"; + version = "0.13.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"; + hash = "sha256-rDvWgoYnDn8UnAYUmo5Anl+jTX/rDoiESibSnu0tFRY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ spake2 pynacl @@ -38,25 +52,29 @@ buildPythonPackage rec { twisted autobahn automat - hkdf tqdm click humanize txtorcon - ] ++ autobahn.optional-dependencies.twisted + ] + ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; + passthru.optional-dependencies = { + dilation = [ + noiseprotocol + ]; + }; + nativeCheckInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server pytestCheckHook - ]; + ] + ++ passthru.optional-dependencies.dilation; - disabledTests = [ - # Expected: (,) Got: Failure instance: Traceback (failure with no frames): : - "test_welcome" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ # These tests doesn't work within Darwin's sandbox "test_version" "test_text" @@ -92,6 +110,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; license = licenses.mit; From 4fed536c96b7b214600b7eac5ae43c8878442eca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:27 +0200 Subject: [PATCH 280/752] python3Packages.manifestoo-core: 0.11.0 -> 1.0 --- pkgs/development/python-modules/manifestoo-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index 3135ded66ebf..4d23928da1ac 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "0.11.0"; + version = "1.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-ZZAJDOtGcYWm0yS5bMOUdM1Jf+kfurwiLsJwyTYPz/4="; + hash = "sha256-cnEbws2NDxVkLEgLsYw2VQQWP69nC1SVixl9a6vHPmo="; }; nativeBuildInputs = [ From d25392b33741c6e3f58514e186bb623725d64d43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:27 +0200 Subject: [PATCH 281/752] python3Packages.markdown-it-py: 2.2.0 -> 3.0.0 --- pkgs/development/python-modules/markdown-it-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 3330817fb8a4..8b1d4a488298 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "2.2.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qdRU1BxczFDGoIEtl0ZMkKNn4p5tec8YuPt5ZwX5fYM="; + hash = "sha256-cmjLElJA61EysTUFMVY++Kw0pI4wOIXOyCY3To9fpQc="; }; # fix downstrem usage of markdown-it-py[linkify] From 3d4b44454ec7a9c3276142e1c193f432f4aeb059 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:27 +0200 Subject: [PATCH 282/752] python3Packages.mashumaro: 3.9.1 -> 3.10 --- pkgs/development/python-modules/mashumaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 97eeb09d7b8a..f898acad5144 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.9.1"; + version = "3.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VDB6313lvKuLJFOnuzEaiiRLUBOvbdjfowgl3nvG8Y0="; + hash = "sha256-PvMEwIxurDGwYMCmNFThedxDY4vwATHYwMlXkucNuwM="; }; nativeBuildInputs = [ From e5f1eb8aa708a881108b44ceaf7da032b8ccbaaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:27 +0200 Subject: [PATCH 283/752] python3Packages.matplotlib: 3.7.2 -> 3.8.0 --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index e5df4ea7d4ea..4ac081e26a20 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -79,7 +79,7 @@ let in buildPythonPackage rec { - version = "3.7.2"; + version = "3.8.0"; pname = "matplotlib"; format = "pyproject"; @@ -87,7 +87,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-qM25Hd2wRDa9LwmLj99LgTUuaM9NLGdW/MQUeRB2Vps="; + hash = "sha256-34UF4cGdXCwmr/NJeny9PM/C6XBD0eTbPnavo5kWS2k="; }; env.XDG_RUNTIME_DIR = "/tmp"; From 93bfd75a5fcbc3b4136ceb803015bf6f3ad4cf38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:28 +0200 Subject: [PATCH 284/752] python3Packages.maya: 0.3.3 -> 0.6.1 --- pkgs/development/python-modules/maya/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index baa95f7c7de2..707602350544 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "maya"; - version = "0.3.3"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1x88k4irpckvd7jf2yvqjw1s52hjqbxym1r1d928yb3fkj7rvlxs"; + sha256 = "sha256-f1PgbVoSNhPc58Jwy8ZHZDppQlkNunoZ7DYZTQM4w/Q="; }; patches = [ From ba59279e00039daa9f623ffca62d8551a804a319 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:28 +0200 Subject: [PATCH 285/752] python3Packages.md2gemini: 1.9.0 -> 1.9.1 --- pkgs/development/python-modules/md2gemini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index e50c405334c1..c0b6eec7f838 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "md2gemini"; - version = "1.9.0"; + version = "1.9.1"; propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU="; + hash = "sha256-XreDqqzH3UQ+RIBOrvHpaBb7PXcPPptjQx5cjpI+VzQ="; }; meta = with lib; { From 6a4cbb9ba7e161ac37947f753f21364db025cf56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:28 +0200 Subject: [PATCH 286/752] python3Packages.mdit-py-plugins: 0.3.5 -> 0.4.0 --- pkgs/development/python-modules/mdit-py-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 772d9547088b..ad3e8580f11d 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.5"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-U6Qh/1GklW9ZXBXmjPLuxga0JS/Cyga1iorcMEA+WP8="; + hash = "sha256-YBJu0vIOD747DrJLcqiZMHq34+gHdXeGLCw1OxxzIJ0="; }; nativeBuildInputs = [ From e755f15b5340fcf924b4b2efee7ad6dc45fb7660 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:28 +0200 Subject: [PATCH 287/752] python3Packages.mediapy: 1.1.8 -> 1.1.9 --- pkgs/development/python-modules/mediapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index c37aa8f867e5..2c58382a4779 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.8"; + version = "1.1.9"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; + hash = "sha256-WUOxtE0NfXi0fpdasZTqixPhVV2+Refatvf6dgCb0Z8="; }; nativeBuildInputs = [ flit-core ]; From 1788ca7d6474b236f153bf32b719a69fd1800d26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:28 +0200 Subject: [PATCH 288/752] python3Packages.meep: 1.25.0 -> 1.27.0 --- pkgs/development/python-modules/meep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index df0dd2cb1bb1..1e0dbb166839 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -33,13 +33,13 @@ assert !lapack.isILP64; buildPythonPackage rec { pname = "meep"; - version = "1.25.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "NanoComp"; repo = pname; - rev = "v${version}"; - hash = "sha256-4rIz2RXLSWzZbRuv8d4nidOa0ULYc4QHIdaYrGu1WkI="; + rev = "refs/tags/v${version}"; + hash = "sha256-9ha6YPlvq2HUTuEqngFOAJUqCahBi7L7O8qsIMMfbrY="; }; format = "other"; From 8c932a5fbbf577149bd6705e482fd0782efa686e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:28 +0200 Subject: [PATCH 289/752] python3Packages.meraki: 1.36.0 -> 1.37.2 --- pkgs/development/python-modules/meraki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 2a7db95a730b..489c24252f32 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.36.0"; + version = "1.37.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VkXA5eEIEcyPlyI566rwtmIGauxD4ra0Q4ccH4ojc0U="; + hash = "sha256-ffvoOxbYZzxP1cFjPNiuDWMZ2jxw7tnEEISI8t/AvY4="; }; propagatedBuildInputs = [ From c325c5d1d380a2142b256ad1ebdbb1ade3f1f770 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:28 +0200 Subject: [PATCH 290/752] python3Packages.mesa: 1.2.1 -> 2.1.1 --- pkgs/development/python-modules/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 2f441ca71106..fe4e8dd598d5 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "1.2.1"; + version = "2.1.1"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mesa"; inherit version; - hash = "sha256-SJiAuQSnatBnsZpwF3KyBTd1oiNjCpJEepq7t0QjoAQ="; + hash = "sha256-1wyXndB7xQy1jnfHsIqMQgsvmGYUhjDuSBB2M0GcXC4="; }; propagatedBuildInputs = [ From 65713a2d6161c0a035b8be35485a364bdcdb7812 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:29 +0200 Subject: [PATCH 291/752] python3Packages.meson-python: 0.13.1 -> 0.14.0 --- pkgs/development/python-modules/meson-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 4b45ee4e77d3..84031db71b80 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.13.1"; + version = "0.14.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-Y7MXAAFCXEL6TP7a25BRy9KJJf+O7XxA02ugCZ48dhg="; + hash = "sha256-uWhmaQMmVE3+RSWDdTrD9DMTIn6f2UFnAajfkK8hIjQ="; }; nativeBuildInputs = [ From b7b97529d70aa6b86120eac5d0935852b8e8b9f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:29 +0200 Subject: [PATCH 292/752] python3Packages.mido: 1.2.10 -> 1.3.0 --- pkgs/development/python-modules/mido/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 9b9b25ee3768..65702b23c7ad 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -6,15 +6,18 @@ , portmidi , python-rtmidi , pytestCheckHook +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "mido"; - version = "1.2.10"; + version = "1.3.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "17b38a8e4594497b850ec6e78b848eac3661706bfc49d484a36d91335a373499"; + sha256 = "sha256-hCguOs40vKP5hCINstvLmCRc/q+4VCYMAuAAdQ3Khqo="; }; patches = [ @@ -24,6 +27,11 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ python-rtmidi ]; From 1e12502e2bf6ee35977b30c4e10e9c837c359ce1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:29 +0200 Subject: [PATCH 293/752] python3Packages.mistletoe: 1.0.1 -> 1.2.1 --- pkgs/development/python-modules/mistletoe/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index 98844b1e8e51..c95a26eb6e04 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -1,20 +1,21 @@ { lib , fetchPypi , buildPythonPackage +, parameterized , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "mistletoe"; - version = "1.0.1"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sfia+weaGxpULp7ywI3UUKB6K9k1wDyrIsMorXyk2Og="; + hash = "sha256-fQwas3RwR9Fp+fxLkl0cuj9cE+rwuQw2W3LkflnQCgI="; }; pythonImportsCheck = [ @@ -22,6 +23,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + parameterized pytestCheckHook ]; From 85091129cc9c3fdb5f55febad74121fec1c48fa8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:30 +0200 Subject: [PATCH 294/752] python3Packages.mizani: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/mizani/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 8e9975fb223d..467da5dd80af 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.9.2"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6jdQxRqulE5hIzzmdr9kR5gsLrzt0lfJun5blJjTUY0="; + hash = "sha256-JrE12dU0Es4VwUZLcbB8mabifnpxZ7Qt68WJ22HvPm4="; }; nativeBuildInputs = [ From c8897c2bfb3aaeab96ef1db12d28c004373619f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:30 +0200 Subject: [PATCH 295/752] python3Packages.mkdocs: 1.4.2 -> 1.5.2 --- .../python-modules/mkdocs/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index ac3c2c851c63..61c8bdcd13c1 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -14,8 +14,11 @@ , importlib-metadata , jinja2 , markdown +, markupsafe , mergedeep , packaging +, pathspec +, platformdirs , pyyaml , pyyaml-env-tag , watchdog @@ -28,7 +31,7 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.4.2"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -36,29 +39,28 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/NxiKbCd2acYcNe5ww3voM9SGVE2IDqknngqApkDbNs="; + hash = "sha256-9sV1bewsHVJEc2kTyGxDM6SjDTEKEc/HSY6gWBC5tvE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "Markdown >=3.2.1, <3.4" "Markdown" - ''; - nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ click + ghp-import jinja2 markdown + markupsafe mergedeep + packaging + pathspec + platformdirs pyyaml pyyaml-env-tag - ghp-import - importlib-metadata watchdog - packaging + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; nativeCheckInputs = [ From 643c7448eac02c139a4fd7cbda614b2ff657c830 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:30 +0200 Subject: [PATCH 296/752] python3Packages.mkdocs-material: 9.1.13 -> 9.3.1 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 7f45b1ecc7ae..59c433145b02 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.1.13"; + version = "9.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-S+cCNcQR8Y1UGj+4Nfy9Z10N/9PRq13fSeR2YFntxWI="; + hash = "sha256-2Z1U71agXxkYp1OFYd/xInAfN5SVI9FQf39b8DkX10o="; }; nativeBuildInputs = [ From 418d300e74d6f1727f74caf03aa4cadde1375206 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:30 +0200 Subject: [PATCH 297/752] python3Packages.mkdocs-mermaid2-plugin: 1.0.8 -> 1.1.0 --- .../python-modules/mkdocs-mermaid2-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 54499fdbd07d..86037b0c18ec 100644 --- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mkdocs-mermaid2-plugin"; - version = "1.0.8"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fralau"; repo = "mkdocs-mermaid2-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-0h/EMfp6D14ZJcQe3U2r/RQ/VNejOK9bLP6AMNiB0Rc="; + hash = "sha256-9vYLkGUnL+rnmZntcgFzOvXQdf6angb9DRsmrBjnPUY="; }; propagatedBuildInputs = [ From 806c547e2048714c3107462282e6955cb9d7fab1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:31 +0200 Subject: [PATCH 298/752] python3Packages.mkdocs-swagger-ui-tag: 0.6.4 -> 0.6.5 --- .../python-modules/mkdocs-swagger-ui-tag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index ff9326a8ba7d..f28fbf5ff7b6 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-/Spvj3lt7p+ZUbA/7xaQMLCSmHOOsoCRliqaAN+YU3g="; + hash = "sha256-08/nwJC7p5pwSXJicoJbZ8Xsc3yOvxWxzaCIS6aQ9uI="; }; propagatedBuildInputs = [ From 6bb6b3b0ad1d8908dc531190f8880a68f465e196 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:31 +0200 Subject: [PATCH 299/752] python3Packages.mkdocstrings: 0.21.2 -> 0.23.0 --- .../python-modules/mkdocstrings/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index fbbdb91feb2d..d8fb50f586b2 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -8,13 +8,13 @@ , mkdocs-autorefs , pymdown-extensions , pytestCheckHook -, pdm-pep517 +, pdm-backend , pythonOlder }: buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.21.2"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pi0BEe/zhG/V9wh2CO91Cc7Mze93+2tbVo6/2LGQ6Nw="; + hash = "sha256-t7wxm600XgYl1jsqjOpZdWcmqR9qafdKTaz/xDPdDPY="; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -61,6 +61,8 @@ buildPythonPackage rec { disabledTests = [ # Not all requirements are available "test_disabling_plugin" + # Circular dependency on mkdocstrings-python + "test_extended_templates" ]; meta = with lib; { From 0da7c21243b6d0b4aabe0203057b9309ed4130dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:31 +0200 Subject: [PATCH 300/752] python3Packages.mlflow: 2.5.0 -> 2.7.0 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 14f4b76b48cf..41ebc9545cef 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.5.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+ZKujqnHNQI0S69IxOxEeqnvv6iWW8CQho5hYyNPTrA="; + hash = "sha256-3q8PXydgjpUm1p//zKcMgirJDqKQpvPkuz36GyCbARE="; }; postPatch = '' From c3709af8d22390e36203fcc9ec94396051478b3a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:31 +0200 Subject: [PATCH 301/752] python3Packages.mlxtend: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/mlxtend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 6f9294e83b13..0da165ada2b6 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.21.0"; + version = "0.22.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; + hash = "sha256-YLCNLpg2qrdFon0/gdggJd9XovHwRHAdleBFQc18qzE="; }; nativeCheckInputs = [ pytestCheckHook ]; From 49baf38467bccf20d534ffe821cfd4b0ad117a52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:31 +0200 Subject: [PATCH 302/752] python3Packages.mmcv: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/mmcv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index fcc59e417c0c..aeb74102b12a 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -49,7 +49,7 @@ let in buildPythonPackage rec { pname = "mmcv"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -58,7 +58,7 @@ buildPythonPackage rec { owner = "open-mmlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-36PcvoB0bM0VoNb2psURYFo3krmgHG47OufU6PVjHyw="; + hash = "sha256-w40R8ftLQIu66F2EtXFAqvLGxR/6wvxLhxxIdsQLZhI="; }; preConfigure = '' From fb6ac4804821d30d38629324f9be1e5e3575480f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:31 +0200 Subject: [PATCH 303/752] python3Packages.mne-python: 1.3.1 -> 1.5.1 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 46bc25672e18..940c633d4115 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.3.1"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jvrk6m1Cd5ig2LXq6sAIbHDhmtG1gH/7WNAc7oet+tg="; + hash = "sha256-djVQkj8ktIOxe1xmi+XuIvdS1WdDzozgTJNJhWAhuBo="; }; propagatedBuildInputs = [ From 33b265d122d0df7f58c1caf2dc7087e51007b040 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:32 +0200 Subject: [PATCH 304/752] python3Packages.mocket: 3.11.0 -> 3.11.1 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index ff8d2856cc99..49125a286e90 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.11.0"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OIdLP3hHnPZ9MqrHt6G5t2SSO342+jTACgzxM6RjVYM="; + hash = "sha256-sEPLUN9nod4AKYcoCNQZ4FBblUCLCPV1dFOrNC6xDWo="; }; propagatedBuildInputs = [ From 37caca92daf15150ab108f6fd2e26fe3035f1004 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:32 +0200 Subject: [PATCH 305/752] python3Packages.mongoengine: 0.26.0 -> 0.27.0 --- pkgs/development/python-modules/mongoengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index cb0be3e5ea9f..c4b7b7135e2b 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.26.0"; + version = "0.27.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mPz9Nyoyke++e9vBWSKunc9VGHCP8pbmldgKty5HIMA="; + hash = "sha256-UCd7RpsSNDKh3vgVRYrFYWYVLQuK7WI0n/Moukhq5dM="; }; propagatedBuildInputs = [ From f8f9c657e095da9380c4ce9fbc8cdd8cfba0253f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:32 +0200 Subject: [PATCH 306/752] python3Packages.monty: 2023.4.10 -> 2023.9.5 --- pkgs/development/python-modules/monty/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 37107a1b1b52..cebb9c382c7c 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -9,12 +9,13 @@ , pytestCheckHook , pythonOlder , ruamel-yaml +, torch , tqdm }: buildPythonPackage rec { pname = "monty"; - version = "2023.4.10"; + version = "2023.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9of56ErJ03hU+KqxUjR4IiyU4XLJoothSwODlzSWv9Y="; + hash = "sha256-VzOu0gLQcobWQs8uMFzI4CyN+1OVx94VqhJYB+rMpMI="; }; postPatch = '' @@ -43,6 +44,7 @@ buildPythonPackage rec { pydantic pymongo pytestCheckHook + torch ]; pythonImportsCheck = [ From a77006e1357b72ef3dd746e2c50402df582b9d82 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:32 +0200 Subject: [PATCH 307/752] python3Packages.more-itertools: 9.1.0 -> 10.1.0 --- pkgs/development/python-modules/more-itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 86a1b5d3d32d..df3804095665 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "9.1.0"; + version = "10.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0="; + hash = "sha256-Ymw2n6DrN7rAKRvOglmzMv1ZrHkvpUl7WYNzCc1bEUo="; }; nativeBuildInputs = [ From 8eed4800ca48d1b03756f489de0d4ffbc36c1fca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:32 +0200 Subject: [PATCH 308/752] python3Packages.moto: 4.1.3 -> 4.2.2 --- .../development/python-modules/moto/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index c30fc5311d04..73e95a6e1ead 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -33,6 +33,7 @@ # tests , freezegun +, py-partiql-parser , pytestCheckHook , pytest-xdist , sure @@ -40,14 +41,14 @@ buildPythonPackage rec { pname = "moto"; - version = "4.1.3"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yCAMyqlEDC6dqgvV4L12inGdtaLILqjXgvDj+gmjxeI="; + hash = "sha256-7jTEw/U5ANlTGAlGkgyduhJ6SD4u1A5tv5PUri52Dnw="; }; nativeBuildInputs = [ @@ -83,6 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + py-partiql-parser pytestCheckHook sure ]; @@ -105,12 +107,21 @@ buildPythonPackage rec { "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" - "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests" "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" + "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers" + "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers" + "--deselect=tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body" + "--deselect=tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url" + "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" # Disable tests that require docker daemon + "--deselect=tests/test_core/test_docker.py::test_docker_is_running_and_available" "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" "--deselect=tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda" + "--deselect=tests/test_sqs/test_sqs_integration.py" # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" From 12843fd99d69676e043ecfce440975d8a3e85fb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:32 +0200 Subject: [PATCH 309/752] python3Packages.motor: 3.1.1 -> 3.3.1 --- pkgs/development/python-modules/motor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 704c8697ce8d..3e4cf4d574ad 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "motor"; - version = "3.1.1"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; + hash = "sha256-iJz3JiW9cVT3G1rLQwWQXcPfPBRGsIwVLs4gauM+pYo="; }; propagatedBuildInputs = [ From 464ca602e26f3c0a28c54ac40894e6619effcc27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:32 +0200 Subject: [PATCH 310/752] python3Packages.msal: 1.23.0 -> 1.24.0 --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 123008106b8e..31febd203db8 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.23.0"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JcmjOs+EMB+T0f2+nxqcYM04rw1f/9v6N4E4/HvB6Gs="; + hash = "sha256-fS7NrUGl9zuyuBPzBhpM9HySRiEQWo7RN1hvy52Pgn4="; }; propagatedBuildInputs = [ From afb24c280450474257291d009e11e820237a1447 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 311/752] python3Packages.multipledispatch: 0.6.0 -> 1.0.0 --- pkgs/development/python-modules/multipledispatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index ed55b0421cd8..0953e46a5545 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "multipledispatch"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a7ab1451fd0bf9b92cab3edbd7b205622fb767aeefb4fb536c2e3de9e0a38bea"; + sha256 = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; }; # No tests in archive From 7d530cdf0e4bc1a3bc7b7d392d1aedea2c3abcbd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 312/752] python3Packages.multiprocess: 0.70.14 -> 0.70.15 --- pkgs/development/python-modules/multiprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 962a70726adb..647281b8b4ee 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.14"; + version = "0.70.15"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/multiprocess-${version}"; - hash = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; + hash = "sha256-fpyFBrQXy5TwbHmce3qg1RiM8JnH3J5skl3es1IQPiw="; }; propagatedBuildInputs = [ From eb5e5f7b993a02eaf5e08b6aa969a7040ac7a206 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 313/752] python3Packages.munch: 2.5.0 -> 4.0.0 --- pkgs/development/python-modules/munch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index f6ca7c1d6905..0ff62dcbee2b 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "munch"; - version = "2.5.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"; + sha256 = "sha256-VCyxUUYSYyFqTjfD/Zr8Ql/urziqowJc0qmB+ttCIjU="; }; propagatedBuildInputs = [ six pbr ]; From 56495815ddbc2dff509eaa376c53e0818924161a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 314/752] python3Packages.mysqlclient: 2.1.1 -> 2.2.0 --- .../python-modules/mysqlclient/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 7b85fcf54b54..d821adc3bb25 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,11 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, libmysqlclient }: +{ lib +, buildPythonPackage +, fetchPypi +, libmysqlclient +, pkg-config +}: buildPythonPackage rec { pname = "mysqlclient"; - version = "2.1.1"; + version = "2.2.0"; nativeBuildInputs = [ - libmysqlclient + pkg-config ]; buildInputs = [ @@ -17,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I="; + hash = "sha256-BDaERfnEh9irt6h449I+kj5gcsBKbDIPng3IqC77oU4="; }; meta = with lib; { From 103f6d45c28bf56f98f89bbf9078d7c92322957a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 315/752] python3Packages.myst-docutils: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/myst-docutils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index 3a51d240c5ae..66c07489dfaa 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,12 +13,13 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-fbh97Z/5TnnMHj2bGZ4UvJkPpYtrTTcFOgpLWgHUYk0="; + pname = "myst_docutils"; + inherit version; + hash = "sha256-WmmPEg+bINmeId+pjR6bbp8qzjfSXfEel+sQEdPIu8Y="; }; nativeBuildInputs = [ From d7cb2e0029a391dc86205337e66a7098d4c2fd6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 316/752] python3Packages.myst-parser: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/myst-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index f2beeb85036f..0e6b2204ddbb 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-parser"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Kewd6/4yawpRuyCe8Na0BGUMo59tr2fc97VlGbVJ8mI="; + hash = "sha256-1BW7Z+0rs5Up+VZ3vDygnhLzE9Y2BqEMnTnflboweu0="; }; nativeBuildInputs = [ flit-core ]; From 2e9d671497ef5e2f8cac6d78a1f0f6c93fc1dfbc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 317/752] python3Packages.napalm: 3.4.1 -> 4.1.0 --- .../python-modules/napalm/default.nix | 88 +++++++++++-------- 1 file changed, 53 insertions(+), 35 deletions(-) diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index eabbadc1d614..9b835d52737a 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -1,58 +1,76 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi -, paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko -, junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock -, pythonOlder, invoke }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, setuptools +, cffi + +# dependencies +, future +, jinja2 +, junos-eznc +, lxml +, ncclient +, netaddr +, netmiko +, netutils +, paramiko +, pyeapi +, pyyaml +, requests +, scp +, textfsm +, ttp +, ttp-templates +, typing-extensions + +# tests +, pytestCheckHook +, ddt +, mock + }: buildPythonPackage rec { pname = "napalm"; - version = "3.4.1"; - format = "setuptools"; + version = "4.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "napalm-automation"; repo = "napalm"; - rev = version; - hash = "sha256-TNWRJtc6+VS6wgJGGvCPDoFQmOKQAyXdjFQo9bPJ2F8="; + rev = "refs/tags/${version}"; + hash = "sha256-JqjuYMJcP58UMn1pPYg7x8KpqCKQUs19Ng9HbI2iX38="; }; - patches = [ - # netmiko 4.0.0 support - (fetchpatch{ - url = "https://github.com/napalm-automation/napalm/commit/4b8cc85db3236099a04f742cf71773e74d9dd70e.patch"; - excludes = [ "requirements.txt" ]; - hash = "sha256-DBKp+wiKd+/j2xAqaQL3UCcGQd6wnWcNTsNXBBt9c98="; - }) - (fetchpatch{ - url = "https://github.com/napalm-automation/napalm/commit/4a8b5b1823335dd79aa5269c038a1f08ecd35cdd.patch"; - hash = "sha256-uiou/rzmnFf4wAvXwmUsGJx99GeHWKJB2JrMM1kLakM="; - }) + nativeBuildInputs = [ + setuptools ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "netmiko>=3.3.0,<4.0.0" "netmiko" - ''; - propagatedBuildInputs = [ cffi - paramiko - requests future - textfsm - invoke jinja2 - netaddr - pyyaml - pyeapi - netmiko junos-eznc - ciscoconfparse - scp - setuptools lxml ncclient + netaddr + netmiko + # breaks infinite recursion + (netutils.override { napalm = null; }) + paramiko + pyeapi + pyyaml + requests + scp + setuptools + textfsm + ttp + ttp-templates + typing-extensions ]; nativeCheckInputs = [ pytestCheckHook mock ddt ]; From f1f45b9324c37b3da24b171410584cf17e38f887 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:33 +0200 Subject: [PATCH 318/752] python3Packages.napari-npe2: 0.7.0 -> 0.7.2 --- pkgs/development/python-modules/napari-npe2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index fc81042527b8..61cf2978a8e5 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.7.0"; + version = "0.7.2"; format = "pyproject"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "napari"; repo = "npe2"; rev = "refs/tags/v${version}"; - hash = "sha256-6kHyz7jMZO3385XaNJ4zFBoQiU1SIRyYZsUeMH5EBXo="; + hash = "sha256-PjoLocNTkcAnBNRbPi+MZqZtQ2bjWPIUVz0+k8nIn2A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 2344fcf4237908535e3c5bbcaa26ecda1a9bc16b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:34 +0200 Subject: [PATCH 319/752] python3Packages.nbclient: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 6c386ee01854..745de65f4b2e 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -19,7 +19,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.7.2"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2H6Oi1tK/GrtfMTR1j12tZdRzQkFUxXzMSpfCtGPyWE="; + hash = "sha256-uBCYmrl/Zfw58hd12z20jLVwGSPv+M3fMo1mfV2GO/M="; }; nativeBuildInputs = [ From 5c69a5af18c79590391574e31978196d4e681fa5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:34 +0200 Subject: [PATCH 320/752] python3Packages.nbconvert: 7.7.3 -> 7.8.0 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index e7fb3dfba472..68d3de53cb3a 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -33,7 +33,7 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.7.3"; + version = "7.8.0"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-SlmWv1880WqgQxiXuhqkxkhCwgefQ0s9xrjEslLvM1U="; + hash = "sha256-9bwVoSR+FN1Bzu8MCjvHACDgFldusFeNpi8cW0+VBHk="; }; # Add $out/share/jupyter to the list of paths that are used to search for From 71dd07545349ddc55e98cbb8c09d4552bb8cad45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:34 +0200 Subject: [PATCH 321/752] python3Packages.nbformat: 5.9.1 -> 5.9.2 --- pkgs/development/python-modules/nbformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 354a937a6105..290663e78a81 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.9.1"; + version = "5.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-On9S0EBjnL2KOJAhjIsP+5MhFYjFdEbJAJXjK6WIG10="; + hash = "sha256-X5i1uhmX3/F1534MF9XBCpbq7Sy9HeNTPR/DXV4REZI="; }; nativeBuildInputs = [ From 1cf1e17786d7b57cf885380f266a1888e8edbb43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:34 +0200 Subject: [PATCH 322/752] python3Packages.netmiko: 4.1.2 -> 4.2.0 --- pkgs/development/python-modules/netmiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 7258acb2aad1..513c3ade941f 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "4.1.2"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-9e3iooZw09/TRwBhRoZl+A+bSQbtIOaw+02eHJvmevw="; + hash = "sha256-et3m/j6mMzYij0moY2UMLYP7DmgODw0Vi1sPsExBAOE="; }; buildInputs = [ setuptools ]; From 8940eebc57c072baa2ddb4376ca8f39b89af4567 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:34 +0200 Subject: [PATCH 323/752] python3Packages.networkx: 3.0 -> 3.1 --- pkgs/development/python-modules/networkx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 5342b12dc8b2..b793bc57bf0e 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.0"; + version = "3.1"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mpmSNFNTYYrpgznCtj2CAcOBwpRPOKKrSctFpMZn5BI="; + hash = "sha256-3jRjNUCPhN4Orab/n6+v/5vNoR8KDfqpMRM967FGq2E="; }; propagatedBuildInputs = [ decorator setuptools ]; From d802c42feb494570a1673b39b798a1be6ccef58d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:34 +0200 Subject: [PATCH 324/752] python3Packages.nilearn: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 5a79242daa06..921af46b15d5 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - hash = "sha256-zH8QaOA4B2Un6tG9NjQ2+I9ejSHou1ezI7MLkm/HVTo="; + hash = "sha256-koo2Tn7XfRXQK38icZfqfHj0Ty/ngP61VdbXz5Iy+EY="; }; nativeCheckInputs = [ pytestCheckHook ]; From 293e81dedf047c1eab4e8eb963cbbbb1e66f947f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:35 +0200 Subject: [PATCH 325/752] python3Packages.nose2: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/nose2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 648d954be7d0..81fcdce60d1e 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lW55ub1VjuCLYgDAWtLHZGW344YMDAU3aGCJKFwyARM="; + hash = "sha256-V8aK1nbvS4i1BpSTfrUvSUOqHKJhB0tJCbbhYwRrRvA="; }; propagatedBuildInputs = [ From 699260c8d92bb243ff338f286dd7e164d03a72a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:35 +0200 Subject: [PATCH 326/752] python3Packages.notebook: 7.0.2 -> 7.0.3 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 95f387653d97..0532d2472a7f 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.0.2"; + version = "7.0.3"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1w1qB0GMgpvV9UM3zpk7cQUmHZAm+dP+aOm4qhog2po="; + hash = "sha256-B/PFBi/Q5uaYZEN6A0erxIXZkaroepLEfWWWmfVxtyk="; }; postPatch = '' From 150e5c522149654cbda416634e743fea69625a50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:35 +0200 Subject: [PATCH 327/752] python3Packages.notebook-shim: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/notebook-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 985cc63158e6..3bdb11416863 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "notebook-shim"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; rev = "refs/tags/v${version}"; - hash = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; + hash = "sha256-eAYZuNYqOMKC6joDbbKk4Q4nrfdbO7b+yZeSvMdWWrI="; }; nativeBuildInputs = [ hatchling ]; From 4bc8bd1da7c1f19fb3abcad8b1901d479c1c48ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:35 +0200 Subject: [PATCH 328/752] python3Packages.ntc-templates: 3.2.0 -> 3.5.0 --- pkgs/development/python-modules/ntc-templates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index d668ba721718..1347ea5f5a62 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "3.2.0"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY="; + hash = "sha256-FhKMDSAW+MifAy2EnHePbSfY56rdK1SfOe85bFte6ps="; }; nativeBuildInputs = [ From 53686257b4362713dcc14d2edeb852422c573c8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:35 +0200 Subject: [PATCH 329/752] python3Packages.numexpr: 2.8.4 -> 2.8.6 --- pkgs/development/python-modules/numexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 63d95622c061..6acc3e53f4e4 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.4"; + version = "2.8.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1UMlN0GNGGkbkRXWFdbaoX7oJ1uu8+3xr7v4vGmAYUc="; + hash = "sha256-Yzb426P0VuQaT/w8l+tj2JxzWJ/24XBxQSJLkwJjJg0="; }; nativeBuildInputs = [ From 24b1da5b5e5fe37a071df8e89af89197679f0404 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:35 +0200 Subject: [PATCH 330/752] python3Packages.numpy: 1.25.1 -> 1.25.2 https://github.com/numpy/numpy/releases/tag/v1.25.2 --- pkgs/development/python-modules/numpy/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index c1cd59bc62ed..e571349f9ffb 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchPypi -, fetchpatch , python , buildPythonPackage , gfortran @@ -41,24 +40,17 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.25.1"; + version = "1.25.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-mjqfOmFIDMCGEXtCaovYaGnCE/xAcuYG8BxOS2brkr8="; + hash = "sha256-/WCOGcjXxVAh3/1Dv+VJL6uMwQXMiYb4E/jDwEizh2A="; }; patches = [ - # f2py.f90mod_rules generates code with invalid function pointer conversions, which are - # clang 16 makes an error by default. - (fetchpatch { - url = "https://github.com/numpy/numpy/commit/609fee4324f3521d81a3454f5fcc33abb0d3761e.patch"; - hash = "sha256-6Dbmf/RWvQJPTIjvchVaywHGcKCsgap/0wAp5WswuCo="; - }) - # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. From 2f2e86b28018b00f9d4450c5e8585a23c3cd6189 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:36 +0200 Subject: [PATCH 331/752] python3Packages.nutils: 7.3 -> 8.3 --- pkgs/development/python-modules/nutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index da52ca153e48..421131e7f8e2 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "7.3"; + version = "8.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-3VtQFnR8vihxoIyRkbE1a1Rs8Np3/79PWNKReTBZDg8="; + hash = "sha256-6VvzUKKUB5SkmvC7PFPqGayc51t3PTMPwrxgZI5+jHA="; }; nativeBuildInputs = [ From aa3b6af7bc48df3d046cbf9dc92a48dcad4d8c89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:36 +0200 Subject: [PATCH 332/752] python3Packages.okta: 2.9.2 -> 2.9.3 --- pkgs/development/python-modules/okta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index f2e19e4a6340..d6068b59e043 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.2"; + version = "2.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kbzqriybzN/86vov3Q+kH2lj9plK1GzWPlc/Nc/nWF0="; + hash = "sha256-mOKVCRp8cLY7p0AVbvphWdB3II6eB6HlN8i1HrVUH+o="; }; propagatedBuildInputs = [ From 6816245472c4fc259d9739e8765469eefe639067 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:36 +0200 Subject: [PATCH 333/752] python3Packages.onnxconverter-common: 1.13.0 -> 1.14.0 --- .../python-modules/onnxconverter-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix index d45d82da0e3a..e61dcd587386 100644 --- a/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "onnxconverter-common"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "onnxconverter-common"; rev = "refs/tags/v${version}"; - hash = "sha256-VT9ly0d0Yhw1J6C521oUyaCx4WtFSdpyk8EdIKlre3c="; + hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o="; }; propagatedBuildInputs = [ From 4e6b2c6e7c01d5f0a5f3c63d4ca86f4f620f966f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:36 +0200 Subject: [PATCH 334/752] python3Packages.openaiauth: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/openaiauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index 68eead616b47..da10f6ffbe55 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "openaiauth"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "OpenAIAuth"; - hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; + hash = "sha256-9SrptiheiM5s9YI6Ht68ahDGMFADWfBQgAWUBY3EEJ8="; }; propagatedBuildInputs = [ From d367eb411a6c11b4b0c38c12aa7421f1501a2874 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:36 +0200 Subject: [PATCH 335/752] python3Packages.openapi-core: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/openapi-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index b9593b0e13c1..282c659291a4 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-2OcGaZQwzgxcwrXinmJjFc91620Ri0O79c8WZWfDdlQ="; + hash = "sha256-8zD4SDGH7Pcu54CcBTJ9Q2sbYfWP4OyNh5STatZ7pAk="; }; postPatch = '' From 1b267740058aa7173c8eaa1bc662c67dc0a07b5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:36 +0200 Subject: [PATCH 336/752] python3Packages.openllm-core: 0.2.27 -> 0.3.4 --- pkgs/development/python-modules/openllm-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index 3f2c80cf0a57..e69054b1cbcd 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "openllm-core"; - version = "0.2.27"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-R69Qsx9360pJx+7oyhHdeAXUjTAdevPmaBl9gj+AA8U="; + hash = "sha256-uRXsIcsgu+EAxzUGKt9+PIoO1kvo6rWT569D5qXFrAQ="; }; sourceRoot = "source/openllm-core"; From 4e488ac8d937571eaa42d0a7ad2474b1bde5fd24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:37 +0200 Subject: [PATCH 337/752] python3Packages.openstackdocstheme: 3.0.1 -> 3.2.0 --- .../development/python-modules/openstackdocstheme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 2d2fbc0dbdd8..00b2128db2aa 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "openstackdocstheme"; - version = "3.0.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-yB1CdOqWV7hEfUYdtqQ/fd4sNfy7Sp7YJbRQhK5egLk="; + hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; }; postPatch = '' From ed4d6cfc1715a7bb40335cc1e3686bddbf485431 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:37 +0200 Subject: [PATCH 338/752] python3Packages.opentelemetry-api: 1.18.0 -> 1.20.0 --- .../python-modules/opentelemetry-api/default.nix | 6 +++--- .../opentelemetry-exporter-otlp-proto-common/default.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 1ccb00617ac0..289784d4ac41 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,15 +14,15 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.18.0"; + version = "1.20.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; - rev = "refs/tags/v${self.version}"; - hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-tOg3G6BjHInY5TFYyS7/JA4mQajeP0b1QjrZBGqiqnM="; }; sourceRoot = "${src.name}/opentelemetry-api"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 71c742c0ba2a..8a43e9b4cda4 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , hatchling +, backoff , opentelemetry-api , opentelemetry-proto , opentelemetry-sdk @@ -23,6 +24,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ + backoff opentelemetry-sdk opentelemetry-proto ]; From 74303025237e4df97ba3597b089c1f1c596b9a71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:37 +0200 Subject: [PATCH 339/752] python3Packages.opentelemetry-instrumentation: 0.39b0 -> 1.16.0 --- .../python-modules/opentelemetry-instrumentation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 331a5e864374..4ee758ea564d 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.39b0"; + version = "1.16.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; + hash = "sha256-6tGQjPBej2zv5yJN0S46le3kyD7q3TELYyDmyxlp5Wo="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; From 011415fddcd0a606c2bff3e4f1d6c623ee2d0aa4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:37 +0200 Subject: [PATCH 340/752] python3Packages.optimum: 1.12.0 -> 1.13.1 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 0c8a9a738aa1..2742f9aab8bf 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.12.0"; + version = "1.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-/Z7Gh8pAa5z96X7rdcuq6kxtpF53EFGIYOu1ft8w+XM="; + hash = "sha256-heTyGgHC9tfS0hFv83sdxVApcXa63GQLG9Nwgi30GFo="; }; propagatedBuildInputs = [ From d42a03569d0cad00f5279fbeb09d9a88d6c9a991 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:37 +0200 Subject: [PATCH 341/752] python3Packages.orange3: 3.35.0 -> 3.36.0 --- pkgs/development/python-modules/orange3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index cff4a603c846..fa1204ffa733 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -44,7 +44,7 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.35.0"; + version = "3.36.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ let owner = "biolab"; repo = "orange3"; rev = "refs/tags/${version}"; - hash = "sha256-dj/Z4uOjA4nidd45dnHZDyHZP6Fy/MGC8asqOPV7U7A="; + hash = "sha256-0HIhBdufc46cTOSXa0koelTfZd5sY7QantmwGWggoCU="; }; postPatch = '' From 96b5b37fc8bb8bbace4f33284a3973863c5c0e2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:37 +0200 Subject: [PATCH 342/752] python3Packages.orange-canvas-core: 0.1.31 -> 0.1.32 --- .../python-modules/orange-canvas-core/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 2673151654a3..9c5381171e2f 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -8,22 +8,21 @@ , docutils , filelock , lockfile +, numpy , pytest-qt , pytestCheckHook -, python , qasync , qt5 -, writeShellScript -, xvfb-run +, requests-cache }: buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.31"; + version = "0.1.32"; src = fetchPypi { inherit pname version; - hash = "sha256-kqh/c0pEWFLqf1BMD79li1MqLpH/4xrdTH9+/7YO/tg="; + hash = "sha256-UE5LHsG7BrJqC0rNRtUUqmXSPsYRVqodiU5DsB/6ECo="; }; propagatedBuildInputs = [ @@ -34,7 +33,9 @@ buildPythonPackage rec { docutils filelock lockfile + numpy qasync + requests-cache ]; pythonImportsCheck = [ "orangecanvas" ]; From c7a153e3c0f2d178efbfe1812f231a039e96e714 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:38 +0200 Subject: [PATCH 343/752] python3Packages.orjson: 3.9.4 -> 3.9.7 --- pkgs/development/python-modules/orjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 934b65298f4e..5297cb920d33 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.9.4"; + version = "3.9.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WS4qynQmJIVdDf0sYK/HFVQ+F5nfoJwx/zzmaL6YTRc="; + hash = "sha256-VkCwvksUtgvFLSMy2fHLxrpZjcWYhincSM4fX/Gwl0I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-hGUXPTiKvKygxQzxXAO/+bD34eLnpkhQ7r/g27E+d4I="; + hash = "sha256-IwWbd7LE/t1UEo/bdC0bXl2K8hYyvDPbyHLBIurfb/8="; }; nativeBuildInputs = [ From 68125e3a08ef9f9985e8079f1ac60b40716f4bf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:38 +0200 Subject: [PATCH 344/752] python3Packages.ormar: 0.12.1 -> 0.12.2 --- pkgs/development/python-modules/ormar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 90b56b3cd4d7..e50d9b2788fa 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.12.1"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7d0vmYDN1EjzNWmylb/As4ywo8YYzQ88UwigIsVnwMM="; + hash = "sha256-Yd5ex0bcy61zq5Sn2dKeb98s/CMxUWnyGx6jFWQ3RUs="; }; pythonRelaxDeps = [ From 55b91dc2198badc28ebbfd5e7331e356613610d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:38 +0200 Subject: [PATCH 345/752] python3Packages.oslo-config: 9.1.1 -> 9.2.0 --- pkgs/development/python-modules/oslo-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index b70de2a16e4f..50a544c1d7fb 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.1.1"; + version = "9.2.0"; src = fetchPypi { pname = "oslo.config"; inherit version; - hash = "sha256-sHZUtT2HeSro5zmWKtcpxSnJk4oRjYkezp7jHVlxa8k="; + hash = "sha256-/+sBymWmA9VSWQXxqIozGb4Jzixqw3bEMSquwoMJWHg="; }; postPatch = '' From 6b6d93745e4274e685e0c976f7ac02fcd64aa11e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:38 +0200 Subject: [PATCH 346/752] python3Packages.oslo-db: 12.3.1 -> 14.0.0 --- pkgs/development/python-modules/oslo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 659d8b816bb9..a8052d4211c0 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "12.3.1"; + version = "14.0.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-Gd7FAkDwj7q1rnZzVOtZF1oUdz8CcdeDpX/KxJ5KbaE="; + hash = "sha256-nAipzYOOv/rSHrMBL64AKg93v5Vpb6RNBbG2OiJ+n8E="; }; nativeBuildInputs = [ pbr ]; From d875c83d757682f24dc14fb7eedbeec8e3c7a34c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:38 +0200 Subject: [PATCH 347/752] python3Packages.oslo-i18n: 6.0.0 -> 6.1.0 --- pkgs/development/python-modules/oslo-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index bfa608448146..e4d0f9f75d93 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { pname = "oslo.i18n"; inherit version; - hash = "sha256-7RBoa3X3xgeCUXemaRVfTiWc459hQ6N19jWbvKpKNc0="; + hash = "sha256-4rgp8gW/HrYgR1bMNAJ9EZSUti0nH+7oYL+BbKegfq0="; }; postPatch = '' From d538fc80a9cb7cdec74049be9b33433dd121f9e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:38 +0200 Subject: [PATCH 348/752] python3Packages.oslo-utils: 6.1.0 -> 6.2.1 --- pkgs/development/python-modules/oslo-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index f076574bfd60..0d55f870e5fa 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.1.0"; + version = "6.2.1"; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; + hash = "sha256-EyK6BfoP88Gor8cn/PlF31qoLWWEcn0uBK8Di1roQkQ="; }; postPatch = '' From c3dc44e40726ab21071ca058061957c42fc780de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:39 +0200 Subject: [PATCH 349/752] python3Packages.paddle2onnx: 1.0.6 -> 1.0.9 --- pkgs/development/python-modules/paddle2onnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix index 171940104444..a3853022f0a6 100644 --- a/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/pkgs/development/python-modules/paddle2onnx/default.nix @@ -9,7 +9,7 @@ }: let pname = "paddle2onnx"; - version = "1.0.6"; + version = "1.0.9"; format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; src = fetchPypi { @@ -18,7 +18,7 @@ let python = pyShortVersion; abi = pyShortVersion; platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; - hash = "sha256-qHy6+RKh/gjy1mBmIj+1ENcHuIERkOeM6rrd5GNfX+Q="; + hash = "sha256-QnXfcbfzRt1sSagnDLP3ZRLH3KNqK76L+KvifTU6MJQ="; }; in buildPythonPackage { From c14288b67ea966a6583094eb9053b1e0b6b3196d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:39 +0200 Subject: [PATCH 350/752] python3Packages.palettable: 3.3.2 -> 3.3.3 --- .../python-modules/palettable/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index bd13c288894a..2f7cb7138c4c 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -2,19 +2,23 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "palettable"; - version = "3.3.2"; - - format = "setuptools"; + version = "3.3.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aoZ8Qlov8ojqtDVr7ewA3gBt7jbJmmFHwuGwXeeJrJ8="; + sha256 = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From c6a8c743dbbf061702a16bd4555e741bcad5b1b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:39 +0200 Subject: [PATCH 351/752] python3Packages.pandas: 2.0.3 -> 2.1.0 https://pandas.pydata.org/pandas-docs/version/2.1.0/whatsnew/v2.1.0.html --- .../python-modules/pandas/default.nix | 45 +++++++++++++------ .../python-modules/pandas/installer-fix.patch | 25 +++++++++++ 2 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/pandas/installer-fix.patch diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index e64f61e0ddec..147366a2c514 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -1,13 +1,15 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder # build-system , cython +, meson-python +, meson , oldest-supported-numpy -, setuptools +, pkg-config , versioneer , wheel @@ -63,24 +65,42 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.0.3"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-wC83Kojg0X820wk6ZExzz8F4jodqfEvLQCCndRLiBDw="; + src = fetchFromGitHub { + owner = "pandas-dev"; + repo = "pandas"; + rev = "refs/tags/v${version}"; + hash = "sha256-QwMW/qc1n51DaVhUnIaG0bdOvDitvvPh6ftoDawiYlc="; }; + patches = [ + # https://github.com/pandas-dev/pandas/issues/54888#issuecomment-1701186809 + ./installer-fix.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ + --replace "meson==1.0.1" "meson>=1.0.1" + ''; + nativeBuildInputs = [ - setuptools cython + meson-python + meson numpy - oldest-supported-numpy + pkg-config versioneer wheel - ] ++ versioneer.optional-dependencies.toml; + ] + ++ versioneer.optional-dependencies.toml + ++ lib.optionals (pythonOlder "3.12") [ + oldest-supported-numpy + ]; enableParallelBuilding = true; @@ -193,10 +213,9 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh - "--skip-db" - "--skip-slow" - "--skip-network" - "-m" "'not single_cpu and not slow_arm'" + "-m" "'not single_cpu and not slow and not network and not db and not slow_arm'" + # https://github.com/pandas-dev/pandas/issues/54907 + "--no-strict-data-files" "--numprocesses" "4" ]; diff --git a/pkgs/development/python-modules/pandas/installer-fix.patch b/pkgs/development/python-modules/pandas/installer-fix.patch new file mode 100644 index 000000000000..b1659c9dbb3d --- /dev/null +++ b/pkgs/development/python-modules/pandas/installer-fix.patch @@ -0,0 +1,25 @@ +diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build +index f302c649bc..ddce9ea2d6 100644 +--- a/pandas/_libs/meson.build ++++ b/pandas/_libs/meson.build +@@ -113,8 +113,4 @@ foreach ext_name, ext_dict : libs_sources + ) + endforeach + +-py.install_sources('__init__.py', +- pure: false, +- subdir: 'pandas/_libs') +- + subdir('window') +diff --git a/pandas/_libs/tslibs/meson.build b/pandas/_libs/tslibs/meson.build +index 14d2eef46d..a862345c3a 100644 +--- a/pandas/_libs/tslibs/meson.build ++++ b/pandas/_libs/tslibs/meson.build +@@ -30,7 +30,3 @@ foreach ext_name, ext_dict : tslibs_sources + install: true + ) + endforeach +- +-py.install_sources('__init__.py', +- pure: false, +- subdir: 'pandas/_libs/tslibs') From a891171586f2f336bc5b227a29d7a5ef69b0ec70 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:39 +0200 Subject: [PATCH 352/752] python3Packages.parametrize-from-file: 0.17.0 -> 0.18.0 --- .../parametrize-from-file/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 4306579bc517..79a073af9955 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -1,10 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , flit-core , pytestCheckHook -, coveralls , numpy , decopatch , more-itertools @@ -16,23 +14,15 @@ buildPythonPackage rec { pname = "parametrize-from-file"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "parametrize_from_file"; - hash = "sha256-suxQht9YS+8G0RXCTuEahaI60daBda7gpncLmwySIbE="; + hash = "sha256-mYE8J7XWlvCS2H3kt0bB8dyPHFDqmW8NiH9UCrNccAU="; }; - patches = [ - (fetchpatch { - name = "replace contextlib2-with-contextlib.patch"; - url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch"; - hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ="; - }) - ]; - # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml From 79a590e17142d1db0f4a5d9c9c009c6d0a8cb333 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:39 +0200 Subject: [PATCH 353/752] python3Packages.paramiko: 2.11.0 -> 3.3.1 --- pkgs/development/python-modules/paramiko/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 278556fe4885..c5c01dc8fa65 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -5,23 +5,23 @@ , fetchpatch , fetchPypi , gssapi +, icecream , invoke , mock , pyasn1 , pynacl -, pytest-relaxed , pytestCheckHook , six }: buildPythonPackage rec { pname = "paramiko"; - version = "2.11.0"; + version = "3.3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AD5r7nwDTCH7sFG/g9wKnuQQYgTdPFMFTHFFLMTsOTg="; + hash = "sha256-ajd3qWGshtvvN1xfW41QAUoaltD9fwVKQ7yIATSw/3c="; }; patches = [ @@ -31,11 +31,6 @@ buildPythonPackage rec { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) - (fetchpatch { - name = "fix-sftp-tests.patch"; - url = "https://github.com/paramiko/paramiko/commit/47cfed55575c21ac558e6d00a4ab1814406be651.patch"; - hash = "sha256-H3nKT8+4CTEDoiqnlhFfuKnc/65GGfwwAm9H2lwrlK8="; - }) ]; propagatedBuildInputs = [ @@ -52,6 +47,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + icecream mock pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); From 00c36bd35274e0fe2f69461fed698c890c133dea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:39 +0200 Subject: [PATCH 354/752] python3Packages.parse: 1.19.0 -> 1.19.1 --- .../python-modules/parse/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 1ce34bfaab68..7956a2971b51 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,18 +1,27 @@ -{ lib, fetchPypi -, buildPythonPackage, python +{ lib, fetchFromGitHub +, buildPythonPackage +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "parse"; - version = "1.19.0"; + version = "1.19.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"; + src = fetchFromGitHub { + owner = "r1chardj0n3s"; + repo = "parse"; + rev = "refs/tags/${version}"; + hash = "sha256-f08SlkGnwhSh0ajTKFqBAGGFvLj8nWBZVb6uClbRaP4="; }; - checkPhase = '' - ${python.interpreter} test_parse.py - ''; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/r1chardj0n3s/parse"; From d2a03fdd01af5a45c9b76305c947553d59de3bb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 355/752] python3Packages.parsedmarc: 8.4.2 -> 8.6.1 --- pkgs/development/python-modules/parsedmarc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 5002f564094c..912768621d10 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -41,7 +41,7 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.4.2"; + version = "8.6.1"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-6dP9zQI0jYiE+lUhmFBNp8Sv9povm9Pa4R4TuzAmEQk="; + hash = "sha256-lnIhXkBodvLWVeqiwFcnU4M53zwWDmtFz+9TThQY63I="; }; postPatch = '' From 8585dfa30c3ebdf98dac1af0a74a778f86417242 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 356/752] python3Packages.parse-type: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/parse-type/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index e795ab3d49d3..e7ebfb5c63e4 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "parse-type"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jenisys"; repo = "parse_type"; - rev = "v${version}"; - hash = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc="; + rev = "refs/tags/v${version}"; + hash = "sha256-dunvcSi+nN5VruvRUPIEpkyUsmeS+kIYDfS8ibDR96s="; }; propagatedBuildInputs = [ From eaba702539f9447cd749218412130c0a9f637b1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 357/752] python3Packages.partd: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/partd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index d633b8dfceb1..52e76646875e 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "partd"; - version = "1.3.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; + hash = "sha256-qg/zXbvMgHrjdNtWMy9MGzm0b2e/KXX1FR4LQYau0NU="; }; nativeCheckInputs = [ pytest ]; From afcc2b8ffa57b8cb20b0fbc02dec4225630b216e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 358/752] python3Packages.path: 16.6.0 -> 16.7.1 --- pkgs/development/python-modules/path/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index 93f1fbcabe55..ca99357c7610 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "path"; - version = "16.6.0"; + version = "16.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vqOBbh1U9OM6rHjSAxoLDtL5XmnbhbRdUfF9+XBx2mk="; + hash = "sha256-K0d/WIcDPzy+oc/YVT7mpqSY6yVAoZ9KoIKCKq3Oowo="; }; nativeBuildInputs = [ From 8cc53dcfa73731e6e3d77f027ede8fc145e919ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 359/752] python3Packages.pathos: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/pathos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 6f60593054b1..febd24ef5768 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/pathos-${version}"; - hash = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; + hash = "sha256-uQv1t3TRbvoQv86wNOdc5k0cgKt9kvnw5/DGbbbE46w="; }; propagatedBuildInputs = [ From 7714bc7da379d615bc34edfc55d0a770efabbe05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 360/752] python3Packages.pathspec: 0.11.0 -> 0.11.2 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index b43bcdb2382b..5b97cea17b79 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.11.0"; + version = "0.11.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ZNM41OCRTpHBeSMh5pB7Wlk/GrGFHef8JpVXohsw67w="; + hash = "sha256-4NjQrC8S2mGVbrIwa2n5RptC9N6w88tu1HuczpmWztM="; }; nativeBuildInputs = [ From 2bcd5a32f6cb369861a953be8d1b7474b389c995 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 361/752] python3Packages.pcpp: 1.21 -> 1.30 --- pkgs/development/python-modules/pcpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index 704e979c2caa..0985d32afb55 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pcpp"; - version = "1.21"; + version = "1.30"; src = fetchFromGitHub { owner = "ned14"; repo = "pcpp"; - rev = "v${version}"; - sha256 = "0k52qyxzdngdhyn4sya2qn1w1a4ll0mcla4h4gb1v91fk4lw25dm"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; fetchSubmodules = true; }; From df2b75ab6ed66527b7adb2271c397372b8ab1993 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:40 +0200 Subject: [PATCH 362/752] python3Packages.pdfplumber: 0.9.0 -> 0.10.2 --- pkgs/development/python-modules/pdfplumber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index a43eaae34a80..37809324e275 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.9.0"; + version = "0.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-cGTn1JTSp1YvksemjlvvToZcVauZ7GKINiNmG5f4zKg="; + hash = "sha256-nuHHEVOYm2/PkXIs9Ze5y5xyJMLkxqp3q3u4gV8Ks80="; }; postPatch = '' From 89df157e3835bc19e574bbefe0cbea6f91d33090 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:41 +0200 Subject: [PATCH 363/752] python3Packages.peewee: 3.16.2 -> 3.16.3 --- pkgs/development/python-modules/peewee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 7f494813a19a..ca5d4f45677c 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.16.2"; + version = "3.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eHTbVhgVqxMR3ZuaC6FPyYbxRpRBi53EfDqERpPBjVQ="; + hash = "sha256-QeJaGTKZHmzN+J8uUGXQJXCTINX7iP30u+s+GDP/kpQ="; }; buildInputs = [ From beb4463373ad278a8617b92aad0e0ee20efb5b54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:41 +0200 Subject: [PATCH 364/752] python3Packages.pg8000: 1.29.4 -> 1.30.1 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 9e0815ddfc71..ee580829bbe0 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.29.4"; + version = "1.30.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dtKqF1ejC8ceAwfa4Yw3TjNqaRI+awRuIGqWYR+iozA="; + hash = "sha256-wEKA5mocz7UWbbXBZBZMLhuPYq+u3/0hFFGlMproSik="; }; nativeBuildInputs = [ From 4c6f3a9d1afe8c7350b3a43c15e707cfe2bb380e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:41 +0200 Subject: [PATCH 365/752] python3Packages.plaster-pastedeploy: 0.6 -> 1.0.1 --- .../plaster-pastedeploy/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index ad1fa2d68fd1..9e6263351daa 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , plaster , pastedeploy , pytestCheckHook @@ -9,22 +8,14 @@ buildPythonPackage rec { pname = "plaster-pastedeploy"; - version = "0.6"; + version = "1.0.1"; src = fetchPypi { - inherit pname version; - sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; + pname = "plaster_pastedeploy"; + inherit version; + hash = "sha256-viYubS5BpyZIddqi/ihQy7BhVyi83JKCj9xyc244FBI="; }; - patches = [ - # Fix tests compatibility with pastedeploy 2+ - # https://github.com/Pylons/plaster_pastedeploy/pull/17 - (fetchpatch { - url = "https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch"; - sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; - }) - ]; - propagatedBuildInputs = [ plaster pastedeploy ]; nativeCheckInputs = [ pytestCheckHook ]; From 6f93c2df250fe27b12a05f314bbd24f7b01d92bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:41 +0200 Subject: [PATCH 366/752] python3Packages.platformdirs: 3.9.1 -> 3.10.0 --- pkgs/development/python-modules/platformdirs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index f64a76d3e625..777ba72bcc2c 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.9.1"; + version = "3.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gBiXdnBWp0SlpE6TQPONTXEsQ2XFGCANGdNM/gv7V5s="; + hash = "sha256-Ytilbs29oxuwLfoKTXNQxlh8qBF39F2ZRK8imd57A1w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 986738c09086233a042dc77516406831cd3de3c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:41 +0200 Subject: [PATCH 367/752] python3Packages.plotly: 5.13.1 -> 5.16.1 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 201f2fcfc4bd..4698a84cefb1 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.13.1"; + version = "5.16.1"; src = fetchPypi { inherit pname version; - hash = "sha256-kO6aH+4N2jDigw4SmFUIHqF70bBqVTpiti3hXK/xohk="; + hash = "sha256-KVrCXt6xjIk6u3Hcrc6gdbeP1v3wfO5CF6ThAJZnkls="; }; propagatedBuildInputs = [ From 2a3a37a23fb78bafd9e985459ced04ca5f62e09c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:41 +0200 Subject: [PATCH 368/752] python3Packages.plotnine: 0.10.1 -> 0.12.3 --- pkgs/development/python-modules/plotnine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 717f530ef16d..241dced9f7e5 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.10.1"; + version = "0.12.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-2RKgS2ONz4IsUaZ4i4VmQjI0jVFfFR2zpkwAAZZvaEE="; + hash = "sha256-o43LNgf8ADweWa4MnVNdrngXZQ0cvC5W5W5bPeiN/pk="; }; nativeBuildInputs = [ From cad3bc29b98b5cc11cce3794e7ab7eba633e0b16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:42 +0200 Subject: [PATCH 369/752] python3Packages.plyer: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/plyer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index f190dcb6b24e..37eeef3ccba5 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "plyer"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "kivy"; repo = pname; - rev = version; - sha256 = "15z1wpq6s69s76r6akzgg340bpc21l2r1j8270gp7i1rpnffcjwm"; + rev = "refs/tags/${version}"; + sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE="; }; patches = [ From 8f66f209567a74dd9d0b5f087fc4bdfd38417ff0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:42 +0200 Subject: [PATCH 370/752] python3Packages.plyfile: 0.7.4 -> 1.0.1 --- pkgs/development/python-modules/plyfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 130fba959ea3..20495ba0dd01 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.7.4"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "9e9a18d22a3158fcd74df38761d43a7facc6df75126f2ab9f4e9a5d4d2188652"; + sha256 = "sha256-TOrt8e2Ss6Jrdm/IxWzaG5sjkOwpmxbe3i5f1FCXJho="; }; propagatedBuildInputs = [ numpy ]; From 309db99765a0a55dde94ae2782c17649ce810164 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:42 +0200 Subject: [PATCH 371/752] python3Packages.pomegranate: 0.14.8 -> 1.0.0 --- pkgs/development/python-modules/pomegranate/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 8c94f8bd1a67..57d6dd0b9ab6 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , numpy , scipy , cython @@ -16,14 +15,15 @@ buildPythonPackage rec { pname = "pomegranate"; - version = "0.14.8"; + version = "1.0.0"; + format = "pyproject"; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974 - rev = "0652e955c400bc56df5661db3298a06854c7cce8"; - sha256 = "16g49nl2bgnh6nh7bd21s393zbksdvgp9l13ww2diwhplj6hlly3"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EnxKlRRfsOIDLAhYOq7bUSbI/NvPoSyYCZ9D5VCXFGQ="; }; propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; From 7afd646d54c566f977358de8059216d000c457e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:42 +0200 Subject: [PATCH 372/752] python3Packages.pooch: 1.6.0 -> 1.7.0 --- .../python-modules/pooch/default.nix | 66 ++++++++++++------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 06c4617c0ce9..b8ba613ba350 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -2,10 +2,12 @@ , buildPythonPackage , isPy27 , fetchPypi +, setuptools , setuptools-scm +, wheel , pytestCheckHook , packaging -, appdirs +, platformdirs , requests , tqdm , paramiko @@ -14,37 +16,26 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; + disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; + hash = "sha256-8XShBBtkR/Du+IYPdtF/YO0vhX3A76OHp/CCKK8F2Zg="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; - propagatedBuildInputs = [ packaging appdirs requests ]; - - preCheck = "HOME=$TMPDIR"; - nativeCheckInputs = [ pytestCheckHook ]; - # tries to touch network - disabledTests = [ - "pooch_custom_url" - "pooch_download" - "pooch_logging_level" - "pooch_update" - "pooch_corrupted" - "check_availability" - "downloader" - "test_retrieve" - "test_stream_download" - "test_fetch" - "decompress" - "extractprocessor_fails" - "processor" - "integration" + propagatedBuildInputs = [ + packaging + platformdirs + requests ]; passthru = { @@ -54,6 +45,33 @@ buildPythonPackage rec { xxhash = [ xxhash ]; }; }; + preCheck = '' + export HOME=$TMPDIR + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # tries to touch network + disabledTests = [ + "check_availability" + "decompress" + "downloader" + "extractprocessor_fails" + "integration" + "pooch_corrupted" + "pooch_custom_url" + "pooch_download" + "pooch_logging_level" + "pooch_update" + "processor" + "test_fetch" + "test_load_registry_from_doi" + "test_retrieve" + "test_stream_download" + + ]; meta = with lib; { description = "A friend to fetch your data files."; From 340c10bae1aeaee814402b785bb4acbee73ec23a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:42 +0200 Subject: [PATCH 373/752] python3Packages.portend: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/portend/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 4dfd663ac871..73356631615f 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,13 +1,17 @@ { lib, buildPythonPackage, fetchPypi +, pythonOlder , pytestCheckHook, setuptools-scm, tempora }: buildPythonPackage rec { pname = "portend"; - version = "3.1.0"; + version = "3.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4"; + sha256 = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -16,6 +20,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "portend" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From 1d0512a4d3cfa7984db1575008ff633b9c5d5b0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:42 +0200 Subject: [PATCH 374/752] python3Packages.portpicker: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/portpicker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index f9b8f7993ffd..2595e20622d9 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.5.2"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xVaDrXJfXACkG8fbAiUiPovgJLH6Vk0DntM5Dk/Uj7M="; + hash = "sha256-vVB/1vlvZe4CeB8uZ06dxsmbv6bjw5mS45FiBMnUMfo="; }; nativeBuildInputs = [ From 1bd2c31b5e88110d34dc893e31c38b6f5713175e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:42 +0200 Subject: [PATCH 375/752] python3Packages.pot: 0.8.2 -> 0.9.1 --- pkgs/development/python-modules/pot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 455ee183a26f..a6251b3ea479 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "POT"; inherit version; - hash = "sha256-PKmuPI83DPy7RkOgHHPdPJJz5NT/fpr123AVTzTLwgQ="; + hash = "sha256-gcJTJ6ABl/8Rwf5SIc8YGtHf/mFWRBUuLhFd3d9eWRs="; }; nativeBuildInputs = [ From b030226ca3366fdd60a961076683eba06a00032b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:43 +0200 Subject: [PATCH 376/752] python3Packages.prompt-toolkit: 3.0.38 -> 3.0.39 --- pkgs/development/python-modules/prompt-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index bd676fc23c17..2869c042d2d0 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.38"; + version = "3.0.39"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-I6xdUFOKmjjIveBf7LR9C0A+zQZihXqG+Ib3mFY9W5s="; + hash = "sha256-BFBa3mh9wm3EKEsa0ZqDvi8q/oPnqCis4McvOh33Kqw="; }; propagatedBuildInputs = [ From d8d94d87604ef3376ff715a97c243faf1d11935f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:43 +0200 Subject: [PATCH 377/752] python3Packages.proto-plus: 1.22.2 -> 1.22.3 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index d6ef622698a9..d75842e507a2 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.22.2"; + version = "1.22.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-DozaPVpjTZiVt1xXPJNSwWSGy3XesOB4tf2jTbQkMWU="; + hash = "sha256-/c0JcTy9QkgHQNL+KcmQ9/vYhaZ+/DKKqL5u4+n3ams="; }; propagatedBuildInputs = [ protobuf ]; From c1c66a7a7b2c05cccd89ba1aea625862b735329b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:43 +0200 Subject: [PATCH 378/752] python3Packages.psycopg2: 2.9.5 -> 2.9.7 --- pkgs/development/python-modules/psycopg2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index b697c66613b3..bfe33e1ec3ad 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.5"; + version = "2.9.7"; format = "setuptools"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-pSRtLmg6ly4hh6hxS1ws+BVsBkYp+amxqHPBcw2eJFo="; + hash = "sha256-8AzDW9cRnx/tF7hb0QB4VRlN3iy9jeAauOuxdIdECtg="; }; outputs = [ "out" "doc" ]; From 30ffa2ce01f730b4336f31cfba68063797cf69d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:43 +0200 Subject: [PATCH 379/752] python3Packages.psygnal: 0.9.0 -> 0.9.2 --- pkgs/development/python-modules/psygnal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index c4a1565ccc2d..c9a1f710b671 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -8,13 +8,14 @@ , pydantic , pytestCheckHook , pythonOlder +, toolz , typing-extensions , wrapt }: buildPythonPackage rec { pname = "psygnal"; - version = "0.9.0"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9rYG0XqwFJQojnvM5ygm1RVu9NbeFASns0llOGKaP+4="; + hash = "sha256-Ki2s057aqaZa+kOpAlhBYFpZeuDX42+txQXFuBtXd04="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -42,6 +43,7 @@ buildPythonPackage rec { numpy pydantic pytestCheckHook + toolz wrapt ]; From e29959b0d4c622a90e474aa57a18b58b2ba35cdd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:44 +0200 Subject: [PATCH 380/752] python3Packages.py3status: 3.51 -> 3.53 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 9d44aff94394..f0f5484aeb56 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.51"; + version = "3.53"; src = fetchPypi { inherit pname version; - hash = "sha256-x4MftAC1TyR4FEvl+ytwCYg2cm5qAG/X/MJUhJRGlkU="; + hash = "sha256-vZrzHERjAg9J004A2dAbq8hKmAUslCTaRdwEAe9JRqU="; }; propagatedBuildInputs = [ From 1a1a4a4fd14e760d807ac2d6ccb7ee19eb0542b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:44 +0200 Subject: [PATCH 381/752] python3Packages.pyarr: 4.1.0 -> 5.2.0 --- pkgs/development/python-modules/pyarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyarr/default.nix b/pkgs/development/python-modules/pyarr/default.nix index 41fa4afc215b..2da0b65e5bed 100644 --- a/pkgs/development/python-modules/pyarr/default.nix +++ b/pkgs/development/python-modules/pyarr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyarr"; - version = "4.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-3DX02V3Srpx6hqimWbesxfkDqslVH4+8uXY7XYDmjX0="; + hash = "sha256-jlcc9Kj1MYSsnvJkKZXXWWJVDx3KIuojjbGtl8kDUpw="; }; propagatedBuildInputs = [ From 3e521befe7851cbf74c7ede7c941f51cddd1538f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:44 +0200 Subject: [PATCH 382/752] python3Packages.pyatag: 0.3.6.2 -> 3.5.1 --- pkgs/development/python-modules/pyatag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix index ff2b4c2dcffc..405c39398d5e 100644 --- a/pkgs/development/python-modules/pyatag/default.nix +++ b/pkgs/development/python-modules/pyatag/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyatag"; - version = "0.3.6.2"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = "refs/tags/${version}"; - hash = "sha256-yJEPDNjEv2lGrBQ78sl7nseVRemsG7hTdBGH5trciYU="; + hash = "sha256-hyGos0LFVKv63jf1ODPFfk+R47oyHea+8MGvxeKpop8="; }; propagatedBuildInputs = [ From 27a6b46f2741cc5cfcb5f972051af30f832d44fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:44 +0200 Subject: [PATCH 383/752] python3Packages.pyatv: 0.13.4 -> 0.14.0 --- .../python-modules/pyatv/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 7401af8e47d3..c1f28e575cf0 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -10,22 +10,27 @@ , miniaudio , netifaces , protobuf +, pydantic +, pydantic-settings +, pyfakefs , pytest-aiohttp , pytest-asyncio , pytest-httpserver , pytest-timeout +, pytest-xdist , pytestCheckHook , pythonRelaxDepsHook , pythonOlder , requests , srptools , stdenv +, tabulate , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.13.4"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +39,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rZnL18vO8eYn70GzeKSY528iTc0r/seGv0dYDYGHNzw="; + hash = "sha256-MVDjoo0v+zUXrluoUBc/hwVX+FeIYGzJgHsqNoI6HVo="; }; postPatch = '' @@ -70,24 +75,25 @@ buildPythonPackage rec { miniaudio netifaces protobuf + pydantic + pydantic-settings requests srptools + tabulate zeroconf ]; nativeCheckInputs = [ deepdiff + pyfakefs pytest-aiohttp pytest-asyncio pytest-httpserver pytest-timeout + pytest-xdist pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" From eda4b000f20b98d0d7877b9cf733b9a4c74822f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 384/752] python3Packages.pybids: 0.15.6 -> 0.16.3 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 33660d9165e8..912bc117081b 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -18,12 +18,12 @@ }: buildPythonPackage rec { - version = "0.15.6"; + version = "0.16.3"; pname = "pybids"; src = fetchPypi { inherit pname version; - hash = "sha256-OjWW08tyVDHkF0X3Pa+10HYD/7Gysp5DkEt9LaVxsdM="; + hash = "sha256-EOJ5NQyNFMpgLA1EaaXkv3/zk+hkPIMaVGrnNba4LMM="; }; patches = [ From 9128c41107dcd0903c63e5378a232517cdd8eaa5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 385/752] python3Packages.pybigwig: 0.3.20 -> 0.3.22 --- pkgs/development/python-modules/pybigwig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index 3101066ff251..efbc350530e5 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pybigwig"; - version = "0.3.20"; + version = "0.3.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "deeptools"; repo = "pyBigWig"; rev = "refs/tags/${version}"; - hash = "sha256-uYKxM0HOG4fus5geBFjbfbv6G1kDvMaAwhk0w/e1YII="; + hash = "sha256-wJC5eXIC9PNlbCtmq671WuoIJVkh3aX7K6WArJWjyFg="; }; buildInputs = [ From 63a2c21243d0069da60f8eb85aeef240c427c1d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 386/752] python3Packages.pycairo: 1.23.0 -> 1.24.0 --- pkgs/development/python-modules/pycairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 84c64b79df06..ff2f2e581906 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.23.0"; + version = "1.24.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - hash = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; + hash = "sha256-eAE0YPZAV90MP6g1V1T80suaRV15ts38kYt6Djb78Xk="; }; nativeBuildInputs = [ From eee2a4095cb40d04bf709593198312d68a6e1016 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 387/752] python3Packages.pycddl: 0.4.0 -> 0.5.2 --- pkgs/development/python-modules/pycddl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycddl/default.nix b/pkgs/development/python-modules/pycddl/default.nix index 389717400670..9cd2d1fab202 100644 --- a/pkgs/development/python-modules/pycddl/default.nix +++ b/pkgs/development/python-modules/pycddl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pycddl"; - version = "0.4.0"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w0CGbPeiXyS74HqZXyiXhvaAMUaIj5onwjl9gWKAjqY="; + hash = "sha256-LdecJPSov2Y/QI4MWb20DcF0EtMuDO0VwiQDUeD55GI="; }; nativeBuildInputs = with rustPlatform; [ maturinBuildHook cargoSetupHook ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-g96eeaqN9taPED4u+UKUcoitf5aTGFrW2/TOHoHEVHs="; + hash = "sha256-FJET2Xb1cq4aePFhPXpp2oEPIOtpugYWNFAa2Dj0F6Y="; }; nativeCheckInputs = [ pytestCheckHook psutil cbor2 ]; From 7d05efd1f01f8db4022c8f5ffd9287cad8e1aa53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 388/752] python3Packages.pyclipper: 1.3.0.post4 -> 1.3.0.post5 --- pkgs/development/python-modules/pyclipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 1b9eba36b96d..45e5ff27ee55 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyclipper"; - version = "1.3.0.post4"; + version = "1.3.0.post5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FMqOZ0WOorTtbdweeu9UdoUNWOPrcwc+0SK+55XxyQQ="; + hash = "sha256-FKpP+tgJFzhij3wDQsAgwrTNnny7lgmN+tlSQ9JgG+Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b0279b8daa17ef145b5442d295b4d920d782b7c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 389/752] python3Packages.pycodestyle: 2.10.0 -> 2.11.0 --- .../python-modules/pycodestyle/default.nix | 27 +++++++++---------- .../pycodestyle/python-3.11.4-compat.patch | 16 ----------- 2 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index cdbec2770080..250537774c2a 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -3,11 +3,12 @@ , fetchPypi , lib , python +, pytestCheckHook }: buildPythonPackage rec { pname = "pycodestyle"; - version = "2.10.0"; + version = "2.11.0"; disabled = pythonOlder "3.6"; @@ -15,25 +16,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM="; + hash = "sha256-JZvMF4V9ios7SiMnMkt55fAgoTwWB0Zw+cjI+HLqdtA="; }; - patches = [ - # https://github.com/PyCQA/pycodestyle/issues/1151 - # Applies a modified version of an upstream patch that only applied - # to Python 3.12. - ./python-3.11.4-compat.patch + pythonImportsCheck = [ + "pycodestyle" ]; - # https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13 - checkPhase = '' - ${python.interpreter} -m pycodestyle --statistics pycodestyle.py - ${python.interpreter} -m pycodestyle --max-doc-length=72 --testsuite testsuite - ${python.interpreter} -m pycodestyle --max-doc-length=72 --doctest - ${python.interpreter} -m unittest discover testsuite -vv - ''; + nativCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pycodestyle" ]; + # https://github.com/PyCQA/pycodestyle/blob/2.11.0/tox.ini#L16 + postCheck = '' + ${python.interpreter} -m pycodestyle --statistics pycodestyle.py + ''; meta = with lib; { changelog = "https://github.com/PyCQA/pycodestyle/blob/${version}/CHANGES.txt"; diff --git a/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch b/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch deleted file mode 100644 index d8a0d7953776..000000000000 --- a/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/testsuite/test_api.py b/testsuite/test_api.py -index 8dde32ff..38e34acf 100644 ---- a/testsuite/test_api.py -+++ b/testsuite/test_api.py -@@ -329,7 +329,10 @@ def test_check_nullbytes(self): - count_errors = pep8style.input_file('stdin', lines=['\x00\n']) - - stdout = sys.stdout.getvalue() -- expected = "stdin:1:1: E901 ValueError" -+ if sys.version_info < (3, 11, 4): -+ expected = "stdin:1:1: E901 ValueError" -+ else: -+ expected = "stdin:1:1: E901 SyntaxError: source code string cannot contain null bytes" # noqa: E501 - self.assertTrue(stdout.startswith(expected), - msg='Output %r does not start with %r' % - (stdout, expected)) From a54cb9801c06e642177088121d8a87f1b94c7885 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 390/752] python3Packages.pycognito: 2022.12.0 -> 2023.5.0 --- pkgs/development/python-modules/pycognito/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index 22947f9e1369..a66c0ef49117 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pycognito"; - version = "2022.12.0"; + version = "2023.5.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; + hash = "sha256-2Aqid2bd5BAnWQ+Wtji0zXjLAmSpyJNGqJ0VroGi6lY="; }; propagatedBuildInputs = [ @@ -47,6 +47,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests.py" ]; + disabledTests = [ + # requires network access + "test_srp_requests_http_auth" + ]; + pythonImportsCheck = [ "pycognito" ]; meta = with lib; { From ddcd975de1b86248ab6faabdd3179bde1d653e9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:45 +0200 Subject: [PATCH 391/752] python3Packages.pyctr: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/pyctr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix index bf72bf6b3a52..990d24570878 100644 --- a/pkgs/development/python-modules/pyctr/default.nix +++ b/pkgs/development/python-modules/pyctr/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pyctr"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8="; + hash = "sha256-N5jRGLwALhv6uzaw1E8vQwut4qpnJ+u5PdsCX2T0pcA="; }; propagatedBuildInputs = [ pycryptodomex ]; From 13a6f73519e1d0b11dbb43462d6af56e90363d0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:46 +0200 Subject: [PATCH 392/752] python3Packages.pycurl: 7.45.1 -> 7.45.2 --- .../python-modules/pycurl/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index cacb67496c8c..5b89cd2d6009 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch , pythonOlder , curl , openssl @@ -14,24 +13,14 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.45.1"; + version = "7.45.2"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - hash = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; + hash = "sha256-VzBZC+AnE2Slvd2eJFycwPtxDEy6y92VJkoxItIyJMo="; }; - patches = [ - # Pull upstream patch for curl-3.83: - # https://github.com/pycurl/pycurl/pull/753 - (fetchpatch { - name = "curl-3.83.patch"; - url = "https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1.patch"; - hash = "sha256-/lGq7O7ZyytzBAxWJPigcWdvypM7OHLBcp9ItmX7z1g="; - }) - ]; - preConfigure = '' substituteInPlace setup.py --replace '--static-libs' '--libs' export PYCURL_SSL_LIBRARY=openssl @@ -75,6 +64,8 @@ buildPythonPackage rec { "test_libcurl_ssl_gnutls" # AssertionError: assert 'crypto' in ['curl'] "test_ssl_in_static_libs" + # tests that require curl with http3Support + "test_http_version_3" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fatal Python error: Segmentation fault "cadata_test" From 9feebec2b426bc6a87afb4c5250044fd1291885c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:46 +0200 Subject: [PATCH 393/752] python3Packages.pydal: 20221110.1 -> 20230521.1 --- pkgs/development/python-modules/pydal/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index b5de4635b47e..2e84d0305da2 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , python +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pydal"; - version = "20221110.1"; - format = "setuptools"; + version = "20230521.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fD6JHHD42JGONidvIQoZWbt7rfOydvRxkZhv/PW2o5A="; + hash = "sha256-EEeKYeYnxbjLdpH39+v3IQhFSFMWST0310DCl/ttGEU="; }; postPatch = '' @@ -26,6 +30,10 @@ buildPythonPackage rec { sed -i '/from .sql import/d' tests/__init__.py ''; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "pydal" ]; checkPhase = '' From f614178bafde34825631c49272dfb41214a68377 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:46 +0200 Subject: [PATCH 394/752] python3Packages.pydantic-core: 2.3.0 -> 2.6.3 --- .../python-modules/pydantic-core/Cargo.lock | 662 ------------------ .../python-modules/pydantic-core/default.nix | 128 ++-- 2 files changed, 69 insertions(+), 721 deletions(-) delete mode 100644 pkgs/development/python-modules/pydantic-core/Cargo.lock diff --git a/pkgs/development/python-modules/pydantic-core/Cargo.lock b/pkgs/development/python-modules/pydantic-core/Cargo.lock deleted file mode 100644 index 05a29d770d83..000000000000 --- a/pkgs/development/python-modules/pydantic-core/Cargo.lock +++ /dev/null @@ -1,662 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.25", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mimalloc" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "proc-macro2" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pydantic-core" -version = "2.3.0" -dependencies = [ - "ahash", - "base64", - "enum_dispatch", - "idna 0.3.0", - "mimalloc", - "num-bigint", - "pyo3", - "pyo3-build-config", - "python3-dll-a", - "regex", - "serde", - "serde_json", - "speedate", - "strum", - "strum_macros 0.24.3", - "url", - "version_check", -] - -[[package]] -name = "pyo3" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" -dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset", - "num-bigint", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" -dependencies = [ - "once_cell", - "python3-dll-a", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "python3-dll-a" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" -dependencies = [ - "cc", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustversion" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.25", -] - -[[package]] -name = "serde_json" -version = "1.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "speedate" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2" -dependencies = [ - "strum", - "strum_macros 0.25.1", -] - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.1", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.25", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "target-lexicon" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna 0.4.0", - "percent-encoding", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 7826712acb6e..6e273aaef4c9 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -14,64 +14,74 @@ , dirty-equals }: -buildPythonPackage rec { - pname = "pydantic-core"; - version = "2.3.0"; - format = "pyproject"; +let + pydantic-core = buildPythonPackage rec { + pname = "pydantic-core"; + version = "2.6.3"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "pydantic"; - repo = "pydantic-core"; - rev = "v${version}"; - hash = "sha256-Wi+b+xiJtVi3KIy6bzT29kyHFSI7mbMNrLa/Iu3cTEY="; + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-bEVACTlzELXPoCtEHMR1s87KJn/qnE0lO1O4RmdjmPM="; + }; + + patches = [ + ./01-remove-benchmark-flags.patch + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-h9SmMLg/W11h/SQz8Te5OoCKdyG6Fctc5ftqbVQFSwU="; + }; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + typing-extensions + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + pythonImportsCheck = [ "pydantic_core" ]; + + # escape infinite recursion with pydantic via dirty-equals + doCheck = false; + passthru.tests.pytest = pydantic-core.overrideAttrs { doCheck = true; }; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + pytest-timeout + dirty-equals + pytest-mock + ]; + + disabledTests = [ + # RecursionError: maximum recursion depth exceeded while calling a Python object + "test_recursive" + ]; + + disabledTestPaths = [ + # no point in benchmarking in nixpkgs build farm + "tests/benchmarks" + ]; + + meta = with lib; { + description = "Core validation logic for pydantic written in rust"; + homepage = "https://github.com/pydantic/pydantic-core"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; }; - - patches = [ - ./01-remove-benchmark-flags.patch - ]; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = [ - cargo - rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook - rustc - typing-extensions - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - ]; - - propagatedBuildInputs = [ - typing-extensions - ]; - - pythonImportsCheck = [ "pydantic_core" ]; - - nativeCheckInputs = [ - pytestCheckHook - hypothesis - pytest-timeout - dirty-equals - pytest-mock - ]; - disabledTests = [ - # RecursionError: maximum recursion depth exceeded while calling a Python object - "test_recursive" - ]; - disabledTestPaths = [ - # no point in benchmarking in nixpkgs build farm - "tests/benchmarks" - ]; - - meta = with lib; { - description = "Core validation logic for pydantic written in rust"; - homepage = "https://github.com/pydantic/pydantic-core"; - license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; - }; -} +in pydantic-core From 5f0c1366f3d52ba720346f02224e9aed9119a6d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:46 +0200 Subject: [PATCH 395/752] python3Packages.pydantic: 1.10.9 -> 2.3.0 Drops the documentation build, because it is an ever growing, ever changing set of dependencies, that we need to package up, hidnering the upgrade effort. --- .../python-modules/pydantic/default.nix | 122 ++++++------------ 1 file changed, 39 insertions(+), 83 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index ea4943a06506..fd8341db5898 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,46 +1,37 @@ { lib -, stdenv , buildPythonPackage -, autoflake -, cython -, devtools -, email-validator , fetchFromGitHub -, fetchpatch -, pytest-mock -, pytestCheckHook -, python-dotenv -, pythonAtLeast , pythonOlder -, pyupgrade -, typing-extensions -# dependencies for building documentation. -# docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245 -, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin && pythonAtLeast "3.10") -, ansi2html -, markdown-include -, mike -, mkdocs -, mkdocs-exclude -, mkdocs-material -, mdx-truly-sane-lists -, sqlalchemy -, ujson -, orjson -, hypothesis + +# build-system +, cython +, hatchling +, hatch-fancy-pypi-readme + +# build , libxcrypt + +# dependencies +, typing-extensions +, annotated-types +, pydantic-core + +# optional-dependencies +, email-validator + +# tests +, dirty-equals +, faker +, pytestCheckHook +, pytest-benchmark +, pytest-examples +, pytest-mock }: buildPythonPackage rec { pname = "pydantic"; - version = "1.10.9"; - format = "setuptools"; - - outputs = [ - "out" - ] ++ lib.optionals withDocs [ - "doc" - ]; + version = "2.3.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -48,89 +39,54 @@ buildPythonPackage rec { owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4="; + hash = "sha256-toqrWg8bYzc3UmvG/YmXawfmT8nqaA9fxy24k1cdj+M="; }; - patches = [ - # Fixes racy doctests build failures on really fast machines - # FIXME: remove after next release - (fetchpatch { - url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff"; - hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs="; - }) - ]; - - postPatch = '' - sed -i '/flake8/ d' Makefile - ''; - buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; nativeBuildInputs = [ cython - ] ++ lib.optionals withDocs [ - # dependencies for building documentation - autoflake - ansi2html - markdown-include - mdx-truly-sane-lists - mike - mkdocs - mkdocs-exclude - mkdocs-material - sqlalchemy - ujson - orjson - hypothesis + hatchling + hatch-fancy-pypi-readme ]; propagatedBuildInputs = [ - devtools - pyupgrade + annotated-types typing-extensions + pydantic-core ]; passthru.optional-dependencies = { - dotenv = [ - python-dotenv - ]; email = [ email-validator ]; }; + pythonImportsCheck = [ + "pydantic" + ]; + nativeCheckInputs = [ + dirty-equals + faker + pytest-benchmark + pytest-examples pytest-mock pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pytestFlagsArray = [ - # https://github.com/pydantic/pydantic/issues/4817 - "-W" "ignore::pytest.PytestReturnNotNoneWarning" + "--benchmark-disable" ]; preCheck = '' export HOME=$(mktemp -d) ''; - # Must include current directory into PYTHONPATH, since documentation - # building process expects "import pydantic" to work. - preBuild = lib.optionalString withDocs '' - PYTHONPATH=$PWD:$PYTHONPATH make docs - ''; - - # Layout documentation in same way as "sphinxHook" does. - postInstall = lib.optionalString withDocs '' - mkdir -p $out/share/doc/$name - mv ./site $out/share/doc/$name/html - ''; - enableParallelBuilding = true; - pythonImportsCheck = [ "pydantic" ]; - meta = with lib; { description = "Data validation and settings management using Python type hinting"; homepage = "https://github.com/pydantic/pydantic"; From b05d0adbf8d67e75729ed8c9065c057b81e5a657 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:46 +0200 Subject: [PATCH 396/752] python3Packages.pydexcom: 0.2.3 -> 0.3.1 --- .../python-modules/pydexcom/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index 412373f09a29..57031c90f97c 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -1,20 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, setuptools-scm , requests }: buildPythonPackage rec { pname = "pydexcom"; - version = "0.2.3"; + version = "0.3.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "gagebenne"; repo = pname; - rev = version; - hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; + rev = "refs/tags/${version}"; + hash = "sha256-VZ8Y8W3oEQ3W8eubMbHLfQAXK8cL6+OTyBFwtEe0cBE="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ requests ]; # tests are interacting with the Dexcom API From ea9023dd09f24e3182cdc0c24e7ff367d32b43c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:46 +0200 Subject: [PATCH 397/752] python3Packages.pydicom: 2.4.2 -> 2.4.3 --- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index a2100c83c8df..11114257714d 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; rev = "refs/tags/v${version}"; - hash = "sha256-FNZVu2/7kBGeP4iTH53bsApfHzHFxr5bxqbqkI4T95E="; + hash = "sha256-PF4iA/FPxPYD8OfgWqKRndwi2vURuzh6tlEwduxs/3E="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded From fb07eec85fa04cca84c25edfae80c410fbecc8e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:47 +0200 Subject: [PATCH 398/752] python3Packages.pyeapi: 0.8.4 -> 1.0.2 --- .../python-modules/pyeapi/default.nix | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index f7923144bae2..2ca3ff02edd9 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , setuptools , mock , netaddr @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "pyeapi"; - version = "0.8.4"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arista-eosplus"; repo = pname; - rev = "v${version}"; - sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; }; nativeBuildInputs = [ @@ -36,28 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223 - (fetchpatch { - name = "fix-collection-usage.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; - hash = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; - }) - (fetchpatch { - name = "fix-collection-usage-2.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch"; - hash = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; - excludes = [ - ".github/workflows/ci.yml" - ]; - }) - (fetchpatch { - name = "fix-collection-usage-3.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch"; - hash = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; - }) - ]; - pytestFlagsArray = [ "test/unit" ]; From 43d48d6300680554a32d4db20cb097779a6e8048 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:47 +0200 Subject: [PATCH 399/752] python3Packages.pyee: 9.0.4 -> 11.0.0 --- .../python-modules/pyee/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index a009186dd019..0efcb94259fe 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -6,25 +6,29 @@ , pytest-trio , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm , twisted , typing-extensions -, vcversioner +, wheel }: buildPythonPackage rec { pname = "pyee"; - version = "9.0.4"; - format = "setuptools"; + version = "11.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; + hash = "sha256-J8aCvOYL2txdPiPqzUEB3zKMAoCISj2cB/Ok4+WV3ic="; }; - buildInputs = [ - vcversioner + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ From 1d28cc48277e55e29ddc2fdeea3ee1298193aeda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:47 +0200 Subject: [PATCH 400/752] python3Packages.pyface: 7.4.4 -> 8.0.0 --- pkgs/development/python-modules/pyface/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index b976989f6b5b..fd0f1409ca75 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -3,22 +3,27 @@ , buildPythonPackage , importlib-metadata , importlib-resources +, setuptools , traits , pythonOlder }: buildPythonPackage rec { pname = "pyface"; - version = "7.4.4"; - format = "setuptools"; + version = "8.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0F+qxFOUvVWYWQahIM8AEv58rCxmNJYsBTC2pjUO2yI="; + hash = "sha256-fhNhg0e3pkjtIM29T9GlFkj1AQKR815OD/G/cKcgy/g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ importlib-metadata importlib-resources From 71a561ab8d432b09ea467208234f305db3b8efc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:47 +0200 Subject: [PATCH 401/752] python3Packages.pyfakefs: 5.1.0 -> 5.2.4 --- pkgs/development/python-modules/pyfakefs/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 416ec7c39bca..912754373f3e 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.4"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-MWxgJmQNFKa0+95x/ZZ0V20bVxDe2o+r3oqtUdeF28M="; + hash = "sha256-PgQPN5IIYIag3CGRsF/nCUOOFoqv4ulPzb7444WSCNg="; }; postPatch = '' @@ -32,6 +32,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) disabledTests = [ "test_open_existing_pipe" ]; + + disabledTestPaths = [ + # try to import opentimelineio but nixpkgs doesn't have it as of 2023-09-16 + "pyfakefs/pytest_tests/segfault_test.py" + ]; + pythonImportsCheck = [ "pyfakefs" ]; meta = with lib; { From a161ef0b00be7f9605a4f5552223c5633ef47d7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:47 +0200 Subject: [PATCH 402/752] python3Packages.pyfiglet: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/pyfiglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 61420455dac3..0b3bdb7f6d34 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.0.2"; pname = "pyfiglet"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x9kIim+CG99pxY2XVzeAhadogWJrIwjmu9pwcSFgfxg="; + sha256 = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; }; doCheck = false; From 1951a2f59e1aeddf90362fdefc36b5cc63305042 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:47 +0200 Subject: [PATCH 403/752] python3Packages.pyflakes: 3.0.1 -> 3.1.0 --- .../development/python-modules/pyflakes/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index d83c02783729..2dea4630c575 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,13 +2,12 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch, isPy311 , pytestCheckHook }: buildPythonPackage rec { pname = "pyflakes"; - version = "3.0.1"; + version = "3.1.0"; disabled = pythonOlder "3.6"; @@ -16,17 +15,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0="; + hash = "sha256-oKrgNMRE2wBxqgd5crpHaNQMgw2VOf1Fv0zT+PaZLvw="; }; - patches = lib.optional isPy311 # could be made unconditional on rebuild - (fetchpatch { - name = "tests-py311.patch"; - url = "https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58.diff"; - hash = "sha256-xlgql+bN0HsGnTMkwax3ZG/5wrbkUl/kQkjlr3lsgRw="; - }) - ; - nativeCheckInputs = [ pytestCheckHook ]; From ad5060dc22a7986d2e3e0f0d329316b261ea9e13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:47 +0200 Subject: [PATCH 404/752] python3Packages.pygame: 2.2.0 -> 2.5.1 --- pkgs/development/python-modules/pygame/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 140b233e3428..f4ceeb9b978c 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.2.0"; + version = "2.5.1"; disabled = pythonOlder "3.6"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; + rev = "refs/tags/${version}"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - hash = "sha256-SMkY3uN3kAlb/pbm047W0G8MJ7G8mCsfGVSPhzd5aEo="; + hash = "sha256-0mVbjfNYTfuo8uyd7NFKlneUZMt78mcitQ5nCgPxmFs="; postFetch = "rm -rf $out/docs/reST"; }; From 23a845d3943bdd1ef497ec6f3f5aec43cdbdaa1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:48 +0200 Subject: [PATCH 405/752] python3Packages.pygame-gui: 068 -> 069 --- pkgs/development/python-modules/pygame-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index e7539a814505..3c530d199f81 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "068"; + version = "069"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - hash = "sha256-BCgSCOnuIqjpROpEtkzkvIXK7dIO0dNYsPmQSwXfmTQ="; + hash = "sha256-IXU00Us1odbfS7jLPMYuCPv2l/5TUZdYKES7xHs+EWg="; }; propagatedBuildInputs = [ pygame python-i18n ]; From b84ec714e76beb00a39dcebfa8248a5cd78f1530 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:48 +0200 Subject: [PATCH 406/752] python3Packages.pygccxml: 2.3.0 -> 2.4.0 --- pkgs/development/python-modules/pygccxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index f4f842852b0c..9fde5bb05d1b 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pygccxml"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gccxml"; repo = "pygccxml"; rev = "refs/tags/v${version}"; - hash = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k="; + hash = "sha256-rw99afv68c92LWmKUErB1y0Cts69UEpI0GCxSMvD+B8="; }; buildInputs = [ From f5425fd50f5c7168c6c3466bde70e10c1940b76f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:48 +0200 Subject: [PATCH 407/752] python3Packages.pygit2: 1.12.2 -> 1.13.0 --- pkgs/development/python-modules/pygit2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index c7e4979d1372..5505b1c3a83f 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -6,7 +6,7 @@ , cffi , fetchPypi , isPyPy -, libgit2_1_6 +, libgit2 , pycparser , pytestCheckHook , pythonOlder @@ -14,22 +14,22 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.12.2"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VuhdDmbelX1ZnR77JAnTmv7v2PAQCb/aB5a0Kktng1g="; + hash = "sha256-bd43Q2+rFCZK09bLxarj/VVeualoCnv91uVkzXe14rg="; }; preConfigure = lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${libgit2_1_6}/lib" + export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; buildInputs = [ - libgit2_1_6 + libgit2 ]; propagatedBuildInputs = [ From c991170f5e71784d6bb357bc195de1f19703e785 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:48 +0200 Subject: [PATCH 408/752] python3Packages.pygments: 2.15.1 -> 2.16.1 --- pkgs/development/python-modules/pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index 8f32d26ebc24..f2b89cbcefd5 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -13,13 +13,13 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.15.1"; + version = "2.16.1"; format = "pyproject"; src = fetchPypi { pname = "Pygments"; inherit version; - hash = "sha256-is5NPB3UgYlLIAX1YOrQ+fGe5k/pgzZr4aIeFx0Sd1w="; + hash = "sha256-Ha/wSUggxpvIlB5AeqIPV3N07og2TuEKmP2+Cuzpbik="; }; nativeBuildInputs = [ From 2e3d583d96ca9e638affbff56274adfc3411dd0a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:48 +0200 Subject: [PATCH 409/752] python3Packages.pygmo: 2.19.0 -> 2.19.5 --- pkgs/development/python-modules/pygmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 147198087fa5..0ce6a2fd3f99 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -18,13 +18,13 @@ toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.19.0"; + version = "2.19.5"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; rev = "refs/tags/v${version}"; - hash = "sha256-gjmZf66AcNaAMqyLerBgRu5RUzV6qrT7DigTNE39AwI="; + hash = "sha256-szQyw5kYfrQEeXRQzjQ0hzULuzTfmGod6ZxG9PDRj5M="; }; cmakeFlags = [ From dcb22fd464c7709c9975c0d821ccb205b03b8b31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:48 +0200 Subject: [PATCH 410/752] python3Packages.pygobject-stubs: 2.8.0 -> 2.9.0 --- pkgs/development/python-modules/pygobject-stubs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index 77ec68ea2884..f2c2668f4043 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.8.0"; + version = "2.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; - rev = "v${version}"; - hash = "sha256-8TB8eqXPhvoKtyQ8+hnCQnH4NwO2WC1NYAxmVj+FCvg="; + rev = "refs/tags/v${version}"; + hash = "sha256-A28vH5S5xxY7VIJORbgQ7jAi/wG4WiffNGryiumHWf0="; }; nativeBuildInputs = [ From 7c36f449dfa128c8ec3c3088de1f9e3029a549f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:48 +0200 Subject: [PATCH 411/752] python3Packages.pygtkspellcheck: 5.0.1 -> 5.0.2 --- .../pygtkspellcheck/default.nix | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index 767eb706bb7f..a467ff074643 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -1,19 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, gobject-introspection, gtk3, pyenchant, pygobject3 }: +{ lib +, buildPythonPackage +, fetchPypi +, gobject-introspection +, gtk3 +, poetry-core +, pyenchant +, pygobject3 +}: buildPythonPackage rec { pname = "pygtkspellcheck"; - version = "5.0.1"; + version = "5.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-hIHf1LBmFhPWN138jaAAOpmx+frbe6XM22+jG+OWcvw="; + hash = "sha256-rWV/ghoMWHOAmT8ablwOjJSEhtvPqT/UdoZBXL5Nj0s="; }; - nativeBuildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ pyenchant pygobject3 gtk3 ]; + nativeBuildInputs = [ + gobject-introspection + poetry-core + ]; + + propagatedBuildInputs = [ + pyenchant + pygobject3 + gtk3 + ]; doCheck = false; # there are no tests - pythonImportsCheck = [ "gtkspellcheck" ]; + + pythonImportsCheck = [ + "gtkspellcheck" + ]; meta = with lib; { homepage = "https://github.com/koehlma/pygtkspellcheck"; From 760735f936b7de255f20bc46bdf4483c4bc562d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:49 +0200 Subject: [PATCH 412/752] python3Packages.pyhepmc: 2.12.0 -> 2.13.2 --- pkgs/development/python-modules/pyhepmc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 7e59dbf9b112..76197c47c2fd 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhepmc"; - version = "2.12.0"; + version = "2.13.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-po1ad02dpY69RRhaRApskH6tdOaSIsCl5PgpjsAzyKo="; + hash = "sha256-M18Bq6WrAINpgPx5+uh8dufPBxIklRHpbBWUYMC8v10="; fetchSubmodules = true; }; From d89e829c9265bbb0517f6a74a5255a599201d0c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:49 +0200 Subject: [PATCH 413/752] python3Packages.pyicu: 2.10.2 -> 2.11 --- pkgs/development/python-modules/pyicu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index f8100ad3ddbb..901bec161445 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyicu"; - version = "2.10.2"; + version = "2.11"; format = "setuptools"; src = fetchPypi { pname = "PyICU"; inherit version; - hash = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; + hash = "sha256-OrUxJkz+kTKz0qxdcI2ppGSdJfbmgTcwrIjPBAoIqEQ="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config From 35d45751d36e7ac8d4cc7e77a39c8cbb5ae87cd5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:49 +0200 Subject: [PATCH 414/752] python3Packages.pyinsteon: 1.5.0 -> 1.5.1 --- .../python-modules/pyinsteon/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index dbf6ab12b44e..8980da8e24bd 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -4,7 +4,6 @@ , async-generator , buildPythonPackage , fetchFromGitHub -, fetchpatch , pypubsub , pyserial , pyserial-asyncio @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,18 +25,9 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-REm0E7+otqDypVslB5heHEaWA+q3Nh1O96gxFeCC3As="; + hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8="; }; - patches = [ - # https://github.com/pyinsteon/pyinsteon/pull/361 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/pyinsteon/pyinsteon/commit/676bc5fff11b73a4c3fd189a6ac6d3de9ca21ae0.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools wheel From 89055a635ca0a808c86a70eb63e64cc9d72fe849 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:49 +0200 Subject: [PATCH 415/752] python3Packages.pymanopt: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/pymanopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index 0ade36294d96..d6fbdacf4650 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nbSxqMmYWi71s74bbB9LAlPKEslTqG/j266cLfNHrwg="; + hash = "sha256-pDFRYhswcuAHG9pcqvzXIy3Ivhxe5R5Ric7AFRh7MK4="; }; propagatedBuildInputs = [ numpy scipy torch ]; From a81a1d5c341820d30b5effe52db66950e3b0115d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:49 +0200 Subject: [PATCH 416/752] python3Packages.pymc: 5.3.1 -> 5.8.1 --- pkgs/development/python-modules/pymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 14df8ba37147..98e41acc392f 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.3.1"; + version = "5.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TtRIYgsPlire4li4/9Ls7Rh1SIkDGi5uCSN7huSrelA="; + hash = "sha256-GufQIVV8OXlsUmk/FQZhrJ84P28He5Qc3pz67nLhppU="; }; propagatedBuildInputs = [ From f37bd8589b164f8caa884d3dc0751c8e62432298 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:49 +0200 Subject: [PATCH 417/752] python3Packages.pymdown-extensions: 10.1.0 -> 10.3 --- .../development/python-modules/pymdown-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 1f4bcb1cce29..f6fea35270e5 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -44,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.1.0"; + version = "10.3"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-KqDEmWAWXdDpQPsP9Vrced+Ozz9IZiD8rCG57hPR7Xs="; + hash = "sha256-R35R2dHfjcVQbEa2319FEMjPGl1Y5/u2KEHeR0wTYEo="; }; nativeBuildInputs = [ hatchling ]; From 8a41aeef8c272d6f4cb534294605dad87a0d7423 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:50 +0200 Subject: [PATCH 418/752] python3Packages.pymongo: 4.3.3 -> 4.5.0 --- pkgs/development/python-modules/pymongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 292e7fceead6..bb6196f775a2 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.3.3"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NOlf+wpov/vDtDfy0fJfyRb+899c3u0JktpfQvrpuAc="; + hash = "sha256-aB8lLkOz7wVMqRYWNfgbcw9NjK3Siz8rIAT1py+FOYI="; }; propagatedBuildInputs = [ From e8292ed0f142b33ee211c11f853ea072ff8e89f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:50 +0200 Subject: [PATCH 419/752] python3Packages.pymorphy3: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/pymorphy3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix index c4642b906544..2ef0e9629bd5 100644 --- a/pkgs/development/python-modules/pymorphy3/default.nix +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pymorphy3"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "no-plagiarism"; repo = pname; - rev = version; - hash = "sha256-5MXAYcjZPUrGf5G5e7Yml1SLukrZURA0TCv0GiP56rM="; + rev = "refs/tags/${version}"; + hash = "sha256-JTRG+UtNXnS9GFUrgHNVCktb3HdH98wDFgzDPp6oVcQ="; }; propagatedBuildInputs = [ From 9b749ec7c8ea7bd8e5679f5afd579d4df6f0ee1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:50 +0200 Subject: [PATCH 420/752] python3Packages.pymupdf: 1.22.5 -> 1.23.3 --- pkgs/development/python-modules/pymupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 0bea5f8c51b5..d7e69706e51f 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.22.5"; + version = "1.23.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMuPDF"; inherit version; - hash = "sha256-XsjVEGdSKXUp0NaNRs/EzpmRSqvZm+hD8VmaGELWP+k="; + hash = "sha256-AhR4rmx26IWSQdu5cGEskIColX2L1pe7oLRTHcHPT4c="; }; postPatch = '' From 7e58f67781d9196bcaf95814a0c330d68691608e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:50 +0200 Subject: [PATCH 421/752] python3Packages.pynndescent: 0.5.8 -> 0.5.10 --- pkgs/development/python-modules/pynndescent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index b7075b9619d7..0d0171b1b066 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.8"; + version = "0.5.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p8VSVpv2BKEB/VS7odJ8EjieBllF3uOmd3pRjGOkbys="; + hash = "sha256-XV3Gg8A+9V/j3faThZcgyhj4XG5uW7C08UhwJ41SiK0="; }; patches = [ From 36c1e1061f81959954151aee8fb86e3324a59c23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:50 +0200 Subject: [PATCH 422/752] python3Packages.pynws: 1.5.1 -> 1.6.0 --- pkgs/development/python-modules/pynws/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index edc9eb26440e..d2dd95f42451 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU="; }; From 1453a954d3cff88fa26c5cabb1dc08f68cb9a613 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:51 +0200 Subject: [PATCH 423/752] python3Packages.pyocd: 0.34.3 -> 0.35.1 --- pkgs/development/python-modules/pyocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 699b6c3cf553..ecc92bc3bd38 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.34.3"; + version = "0.35.1"; src = fetchPypi { inherit pname version; - sha256 = "2zDr6fnA2MCTT/hNVvk7u3gugMo+nUF2E2VsOPhJXH4="; + sha256 = "sha256-AugIT007JtTXx0cLtHD9TtxsK/K6eB492U2k+EVxyXU="; }; patches = [ From a51ccce2cf1c0833eea77467cc4fa1367875b0c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:51 +0200 Subject: [PATCH 424/752] python3Packages.pyodbc: 4.0.35 -> 4.0.39 --- pkgs/development/python-modules/pyodbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index d3e7faf03cd3..d8cf1f260da2 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.35"; + version = "4.0.39"; format = "setuptools"; disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - hash = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; + hash = "sha256-5Si7cN1tYpnuQphokl3whm4+kZx3K57/ecjheSDY8RY="; }; nativeBuildInputs = [ From 1aaa38a854a45c6f4897cc4780b043d278352075 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:51 +0200 Subject: [PATCH 425/752] python3Packages.pyopenuv: 2023.02.0 -> 2023.08.0 --- pkgs/development/python-modules/pyopenuv/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 3c7010965785..0b36f9b73544 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2023.02.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,16 +23,10 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EiTTck6hmOGSQ7LyZsbhnH1zgkH8GccejLdJaH2m0F8="; + hash = "sha256-6JYYkEH873beEQf2agAF85YLSb7+n0UVzIuRz3amXpU="; }; patches = [ - # Remove asynctest, https://github.com/bachya/pyopenuv/pull/108 - (fetchpatch { - name = "remove-asynctest.patch"; - url = "https://github.com/bachya/pyopenuv/commit/af15736b0d82ef811c3f380f5da32007752644fe.patch"; - hash = "sha256-5uQS3DoM91mhfyxLTNii3JBxwXIDK4/GwtadkVagjuw="; - }) # This patch removes references to setuptools and wheel that are no longer # necessary and changes poetry to poetry-core, so that we don't need to add # unnecessary nativeBuildInputs. From 1916d387bdb02bf0cba668bd5d526722f0c2c2c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:51 +0200 Subject: [PATCH 426/752] python3Packages.pyparted: 3.12.0 -> 3.13.0 --- pkgs/development/python-modules/pyparted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index b8c0812cfbaa..4d473ae094d8 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.12.0"; + version = "3.13.0"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; - rev = "v${version}"; - hash = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU="; }; postPatch = '' From 3a53f480b4a37f4db1759b0b609a66d133041533 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:51 +0200 Subject: [PATCH 427/752] python3Packages.pypdf: 3.15.1 -> 3.16.0 --- pkgs/development/python-modules/pypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 585d12e8fb04..df58a17aee20 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "3.15.1"; + version = "3.16.0"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-0KMZnMIeTkra2Il4HGDBtm8HLP8zpMXgUD4V5U5fYy0="; + hash = "sha256-vE5ujknMpufBuwWqtjkLegTRe4eDAvBVPCVM6It2pHQ="; }; outputs = [ From caac0fd9f33c79095ec014dbf6dd69442f3330a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:52 +0200 Subject: [PATCH 428/752] python3Packages.pyperf: 2.5.0 -> 2.6.1 --- pkgs/development/python-modules/pyperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index e6ae36f0cf8a..fc87620c6b9c 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.5.0"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-n9m+W1ciTmi1pbiPcSbxW2yGZ1c/YqCjn68U1v3ROQk="; + hash = "sha256-Fxrqabjv3mEhDlEhZth2Tndlqcdni3aAUhdLAfNJ8kc="; }; patches = [ From 48fce432fd30df092e4f338d39c5481cc7deb40c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:52 +0200 Subject: [PATCH 429/752] python3Packages.pyproject-api: 1.5.4 -> 1.6.1 --- pkgs/development/python-modules/pyproject-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 6cbef5b8a77f..4ba62fc1e310 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.5.4"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; rev = "refs/tags/${version}"; - hash = "sha256-HX+5BypfEOfQ3vg3vha0QCVrEarjMu/Q8id+xgmWGfA="; + hash = "sha256-XQD+36NP2zKUp/QRlgKhwzfMYBh6GVlCYXURXs2qeO8="; }; outputs = [ From 400f9d1355cdeecad5d52c6138fbe770e677331e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:52 +0200 Subject: [PATCH 430/752] python3Packages.pyqtgraph: 0.12.2 -> 0.13.3 --- .../python-modules/pyqtgraph/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 2b7b4a1377a7..9e8a876213e8 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -10,7 +10,7 @@ , pytestCheckHook , freefont_ttf , makeFontsConf -, fetchpatch +, setuptools }: let @@ -20,21 +20,18 @@ let in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.12.2"; + version = "0.13.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "pyqtgraph"; repo = "pyqtgraph"; - rev = "pyqtgraph-${version}"; - sha256 = "093kkxwj75nb508vz7px4x7lxrwpaff10pl15m4h74hjwyvbsg3d"; + rev = "refs/tags/pyqtgraph-${version}"; + hash = "sha256-kFTNhv8pgIRSJX0ePmp1I0+MGfCaW8b86baIYZ2bZQM="; }; - # TODO: remove when updating to 0.12.3 - patches = [ - (fetchpatch { - url = "https://github.com/pyqtgraph/pyqtgraph/commit/2de5cd78da92b48e48255be2f41ae332cf8bb675.patch"; - sha256 = "1hy86psqyl6ipvbg23zvackkd6f7ajs6qll0mbs0x2zmrj92hk00"; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -53,6 +50,11 @@ buildPythonPackage rec { export FONTCONFIG_FILE=${fontsConf} ''; + pytestFlagsArray = [ + # we only want to run unittests + "tests" + ]; + disabledTests = lib.optionals (!stdenv.hostPlatform.isx86) [ # small precision-related differences on other architectures, # upstream doesn't consider it serious. From 5c6cdad5fdf724168782cbab59c005a0744bb984 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:52 +0200 Subject: [PATCH 431/752] python3Packages.pyrate-limiter: 2.10.0 -> 3.1.0 --- pkgs/development/python-modules/pyrate-limiter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix index 3aa0d42e2d50..0b3218e190a4 100644 --- a/pkgs/development/python-modules/pyrate-limiter/default.nix +++ b/pkgs/development/python-modules/pyrate-limiter/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pyrate-limiter"; - version = "2.10.0"; + version = "3.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "vutran1710"; repo = "PyrateLimiter"; - rev = "v${version}"; - hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0="; + rev = "refs/tags/v${version}"; + hash = "sha256-WL+nNk68NaK36Lwalj23ugiSuB5acSLumLJGQaXE06A="; }; nativeBuildInputs = [ From c49213b94a18b2d06e9e45dd7562b96d6cd91bf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:52 +0200 Subject: [PATCH 432/752] python3Packages.pyreadstat: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/pyreadstat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 808b0e5428e9..1f616e00acbe 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, cython +, cython_3 , fetchFromGitHub , libiconv , pandas @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,11 +22,11 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-CvovylOTTyXm0ucTwNSFZzkcA0H8H76BSg4vjB2Pe4M="; + hash = "sha256-Rd2nHsEYfr1I5gu2+iXIdHKvF/QgMD+vK6SIK/ytrmo="; }; nativeBuildInputs = [ - cython + cython_3 ]; buildInputs = [ From 6ba0fd1f851a95ee36efbb7604211d25d09c1bf1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:52 +0200 Subject: [PATCH 433/752] python3Packages.pyrevolve: 2.2.2 -> 2.2.3 --- .../python-modules/pyrevolve/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index 754baf91ad38..d60b2164051c 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -2,17 +2,18 @@ , buildPythonPackage , fetchFromGitHub , contexttimer +, setuptools , versioneer , cython , numpy -, pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pyrevolve"; - version = "2.2.2"; - format = "setuptools"; + version = "2.2.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,12 +21,18 @@ buildPythonPackage rec { owner = "devitocodes"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JLDn3WEBcdO8YYzt/MWOHB/1kcmbmZUsiH00/4Uwlxo="; + hash = "sha256-z1G8DXG06Capd87x02zqrtYyBrX4xmJP94t4bgaR2PE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace ', "flake8"' "" + ''; + nativeBuildInputs = [ - versioneer cython + setuptools + versioneer ]; propagatedBuildInputs = [ @@ -33,12 +40,12 @@ buildPythonPackage rec { numpy ]; - nativeCheckInputs = [ pytest ]; - # Using approach bellow bcs the tests fail with the pytestCheckHook, throwing the following error - # ImportError: cannot import name 'crevolve' from partially initialized module 'pyrevolve' - # (most likely due to a circular import) - checkPhase = '' - pytest + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -rf pyrevolve ''; pythonImportsCheck = [ From 005547808cb51d12d337baafdc101cb05ff4cab3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:52 +0200 Subject: [PATCH 434/752] python3Packages.pyscard: 2.0.2 -> 2.0.7 --- .../python-modules/pyscard/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 106fa03a082b..cfa2f64c38b3 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchpatch, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ lib +, stdenv +, fetchPypi +, buildPythonPackage +, swig +, pcsclite +, PCSC +}: let # Package does not support configuring the pcsc library. @@ -6,23 +13,14 @@ let in buildPythonPackage rec { - version = "2.0.2"; + version = "2.0.7"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e"; + hash = "sha256-J4BUUl+nX76LEEYNh+3NA6cK2U1oixE0Xkc5mH+Fwb8="; }; - patches = [ - # present in master - remove after 2.0.2 - (fetchpatch { - name = "darwin-typo-test-fix.patch"; - url = "https://github.com/LudovicRousseau/pyscard/commit/ce842fcc76fd61b8b6948d0b07306d82ad1ec12a.patch"; - sha256 = "0wsaj87wp9d2vnfzwncfxp2w95m0zhr7zpkmg5jccn06z52ihis3"; - }) - ]; - postPatch = if withApplePCSC then '' substituteInPlace smartcard/scard/winscarddll.c \ --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ From 32bdae47e32e28a77cdb024ef134ee491925d1d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 435/752] python3Packages.pysensibo: 1.0.33 -> 1.0.35 --- pkgs/development/python-modules/pysensibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 0d79ed311625..603800f9a169 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.33"; + version = "1.0.35"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A7IzAIV8dQVSmYTEp9yeySQ8eXnLFVkiuWFS3pe2YTA="; + hash = "sha256-E3XUQ7Ltu9zhjWVvl1LN+UUz8B2dAjLa0CZI9ca35nc="; }; propagatedBuildInputs = [ From dbb914c153b54463be096bbe6b401e3b3f7a9662 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 436/752] python3Packages.pysnooz: 0.8.6 -> 0.10.0 --- pkgs/development/python-modules/pysnooz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix index dd8d6ea4fcde..4ff2513685f6 100644 --- a/pkgs/development/python-modules/pysnooz/default.nix +++ b/pkgs/development/python-modules/pysnooz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pysnooz"; - version = "0.8.6"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AustinBrunkhorst"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; + hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0="; }; postPatch = '' From d9bdd2ae56d9e230d5002ff6c19581c482c7b02b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 437/752] python3Packages.pyspnego: 0.8.0 -> 0.9.2 --- pkgs/development/python-modules/pyspnego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index c553b6242b2a..910796165340 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.8.0"; + version = "0.9.2"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3nFxUu2P8dGt80HRGYOliGHXLrtc83C96kJW27CgXV0="; + hash = "sha256-A0vVpEI8TKelZ96dIqSc01SX1gU3pDUVSOV6jap2WtU="; }; propagatedBuildInputs = [ From 782f32aab1792f2a093e317c0dfa21dd68211603 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 438/752] python3Packages.pysptk: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/pysptk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index 4051dc789d3c..e1d3a631549d 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysptk"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZchBqagUn26vGmUc3+5S57mnQQ2/4vqOz00DUUF1+U="; + hash = "sha256-dFqNWJRDDTlvveZVv3WWUi+KJ8sey4N0qRuBcqmkWIM="; }; PYSPTK_BUILD_VERSION = 0; From 99f89c6f077d0414fc3eca9195e3d0a67c0df74c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 439/752] python3Packages.pystemd: 0.10.0 -> 0.13.2 --- pkgs/development/python-modules/pystemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index ed282f06b2a1..dcaeb3355bfa 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -10,10 +10,10 @@ buildPythonPackage rec { pname = "pystemd"; - version = "0.10.0"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; + hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; }; disabled = python.pythonOlder "3.4"; From 8b525ed28bc04d5771808d45e78e6200e09d485e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 440/752] python3Packages.pytensor: 2.11.3 -> 2.16.1 --- pkgs/development/python-modules/pytensor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index a3257131ac1a..65a7fcfadaa6 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.11.3"; + version = "2.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = pname; rev = "refs/tags/rel-${version}"; - hash = "sha256-4GDur8S19i8pZkywKHZUelmd2e0jZmC5HzF7o2esDl4="; + hash = "sha256-GP1sL2cqZ8ucrCpigwR7HxgeQT+RnZjIIt7gx/3GtIE="; }; nativeBuildInputs = [ From 02e5d97774cc6b802ea17e97f5f5059fa37eca5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 441/752] python3Packages.pytest-ansible: 3.2.1 -> 4.1.0 --- pkgs/development/python-modules/pytest-ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 0b941d9be607..4fbfb942edda 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "3.2.1"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ansible"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fSerRbd7QeEdTfyy2lVLq7FKHWWT0MlutonunHhM5M4="; + hash = "sha256-TV/dR4eTiwjrgamwRCig10acaf3MpAzLu0fHF0V2pzw="; }; postPatch = '' From 36dcb1cc14ccb638ec4ed4a1de25b2910363d1e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:53 +0200 Subject: [PATCH 442/752] python3Packages.pytest-check: 2.1.4 -> 2.2.1 --- pkgs/development/python-modules/pytest-check/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 1f11f31e2139..d8a188af25de 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.1.4"; + version = "2.2.1"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; + pname = "pytest_check"; + inherit version; + hash = "sha256-3rN/iB36DV4kbymWI4rvdFp5ANezUjp0FgV3K4osSVI="; }; nativeBuildInputs = [ From 09cd7a67f0a223113cb9fd13339adffb91634041 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:54 +0200 Subject: [PATCH 443/752] python3Packages.pytest-console-scripts: 1.3.1 -> 1.4.1 --- .../python-modules/pytest-console-scripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 1cf1db5fe1a8..5170a7a902ac 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.3.1"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XGw9qunPn77Q5lUHISiThgAZPcACpc8bGHJIZEugKFc="; + hash = "sha256-WoJu2EzAr6IC655EOB19di973ajgwj+feafx9Ez0qJU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From dafe44f96fbcdb125bfd02efd7fd2b8b8119839f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:54 +0200 Subject: [PATCH 444/752] python3Packages.pytest-doctestplus: 0.12.1 -> 1.0.0 --- .../python-modules/pytest-doctestplus/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index b3f445cad431..d4f5a3c5c5ab 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, numpy , packaging , pytest , pytestCheckHook @@ -11,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.12.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-epeeS+mdkRbgesBmxfANRfOHZ319d5877zDG/6jHkYE="; + hash = "sha256-9lBEDcrt4T7W19pzv7SsWF1AqAREujVC0+buzbJ11J8="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + numpy pytestCheckHook ]; From 03202a701b69cb5dc2120b12a8da07115651a3f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:54 +0200 Subject: [PATCH 445/752] python3Packages.pytest-env: 0.8.2 -> 1.0.1 --- pkgs/development/python-modules/pytest-env/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 1d03413290a7..92ed531c6fbf 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "0.8.2"; + version = "1.0.1"; format = "pyproject"; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-uu2bO2uud711uSOODtHuaQOkKAaunWrv+4dUzVWE1P8="; + hash = "sha256-YD/iFujgOl0TSYnLQTF8Waq+8BPSJQxxuGSrB5j75vY="; }; nativeBuildInputs = [ From 68986c9666164df42690a4317e25465a3a44ee74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:54 +0200 Subject: [PATCH 446/752] python3Packages.pytest-html: 3.2.0 -> 4.0.2 --- .../python-modules/pytest-html/default.nix | 68 ++++++++++++++++--- 1 file changed, 57 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index f5b20cb1b508..3375a7a0a0bd 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -1,19 +1,65 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, pytest, pytest-metadata, setuptools-scm }: - -buildPythonPackage rec { +{ lib +, buildNpmPackage +, buildPythonPackage +, fetchPypi +, pythonOlder +, hatch-vcs +, hatchling +, jinja2 +, pytest +, pytest-metadata +}: +let pname = "pytest-html"; - version = "3.2.0"; - disabled = pythonOlder "3.6"; + version = "4.0.2"; src = fetchPypi { - inherit pname version; - hash = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; + pname = "pytest_html"; + inherit version; + hash = "sha256-iGgrno5ROSRyVGpwohObJ9a8GDSkr9PkHaM8nZ+R5KQ="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytest-metadata ]; + web-assets = buildNpmPackage { + pname = "${pname}-web-assets"; + inherit version src; + + npmDepsHash = "sha256-aRod+SzVSb4bqEJzthfl/mH+DpbIe+j2+dNtrrhO2xU="; + + installPhase = '' + runHook preInstall + + install -Dm644 src/pytest_html/resources/{app.js,style.css} -t $out/lib + + runHook postInstall + ''; + }; +in + +buildPythonPackage { + inherit pname version src; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + buildInputs = [ pytest web-assets ]; + propagatedBuildInputs = [ jinja2 pytest-metadata ]; + + env.HATCH_BUILD_NO_HOOKS = true; + + preBuild = '' + install -Dm644 ${web-assets}/lib/{app.js,style.css} -t src/pytest_html/resources + ''; + + # tests require network access + doCheck = false; + + pythonImportsCheck = [ + "pytest_html" + ]; meta = with lib; { description = "Plugin for generating HTML reports"; From cf0a993ed96584fd138b2a6ec92cf30e438985d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:54 +0200 Subject: [PATCH 447/752] python3Packages.pytest-httpbin: 1.0.2 -> 2.0.0 --- .../python-modules/pytest-httpbin/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index edfc988cc6c3..c56c34dff574 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - version = "1.0.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kevin1024"; repo = "pytest-httpbin"; - rev = "v${version}"; - hash = "sha256-S4ThQx4H3UlKhunJo35esPClZiEn7gX/Qwo4kE1QMTI="; + rev = "refs/tags/v${version}"; + hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4="; }; buildInputs = [ @@ -32,12 +32,6 @@ buildPythonPackage rec { six ]; - preCheck = '' - # Remove assertion that doesn't hold for Flask 2.1.0 - substituteInPlace tests/test_server.py \ - --replace "assert response.headers['Location'].startswith('https://')" "" - ''; - nativeCheckInputs = [ pytestCheckHook requests From 941d0e5e4af9a188377489cd9f022694ea7caaac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:54 +0200 Subject: [PATCH 448/752] python3Packages.pytest-httpx: 0.22.0 -> 0.25.0 --- pkgs/development/python-modules/pytest-httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index da22eea8d7f1..dbcfafc0a5fe 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.22.0"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-J5Y5G3/8d9hAtDFqweqA73amnXUpPbmb0uTrCslpl9k="; + hash = "sha256-8cuXsHyS9OaYXzKXgwan+mBFocyr39B9G8wr8I1pmg4="; }; nativeBuildInputs = [ From e74229e20d4f5ab0ba32a32ddaa2d2e38f9c13a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:54 +0200 Subject: [PATCH 449/752] python3Packages.pytest-jupyter: 0.6.2 -> 0.7.0 --- pkgs/development/python-modules/pytest-jupyter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index f9e49cf09144..6f5f6484a570 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -22,14 +22,14 @@ let self = buildPythonPackage rec { pname = "pytest-jupyter"; - version = "0.6.2"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pytest-jupyter"; rev = "refs/tags/v${version}"; - hash = "sha256-kY4QHrlj0opEBywe4SpwE4Ck6l6JIzEosx6uuXh+yCQ="; + hash = "sha256-ZocpIBHnXTvQdjWU8yVhGK49I+FFct+teDhghiMnvW0="; }; nativeBuildInputs = [ From 0822b5e14c3e02e77de548adab7b98be1190b7e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:55 +0200 Subject: [PATCH 450/752] python3Packages.pytest-localserver: 0.7.1 -> 0.8.0 --- .../development/python-modules/pytest-localserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 23ac11d84ad0..4ab9c74be35e 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-53tGVVy0OJMdIZxUvPn1lTwEB9ZFQ2pgK1cwur/T/js="; + hash = "sha256-XZDOfQhddB51n6hU29LnxbVXMh1pUXmJTrQOIQ6i/zA="; }; propagatedBuildInputs = [ From 8cca84acde30eae8b527d832a058a04dccf94371 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:55 +0200 Subject: [PATCH 451/752] python3Packages.pytest-mypy-plugins: 1.11.1 -> 3.0.0 --- .../pytest-mypy-plugins/default.nix | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 4c041ce40c89..f4c809218fb0 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage -, chevron , decorator , fetchFromGitHub +, jinja2 +, jsonschema , mypy +, packaging , pytest , pytestCheckHook , pythonOlder , pyyaml , regex +, tomlkit }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.11.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +25,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UlNjqloAl0Qmy3EQ73e+KmsHeJN3eBkkBJxCehpOs48="; + hash = "sha256-kIA2tVOsKsav4tRqZiWCMcRgbRnxAEo7SpmxC2pt9B0="; }; buildInputs = [ @@ -30,11 +33,18 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - chevron - pyyaml - mypy decorator + jinja2 + jsonschema + mypy + packaging + pyyaml regex + tomlkit + ]; + + pythonImportsCheck = [ + "pytest_mypy_plugins" ]; nativeCheckInputs = [ @@ -46,16 +56,8 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - pythonImportsCheck = [ - "pytest_mypy_plugins" - ]; - - disabledTests = [ - # ...TypecheckAssertionError: Invalid output: - "with_out" - "add_mypypath_env_var_to_package_searc" - "error_case" - "skip_if_false" + disabledTestPaths = [ + "pytest_mypy_plugins/tests/test_explicit_configs.py" ]; meta = with lib; { From 523c7f3f72cfbd49d2841caaa78336cbc356bf71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:55 +0200 Subject: [PATCH 452/752] python3Packages.pytest-param-files: 0.3.4 -> 0.6.0 --- .../pytest-param-files/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index 80dea1dbeaad..55923b5ed266 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -2,30 +2,38 @@ , buildPythonPackage , fetchFromGitHub , flit-core +, ruamel-yaml , pytest , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-param-files"; - version = "0.3.4"; + version = "0.6.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; - rev = "v${version}"; - hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; + rev = "refs/tags/v${version}"; + hash = "sha256-hgEEfKf9Kmah5WDNHoFWQJKLOs9Z5BDHiebXCdDc1zE="; }; - format = "pyproject"; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; buildInputs = [ pytest ]; - pythonImportsCheck = [ "pytest_param_files" ]; + propagatedBuildInputs = [ + ruamel-yaml + ]; + + pythonImportsCheck = [ + "pytest_param_files" + ]; nativeCheckInputs = [ pytestCheckHook From 61512ce32263225c9f6201375851b69795e15ef9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:55 +0200 Subject: [PATCH 453/752] python3Packages.pytest-regressions: 2.4.2 -> 2.5.0 --- .../development/python-modules/pytest-regressions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index a9e56d3c43e2..e804a0482dc1 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6riee6SqM5vf4HsxBH6OanCx54RudKi7/DGliNAecwM="; + hash = "sha256-gYx4hMHP87q/ie67AsvCezB4VrGYVCfCTVLLgSoQb9k="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 14c07be8c97ccf0c96920adffe6588802ff3d10b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:55 +0200 Subject: [PATCH 454/752] python3Packages.python-arango: 7.5.7 -> 7.6.2 --- .../python-modules/python-arango/default.nix | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index e9224b543b57..20a4819948ad 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -1,15 +1,24 @@ { lib -, arangodb , buildPythonPackage , fetchFromGitHub , pythonOlder , pytestCheckHook -, pyjwt -, pytest -, mock + +# build-system +, setuptools +, setuptools-scm + +# dependencies +, urllib3 , requests , requests-toolbelt -, setuptools +, pyjwt +, importlib-metadata +, packaging + +# tests +, arangodb +, mock }: let @@ -23,8 +32,8 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.5.7"; - format = "setuptools"; + version = "7.6.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,14 +41,24 @@ buildPythonPackage rec { owner = "ArangoDB-Community"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-cd2xE5rYLl3NOv/DZjmHRPCe224k4XyPjo9aXV1ZhvU="; + hash = "sha256-1n+3Rl945NQ3Ugd6UKhN429vTz1ky2Qr43fI0TrgrBU="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ + importlib-metadata requests requests-toolbelt + packaging pyjwt setuptools + urllib3 ]; nativeCheckInputs = [ From f26665e052eeebed4c69af67575d9f014c6faa22 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:55 +0200 Subject: [PATCH 455/752] python3Packages.python-dbusmock: 0.28.7 -> 0.29.1 --- pkgs/development/python-modules/python-dbusmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index f350f6df619b..acb47fceb8b1 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -20,13 +20,13 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.28.7"; + version = "0.29.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AxRgoXPiFFFHQSj5/jU55hwWzHtutfjmD2IKGxYwd0A="; + hash = "sha256-sfvVLPTSTXjwyB0a2NyDIONv01FXZ40nHZwwo3oqI90="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9a30d9d644ffc6f466cb3a95cd9e7cce53894a79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 03:18:40 +0200 Subject: [PATCH 456/752] python311Packages.simple-websocket: propagate wsproto Packaged as a dependency for python-engineio. --- pkgs/development/python-modules/simple-websocket/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/simple-websocket/default.nix b/pkgs/development/python-modules/simple-websocket/default.nix index ecb480359912..fd835f2fd1a3 100644 --- a/pkgs/development/python-modules/simple-websocket/default.nix +++ b/pkgs/development/python-modules/simple-websocket/default.nix @@ -24,9 +24,12 @@ buildPythonPackage rec { wheel ]; + propagatedBuildInputs = [ + wsproto + ]; + nativeCheckInputs = [ pytestCheckHook - wsproto ]; pythonImportsCheck = [ From 5a655c1ca15b5c9f37b9fe899605eb76adf629be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:56 +0200 Subject: [PATCH 457/752] python3Packages.python-engineio: 4.6.1 -> 4.7.1 --- .../python-engineio/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 9a0269c983f0..990cbd1be317 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -10,13 +10,14 @@ , pytestCheckHook , pythonOlder , requests +, simple-websocket , tornado , websocket-client }: buildPythonPackage rec { pname = "python-engineio"; - version = "4.6.1"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +26,21 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-za2JY5Gu9MEqi3W1zxcuwYiJ5XLc43ig6Hdx/4JwDbY="; + hash = "sha256-jHXpPnrQlIpmQ2sY4y6AUx/6W8Pf+683s4NmmlwZO58="; + }; + + propagatedBuildInputs = [ + simple-websocket + ]; + + passthru.optional-dependencies = { + client = [ + requests + websocket-client + ]; + asyncio_client = [ + aiohttp + ]; }; nativeCheckInputs = [ From 350d8573704ebe81b5dc5b11e547a39476d8b1b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:56 +0200 Subject: [PATCH 458/752] python3Packages.python-lzo: 1.14 -> 1.15 --- .../python-modules/python-lzo/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix index 38a31fbb6cb6..e3f1b0922a6a 100644 --- a/pkgs/development/python-modules/python-lzo/default.nix +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage, lzo, nose }: +{ lib, fetchPypi, buildPythonPackage, lzo, pytestCheckHook, setuptools, wheel }: buildPythonPackage rec { pname = "python-lzo"; - version = "1.14"; + version = "1.15"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "83cbd8ecaae284735250e31d6c0ecc18ac08763fab2a8c910dc5a6910db6250c"; + hash = "sha256-pXqqAMXDoFFd2fdCa6LPYBdn3BncAj2LmdShOwoye0k="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ lzo ]; - propagatedBuildInputs = [ ]; - nativeCheckInputs = [ nose ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "lzo" + ]; meta = with lib; { homepage = "https://github.com/jd-boyd/python-lzo"; description = "Python bindings for the LZO data compression library"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.jbedo ]; }; } From 2a061052b8e6beb3ba4b91273567b4af7af496e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:56 +0200 Subject: [PATCH 459/752] python3Packages.python-multipart: 0.0.5 -> 0.0.6 --- .../python-modules/python-multipart/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 9078f41aeaca..3c04398e56d4 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , pytestCheckHook , mock , pyyaml @@ -9,14 +10,19 @@ buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.5"; - format = "setuptools"; + version = "0.0.6"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"; + pname = "python_multipart"; + inherit version; + hash = "sha256-6ZJagLtmhSnxtnx/2wpdrN18v8b7C/8+pEP+Ir3WITI="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ six ]; From 82fa131cfeeed1be063fa04738e55fe0dc47d493 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:56 +0200 Subject: [PATCH 460/752] python3Packages.python-ndn: 0.3-3 -> 0.4.1 --- pkgs/development/python-modules/python-ndn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 4f7307f155e0..42dd1a6e04db 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "python-ndn"; - version = "0.3-3"; + version = "0.4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "named-data"; repo = pname; - rev = "v${version}"; - hash = "sha256-XS71oIydyLYtx6OQGO5NrhjVSyZxnhufrZ1y/6TffPo="; + rev = "refs/tags/v${version}"; + hash = "sha256-ArTP4LQu7VNjI/N13gMTc1SDiNmW5l4GdLYOk8JEfKg="; }; disabled = pythonOlder "3.9"; From 8d9d70f792842e4b4416b726f109edab71c6f144 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:57 +0200 Subject: [PATCH 461/752] python3Packages.python-osc: 1.8.1 -> 1.8.3 --- pkgs/development/python-modules/python-osc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index 27a5a084fa45..500e6beb0b0e 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.8.1"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - hash = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; + hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo="; }; pythonImportsCheck = [ "pythonosc" ]; From a04a8cdc9afe6ad3ff3cc8c0563c7f3a568d338c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:57 +0200 Subject: [PATCH 462/752] python3Packages.python-socks: 2.1.1 -> 2.4.2 --- pkgs/development/python-modules/python-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 4cb8273b78bc..c6b59b0ac985 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.1.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.6.2"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-QvUuCS8B/6+dgzWrflizLfNlAUeOPpUPtmFaE6LGYGc="; + hash = "sha256-HnZrnsxPmRJzrvJbKS5r+di+msykDwWS7TB5CitIve8="; }; propagatedBuildInputs = [ From b7b3a244a202ae9086366d80df8af28702aa90f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:57 +0200 Subject: [PATCH 463/752] python3Packages.python-tado: 0.16.0 -> 0.17.2 --- pkgs/development/python-modules/python-tado/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 97e6215f1d9d..017be9041dc1 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -6,9 +6,9 @@ , requests }: -buildPythonPackage { +buildPythonPackage rec { pname = "python-tado"; - version = "0.16.0"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage { owner = "wmalgadey"; repo = "PyTado"; # https://github.com/wmalgadey/PyTado/issues/62 - rev = "674dbc450170a380e76460c22d6ba943dfedb8e9"; - hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; + rev = "refs/tags/${version}"; + hash = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; }; propagatedBuildInputs = [ From 42cbf4d4ec6cf01137d8a3d2d01c8e002dc82048 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:57 +0200 Subject: [PATCH 464/752] python3Packages.python-telegram: 0.15.0 -> 0.18.0 --- pkgs/development/python-modules/python-telegram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram/default.nix b/pkgs/development/python-modules/python-telegram/default.nix index a79362a93422..405f74bebda8 100644 --- a/pkgs/development/python-modules/python-telegram/default.nix +++ b/pkgs/development/python-modules/python-telegram/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-telegram"; - version = "0.15.0"; + version = "0.18.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Na2NIiVgYexKbEqjN58hfkgxwFdCTL7Z7D3WEhL4wXA="; + hash = "sha256-UbJW/op01qe/HchfJUlBPBY9/W8NbZkEmFM8gZ5+EmI="; }; patches = [ From ac412b5208135ea134bde30ae1c1050228a83c42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:57 +0200 Subject: [PATCH 465/752] python3Packages.pytorch-pfn-extras: 0.6.4 -> 0.7.2 --- .../development/python-modules/pytorch-pfn-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 3bd169bc1af8..138dc5f502fa 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.4"; + version = "0.7.2"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; + hash = "sha256-juoLw/qfq4YF7opyR7cTYCVzUa9pXVvQnvGntcQhBr4="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; From 660c9c2c486ab6d2e466a853a5ad58c67a85d0a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:58 +0200 Subject: [PATCH 466/752] python3Packages.pytz: 2023.3 -> 2023.3.post1 --- pkgs/development/python-modules/pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index ad4f76baf667..8d4bcfbb3c6f 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytz"; - version = "2023.3"; + version = "2023.3.post1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-HYzinbGJGR+1UzjubQOH2Cq1nz0A6sEDQS1k4OvQxYg="; + hash = "sha256-e0/dvrlKHrpLVX2iTxn9+dtXUZJUQnCpEB2FCfn0PXs="; }; nativeCheckInputs = [ unittestCheckHook ]; From 5f9c9bb64a0ad00260f3183a2bee8e96282fca37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:58 +0200 Subject: [PATCH 467/752] python3Packages.pyvis: 0.2.1 -> 0.3.1 --- pkgs/development/python-modules/pyvis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index c4698744531b..de025a845725 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyvis"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "WestHealth"; repo = pname; - rev = "v${version}"; - hash = "sha256-cER5XYxnURzRLtrisWBu2kxtOiRqgaRTJYyaCMh2qqE="; + rev = "refs/tags/v${version}"; + hash = "sha256-h5in3759thWRlI8ubXUbrSuDtp1v/obmpUBZvOYk734="; }; patches = [ From 408198ed921c81c85ac9a97e1dec2eee84f0f943 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:58 +0200 Subject: [PATCH 468/752] python3Packages.pyvo: 1.4 -> 1.4.2 --- pkgs/development/python-modules/pyvo/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 72801ee30690..4498b4f15090 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -14,23 +14,15 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.4"; + version = "1.4.2"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; + hash = "sha256-Zv4piGWs/XJbxfGHUHctfxuImbjluxd1chUgvtV9lcs="; }; - patches = [ - # Backport Python 3.11 support. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/astropy/pyvo/pull/385.patch"; - sha256 = "IHf3W9fIT8XFvyM41PUiJkt1j+B3RkX3TS4FOnRUMDk="; - }) - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ From c4ec6233a02ea01e741a841bb0707aaf578c4afd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:58 +0200 Subject: [PATCH 469/752] python3Packages.pywebview: 4.1 -> 4.3.3 --- pkgs/development/python-modules/pywebview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 84e2a3f64442..04df94d137ef 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "4.1"; + version = "4.3.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-oqyWT0GaZ201OMVRcRpm1dma6NonTMmTx5SKnjzQl3M="; + hash = "sha256-8BkbO7C8cYDIQWWCKaXFjfD45L5KVG1tDZJl+uW5g9g="; }; nativeBuildInputs = [ From 8e8db8cdbb5a95d7e22302269f5a6fd5cb19ee04 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:58 +0200 Subject: [PATCH 470/752] python3Packages.pyyaml-include: 1.3 -> 1.3.1 --- .../python-modules/pyyaml-include/default.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix index 92ec25186f50..176d402e99c1 100644 --- a/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/pkgs/development/python-modules/pyyaml-include/default.nix @@ -1,25 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchFromGitHub , pytestCheckHook , pyyaml +, setuptools , setuptools-scm -, setuptools-scm-git-archive -, toml +, wheel }: buildPythonPackage rec { pname = "pyyaml-include"; - version = "1.3"; + version = "1.3.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; + src = fetchFromGitHub { + owner = "tanbro"; + repo = "pyyaml-include"; + rev = "refs/tags/v${version}"; + hash = "sha256-xsNMIEBYqMVQp+H8R7XpFCwROXA8I6bFvAuHrRvC+DI="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ - pyyaml + setuptools setuptools-scm - setuptools-scm-git-archive - toml + wheel + ]; + + propagatedBuildInputs = [ + pyyaml ]; nativeCheckInputs = [ From 4539792fa51d926d2f044bdf1ed60b9c9d155141 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:59 +0200 Subject: [PATCH 471/752] python3Packages.pyzmq: 24.0.1 -> 25.1.1 --- pkgs/development/python-modules/pyzmq/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 74f5b3afc1d6..88fbf7d63c05 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -7,18 +7,19 @@ , pythonOlder , tornado , zeromq +, pytest-asyncio }: buildPythonPackage rec { pname = "pyzmq"; - version = "24.0.1"; + version = "25.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IW9dfbtnFmdZ5ZsEebyoK4rPm+1gFbUmuOsQFD+wjnc="; + hash = "sha256-JZwiSFtxq6zfqL95cgzXvPS50SizDqVU8BrnH9v9qiM="; }; buildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook tornado + pytest-asyncio ]; pythonImportsCheck = [ @@ -40,6 +42,9 @@ buildPythonPackage rec { pytestFlagsArray = [ "$out/${python.sitePackages}/zmq/tests/" # Folder with tests + # pytest.ini is missing in pypi's sdist + # https://github.com/zeromq/pyzmq/issues/1853#issuecomment-1592731986 + "--asyncio-mode auto" ]; disabledTests = [ From 60f4bf0be5eaf24adbe669aed6d48dce47325f5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:59 +0200 Subject: [PATCH 472/752] python3Packages.qcelemental: 0.25.1 -> 0.26.0 --- .../python-modules/qcelemental/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 7b12781ba160..191edbba7eba 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , lib , fetchPypi +, poetry-core , networkx , numpy , pint @@ -12,16 +13,20 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.25.1"; - format = "setuptools"; + version = "0.26.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4+DlP+BH0UdWcYRBBApdc3E18L2zPvsdY6GTW5WCGnQ="; + hash = "sha256-oU6FEM2/2mRe8UYcGv0C77WZMRcz27pfg/zR1haKbd0="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ networkx numpy From 420426879fa6361bfcfea1bf319b69431527e2ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:59 +0200 Subject: [PATCH 473/752] python3Packages.qcengine: 0.26.0 -> 0.28.1 --- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index abb84e1e7375..5dbcfc587561 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.26.0"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jBA3exH/qzEaKZeumvgKD0tKnDptZdlv1KykyUHs8Bg="; + hash = "sha256-ebZayF5VGHXjBFO3k2KegCNqAFygB3BXKvdvr8mF/Ss="; }; propagatedBuildInputs = [ From 729df5842ac7744d41028a27dc51f66e6ff578fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:59 +0200 Subject: [PATCH 474/752] python3Packages.qcodes: 0.39.1 -> 0.40.0 --- pkgs/development/python-modules/qcodes/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index fb70d6d1f788..2083000992bc 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -18,6 +18,7 @@ , numpy , opencensus , opencensus-ext-azure +, opentelemetry-api , packaging , pandas , pyvisa @@ -53,14 +54,14 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.39.1"; + version = "0.40.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2gJ/WeynabiGB1Z66+qaUbf6/1wogf/XjIE2mCAXUZY="; + sha256 = "sha256-C8/ltX3tSxCbbheuel3BjIkRBl/E92lK709QYx+2FL0="; }; postPatch = '' @@ -86,6 +87,7 @@ buildPythonPackage rec { numpy opencensus opencensus-ext-azure + opentelemetry-api packaging pandas pillow @@ -159,9 +161,10 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python-based data acquisition framework"; - homepage = "https://qcodes.github.io/Qcodes/"; changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; + description = "Python-based data acquisition framework"; + downloadPage = "https://github.com/QCoDeS/Qcodes"; + homepage = "https://qcodes.github.io/Qcodes/"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; }; From c903bb753213c51bc2f28370c62700fdc279ac23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:59 +0200 Subject: [PATCH 475/752] python3Packages.qcodes-loop: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/qcodes-loop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcodes-loop/default.nix b/pkgs/development/python-modules/qcodes-loop/default.nix index ee9cb180a35a..80355c1b5341 100644 --- a/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/pkgs/development/python-modules/qcodes-loop/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "qcodes-loop"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "qcodes_loop"; - hash = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM="; + hash = "sha256-TizNSC49n4Xc2BmJNziARlVXYQxp/LtwmKpgqQkQ3a8="; }; patches = [ From 1c70cc75f6404d3e41933e2c8ccf8ecc42b3c454 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:59 +0200 Subject: [PATCH 476/752] python3Packages.qdldl: 0.1.5.post3 -> 0.1.7.post0 --- pkgs/development/python-modules/qdldl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index 25d28dc4d069..8369bbf2a33d 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.5.post3"; + version = "0.1.7.post0"; src = fetchPypi { inherit pname version; - hash = "sha256-acCS9uH8I/t3moCmLm/N/i66BcklhgJIxNZ1T0c2k48="; + hash = "sha256-80ahFMg0LubU29ZHHu8xQZn7Jo0797lYhco1H94rAj8="; }; dontUseCmakeConfigure = true; From e8cd3f7dfe574906173f16e6b90b200d363b476a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:59 +0200 Subject: [PATCH 477/752] python3Packages.qiskit-aer: 0.11.2 -> 0.12.2 --- pkgs/development/python-modules/qiskit-aer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 60d5efc9e329..e774990fb999 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.11.2"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = "refs/tags/${version}"; - hash = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; + hash = "sha256-K8Avh1j9j5CGdEYIeJJRF+PjUFXvVILkZLqX1QClInE="; }; postPatch = '' From 623cc21ef99cd0951bf692227a925487e112efa7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:00 +0200 Subject: [PATCH 478/752] python3Packages.qiskit-ibmq-provider: 0.20.1 -> 0.20.2 --- .../python-modules/qiskit-ibmq-provider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 8e2de37788d3..4bf996a26507 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.20.1"; + version = "0.20.2"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BFiGMPiO9Xcl8EiTZYiwHCpo7z+tRaBkIb8GTo01rBA="; + hash = "sha256-7dIspeJpukLDfICoBPPZZWdzkVumtvh+NRxvtmnvWH0="; }; propagatedBuildInputs = [ From 33bf8f692572a49a998e4df030f3599cb63e36b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:00 +0200 Subject: [PATCH 479/752] python3Packages.qiskit-machine-learning: 0.5.0 -> 0.6.1 --- .../python-modules/qiskit-machine-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 28d572afc378..1c23fb3b0398 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.5.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; + hash = "sha256-oSLQvZGEq/nBj7ktDEq3BMk7xyYiLGpBDmKxuXtMTfs="; }; propagatedBuildInputs = [ From 501945053e698c91a8d74bc78ab7e61333d67678 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:00 +0200 Subject: [PATCH 480/752] python3Packages.qiskit-nature: 0.5.2 -> 0.6.2 --- pkgs/development/python-modules/qiskit-nature/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 629dc04bd3f4..8fc30687f69e 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.5.2"; + version = "0.6.2"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; + hash = "sha256-X/4jA/e2nmmaVEiCgd/4KJc/sAdcYDkyKzvyVztovXM="; }; propagatedBuildInputs = [ From c265663f819c1736ff9e7169c72192a7a7d66e61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:00 +0200 Subject: [PATCH 481/752] python3Packages.qiskit-terra: 0.21.0 -> 0.25.1 --- pkgs/development/python-modules/qiskit-terra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index f6c5010fbfb7..2c290493b063 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -58,15 +58,15 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.21.0"; + version = "0.25.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = version; - hash = "sha256-imktzBpgP+lq6FsVWIUK82+t76gKTgt53kPfKOnsseQ="; + rev = "refs/tags/${version}"; + hash = "sha256-4/LVKDNxKsRztCtU/mMfKMVHHJqfadZXmxeOlnlz9Tc="; }; nativeBuildInputs = [ setuptools-rust rustc cargo rustPlatform.cargoSetupHook ]; From fbe463020afdc1381d382cfacf18ff711615e8e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:00 +0200 Subject: [PATCH 482/752] python3Packages.qpsolvers: 3.4.0 -> 4.0.0 --- pkgs/development/python-modules/qpsolvers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 367416c29602..1ab12f28412c 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "3.4.0"; + version = "4.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; - rev = "v${version}"; - hash = "sha256-GrYAhTWABBvU6rGoHi00jBa7ryjCNgzO/hQBTdSW9cg="; + rev = "refs/tags/v${version}"; + hash = "sha256-KkV61pBkIh+4Qav9TVobEBUCyMa6Xqg+eygnOoQRpcQ="; }; pythonImportsCheck = [ "qpsolvers" ]; From e6130573433d174e9f1380890fdd503f88459adf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:00 +0200 Subject: [PATCH 483/752] python3Packages.rdflib: 6.2.0 -> 7.0.0 --- .../python-modules/rdflib/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index dc5ddf9cdfdb..471439b28e5c 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -4,6 +4,9 @@ , fetchFromGitHub , pythonOlder +# builds +, poetry-core + # propagates , isodate , pyparsing @@ -25,18 +28,22 @@ buildPythonPackage rec { pname = "rdflib"; - version = "6.2.0"; - format = "setuptools"; + version = "7.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "RDFLib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GkqfSyApOFKPIiIYXhgaRZuMawk7PRYmxGDhnRI+Rz0="; + hash = "sha256-VCjvgXMun1Hs+gPeqjzLXbIX1NBQ5aMLz0aWlwsm0iY="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ isodate html5lib @@ -76,6 +83,7 @@ buildPythonPackage rec { "testGuessFormatForParse" "test_infix_owl_example1" "test_context" + "test_example" "test_guess_format_for_parse" "rdflib.extras.infixowl" ] ++ lib.optionals stdenv.isDarwin [ From afc615a9b082f48d1c8c71536355644210b2517e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:01 +0200 Subject: [PATCH 484/752] python3Packages.readthedocs-sphinx-ext: 2.2.0 -> 2.2.2 --- .../python-modules/readthedocs-sphinx-ext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 0451d63cc3d1..fc2fd653083d 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; + hash = "sha256-kiF77xTZE3e88nvffaNj5XSzseQYC2Xu9ufPpV8P0Lg="; }; propagatedBuildInputs = [ requests ]; From 41e8f71396899db83c66418f1db89a8d28880ca9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:01 +0200 Subject: [PATCH 485/752] python3Packages.recipe-scrapers: 14.43.0 -> 14.46.0 --- pkgs/development/python-modules/recipe-scrapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index f2a9f17ab670..c5b7fcb88b76 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.43.0"; + version = "14.46.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-ik/ADmu6yGY7xWXCAn0kcWJphANIIwM8QKWjm9xoVYQ="; + hash = "sha256-XCcunwqmcvPC5AVxR9mit06BRDTYfu/CeTXg3IH7Dy0="; }; nativeBuildInputs = [ From eb53c4e74e6c3b765d4763a8391d3c2664c0162b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:01 +0200 Subject: [PATCH 486/752] python3Packages.redis: 4.5.4 -> 5.0.0 --- pkgs/development/python-modules/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index d99b25374a13..2616e1da9f4d 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.5.4"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + hash = "sha256-XOpsDTNcmnMypGDthynOq7TQxInHKFsKhtu/igF70SA="; }; propagatedBuildInputs = [ From b5eaf5b39eb8610fe44b1a4f116c9a0cc2e27f89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:01 +0200 Subject: [PATCH 487/752] python3Packages.redshift-connector: 2.0.911 -> 2.0.914 --- .../development/python-modules/redshift-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 1c739ebb0780..7bf21823e7bb 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.911"; + version = "2.0.914"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-D1LpFGYEpGmkYCAJbYJaQStDnol90mH8X4S6iXg6Nfs="; + hash = "sha256-fGOo9FgVMI6ayyB3EMN6RGThwWciShcBZzWTZWtOt8E="; }; # disable test coverage From 42e530b18a9d821ebf0b735fa432d2e5c500ab5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:01 +0200 Subject: [PATCH 488/752] python3Packages.reedsolo: 1.5.4 -> 1.7.0 --- .../python-modules/reedsolo/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index 65006ea823ab..a2fb336f70b4 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -1,35 +1,40 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub + +# build-system , cython -, nose +, setuptools + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "reedsolo"; - version = "1.5.4"; + version = "1.7.0"; + format = "pyproject"; # Pypi does not have the tests src = fetchFromGitHub { owner = "tomerfiliba"; repo = "reedsolomon"; - rev = "v${version}"; - hash = "sha256-GUMdL5HclXxqMYasq9kUE7fCqOkjr1D20wjd/E+xPBk="; + rev = "refs/tags/v${version}"; + hash = "sha256-nzdD1oGXHSeGDD/3PpQQEZYGAwn9ahD2KNYGqpgADh0="; }; - patches = [ - (fetchpatch { - # python3.10 compat; https://github.com/tomerfiliba/reedsolomon/pull/38 - url = "https://github.com/tomerfiliba/reedsolomon/commit/63e5bd9fc3ca503990c212eb2c77c10589e6d6c3.patch"; - hash = "sha256-47g+jUsJEAyqGnlzRA1oSyc2XFPUOfH0EW+vcOJzsxI="; - }) + nativeBuildInputs = [ + cython + setuptools ]; - nativeBuildInputs = [ cython ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ nose ]; - checkPhase = "nosetests"; + disabledTestPaths = [ + "tests/test_creedsolo.py" # TODO: package creedsolo + ]; meta = with lib; { description = "Pure-python universal errors-and-erasures Reed-Solomon Codec"; From 4e7a3d1c67b1c61fa8e7000aa2304d33302b6a01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:01 +0200 Subject: [PATCH 489/752] python3Packages.referencing: 0.30.0 -> 0.30.2 --- pkgs/development/python-modules/referencing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 37e418f3ea44..dc09aa3594a4 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.30.0"; + version = "0.30.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ let repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; + hash = "sha256-C2gKjoaMcUWz/QOsqpv4TkozQyI+zEIQf3GMf5w40aw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d9d15975ecde8a35aa8e42454d4799b997cccda9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:01 +0200 Subject: [PATCH 490/752] python3Packages.remarshal: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/remarshal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 5d2e002538c2..32916774ee36 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; - rev = "v${version}"; - hash = "sha256-FytVq9p7Yo0lS5rHj0crPIpHFjxolW8esSPkj2wLfaI="; + rev = "refs/tags/v${version}"; + hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA="; }; nativeBuildInputs = [ From 7d8ee1f015c9e63d3780d5ae926295306234d6a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:02 +0200 Subject: [PATCH 491/752] python3Packages.reolink: 0.64 -> 0053 --- pkgs/development/python-modules/reolink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 45105965cb6c..06143c2922f4 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.64"; + version = "0053"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI="; + hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I="; }; propagatedBuildInputs = [ From 0fe12af6a9db0f36f4b6fb928e267300fae87ff8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:02 +0200 Subject: [PATCH 492/752] python3Packages.reportlab: 3.6.13 -> 4.0.4 --- .../python-modules/reportlab/default.nix | 49 ++++++++++++------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 608debea5693..664d87040c45 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -3,6 +3,7 @@ , fetchPypi , freetype , pillow +, setuptools , glibcLocales , python , isPyPy @@ -12,26 +13,18 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.13"; + version = "4.0.4"; + format = "pyproject"; + + # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit + disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-b3XTP3o3IM9HNxq2PO0PDr0a622xk4aukviXegm+lhE="; + hash = "sha256-f3CztWr/XxHLQTbFGg9aVv5uTI+7rHuQMHbbmajvMcE="; }; - patches = [ - ./darwin-m1-compat.patch - ]; - - nativeCheckInputs = [ glibcLocales ]; - - buildInputs = [ ft ]; - propagatedBuildInputs = [ pillow ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" - # Remove all the test files that require access to the internet to pass. rm tests/test_lib_utils.py rm tests/test_platypus_general.py @@ -42,16 +35,34 @@ in buildPythonPackage rec { rm tests/test_graphics_charts.py ''; + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + ft + ]; + + propagatedBuildInputs = [ + pillow + ]; + + nativeCheckInputs = [ + glibcLocales + ]; + checkPhase = '' - cd tests + runHook preCheck + pushd tests LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py + popd + runHook postCheck ''; - # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit - disabled = isPyPy; - - meta = { + meta = with lib; { description = "An Open Source Python library for generating PDFs and graphics"; homepage = "http://www.reportlab.com/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From bd983dede737506bdd01911116c5f00cee336670 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:02 +0200 Subject: [PATCH 493/752] python3Packages.reproject: 0.10.0 -> 0.12.0 --- .../python-modules/reproject/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 00060c08bc2e..81ab320c77f9 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -3,8 +3,11 @@ , astropy-extension-helpers , astropy-healpix , buildPythonPackage +, cloudpickle , cython +, dask , fetchPypi +, fsspec , numpy , oldest-supported-numpy , pytest-astropy @@ -12,18 +15,19 @@ , pythonOlder , scipy , setuptools-scm +, zarr }: buildPythonPackage rec { pname = "reproject"; - version = "0.10.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; + hash = "sha256-jb4efKT5jMY0ECV+ab5rpUHEk+tT4T2MioCRxs92TbI="; }; postPatch = '' @@ -42,9 +46,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ astropy astropy-healpix + cloudpickle + dask + fsspec numpy scipy - ]; + zarr + ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ pytest-astropy @@ -65,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reproject astronomical images"; + downloadPage = "https://github.com/astropy/reproject"; homepage = "https://reproject.readthedocs.io"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; From a18337b3184d1142e1b5d7c8ef63ce038ec2f3e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:02 +0200 Subject: [PATCH 494/752] python3Packages.requests-cache: 0.9.8 -> 1.1.0 --- .../python-modules/requests-cache/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index f85d2b2debe8..1900090b09f5 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -1,23 +1,28 @@ { lib -, appdirs , attrs , buildPythonPackage , bson , boto3 , botocore , cattrs -, exceptiongroup , fetchFromGitHub , itsdangerous +, platformdirs , poetry-core +, psutil , pymongo , pytestCheckHook +, pytest-rerunfailures +, pytest-xdist , pythonOlder , pyyaml , redis , requests , requests-mock +, responses , rich +, tenacity +, time-machine , timeout-decorator , ujson , urllib3 @@ -26,7 +31,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.8"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,7 +40,7 @@ buildPythonPackage rec { owner = "requests-cache"; repo = "requests-cache"; rev = "refs/tags/v${version}"; - hash = "sha256-Xbzbwz80xY8IDPDhZEUhmmiCFJZvSQMQ6EmE4EL7QGo="; + hash = "sha256-kJqy7aK67JFtmsrwMtze/wTM9qch9YYj2eUzGJRJreQ="; }; nativeBuildInputs = [ @@ -43,10 +48,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs attrs cattrs - exceptiongroup + platformdirs requests urllib3 url-normalize @@ -78,9 +82,15 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + psutil pytestCheckHook + pytest-rerunfailures + pytest-xdist requests-mock + responses rich + tenacity + time-machine timeout-decorator ] ++ passthru.optional-dependencies.json From e8275f0d772d21094ab02c81101eca3e9ce86def Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:02 +0200 Subject: [PATCH 495/752] python3Packages.rich: 13.3.5 -> 13.5.2 --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 24a25e2756a5..c6646749730d 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rich"; - version = "13.3.5"; + version = "13.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PnyO5u0gxfYKT6xr0k3H0lbLl9wKPl6oxR1mM9A0Hys="; + hash = "sha256-ycDmFJa68OOrNqIy/hGKxbjoaIbiniiO4UAPNSyZvDk="; }; nativeBuildInputs = [ From 202b8be05b93f3d0f3dbab4635aa72752aab96b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:03 +0200 Subject: [PATCH 496/752] python3Packages.rkm-codes: 0.5 -> 0.6 --- .../development/python-modules/rkm-codes/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index ca003ed90697..0a8869052d60 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -7,27 +7,27 @@ buildPythonPackage rec { pname = "rkm-codes"; - version = "0.5"; + version = "0.6"; + format = "pyproject"; src = fetchFromGitHub { owner = "KenKundert"; repo = "rkm_codes"; - rev = "v${version}"; - hash = "sha256-r4F72iHxH7BoPtgYm1RD6BeSZszKRrpeBQccmT4wzuw="; + rev = "refs/tags/v${version}"; + hash = "sha256-CkLLZuWcNL8sqAupc7lHXu0DXUXrX3qwd1g/ekyHdw4="; }; - format = "pyproject"; nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ setuptools ]; # this has a circular dependency on quantiphy preBuild = '' - sed -i '/quantiphy/d' ./setup.py - sed -i '/pytest-runner/d' ./setup.py + sed -i '/quantiphy/d' pyproject.toml ''; # this import check will fail as quantiphy is imported by this package From 52c972b270c6d7630076284497effc38e1aceff4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:03 +0200 Subject: [PATCH 497/752] python3Packages.rlax: 0.1.5 -> 0.1.6 --- pkgs/development/python-modules/rlax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index bb7044a89d44..6793cf747b5f 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "rlax"; - version = "0.1.5"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - hash = "sha256-GRqiGacyHZpVKUqfAteMjRV4EtdHkSgfFRj/H76bBVo="; + hash = "sha256-C3nFOv/zxvAoz6WZ0RAZffzEbxIx/XrGabO4QPxrik8="; }; buildInputs = [ From 681ceb85088f93e6bf1afdf28a6daba79a07f3bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:03 +0200 Subject: [PATCH 498/752] python3Packages.rnginline: 0.0.2 -> 1.0.0 --- pkgs/development/python-modules/rnginline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rnginline/default.nix b/pkgs/development/python-modules/rnginline/default.nix index 10beaf00bd40..59014dea3943 100644 --- a/pkgs/development/python-modules/rnginline/default.nix +++ b/pkgs/development/python-modules/rnginline/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "rnginline"; - version = "0.0.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-j4W4zwHA4yA6iAFVa/LDKp00eeCX3PbmWkjd2LSUGfk="; + hash = "sha256-JWqzs+OqOynIAWYVgGrZiuiCqObAgGe6rBt0DcP3U6E="; }; patches = [ From ad300b8149f1f3d0822dfcc9d982f4fdfb4037b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:03 +0200 Subject: [PATCH 499/752] python3Packages.robotframework-databaselibrary: 1.2.4 -> 1.3.1 --- .../python-modules/robotframework-databaselibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 8dfbb32fe08d..eea465ee8fb9 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.2.4"; + version = "1.3.1"; pname = "robotframework-databaselibrary"; src = fetchPypi { inherit pname version; - sha256 = "627d872b3dda6a308a650ac9e676dadedf9c294e4ef70ad207cbb86b78eb8847"; + sha256 = "sha256-C+shwpGbiA+YS8t9ApJEv6mYQVd3fVvY3qWzDF6vYqU="; }; # unit tests are impure From ae64e774141b5ba17e5be230d9ec4657243768be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:03 +0200 Subject: [PATCH 500/752] python3Packages.robotframework: 6.0.2 -> 6.1.1 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index d5d72ac95790..122e2ff326ff 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "6.0.2"; + version = "6.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c7pPcDgqyqWQtiMbLQbQd0nAgx4TIFUFHrlBVDNdr8M="; + hash = "sha256-vtP0TVkCMrm0CRXlpZvVTBf7yd8+3p+nRArMWyQUn4k="; }; nativeCheckInputs = [ jsonschema ]; From c5a626696fe785227136ba0930370c1eb16e35f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:03 +0200 Subject: [PATCH 501/752] python3Packages.robotframework-seleniumlibrary: 6.1.0 -> 6.1.2 --- .../python-modules/robotframework-seleniumlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index fe33d2e3f6f4..114c24aa1c98 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - version = "6.1.0"; + version = "6.1.2"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iCZU+9xFUPoyucdQ/26dgxAm8jRf92P3JyA2KqV8bYI="; + sha256 = "sha256-QbAwPm1Y76KPIcHkopiyISULQSwUet021erFa/zi8Zw="; }; propagatedBuildInputs = [ From 297ec0ede2610b06702a46f80c4e8f5d320792bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:03 +0200 Subject: [PATCH 502/752] python3Packages.robotsuite: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/robotsuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 4fd25ec8067e..544beaf12072 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "robotsuite"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - hash = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas="; + hash = "sha256-sPmOoR5K+gMfyPk2QMbiDNmWPRcqKrsz6ZPBAKR/3XY="; }; propagatedBuildInputs = [ From f177e4469982428c6eba161c94239153694367fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:04 +0200 Subject: [PATCH 503/752] python3Packages.rpds-py: 0.9.2 -> 0.10.3 --- pkgs/development/python-modules/rpds-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 8b6eb61e72f6..6cd3f5dea28e 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.9.2"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-jXDo8UkA8mV8JJ6k3vljvthqKbgfgfW3a1qSFWgN6UU="; + hash = "sha256-/MHrt1YaPiSmWI98be0V2ArsIsZqBwx1dVm1exf/0cs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2LiQ+beFj9+kykObPNtqcg+F+8wBDzvWcauwDLHa7Yo="; + hash = "sha256-iWy6BHVsKsZB0SVrh3CVhryaavk4gAQVvRdu9xBiDRg="; }; nativeBuildInputs = [ From a65a59815c1e176afb9a8d46efdd06e7fe7c8e8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:04 +0200 Subject: [PATCH 504/752] python3Packages.rpy2: 3.5.12 -> 3.5.14 --- pkgs/development/python-modules/rpy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 58e38eb56294..4d0e19f513a8 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.12"; + version = "3.5.14"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-7q33lP0qpUj4hWjGodJufDgQzUp2Soeyw7MdMZQtbUU="; + hash = "sha256-X0auMdNuEXvjZq1K4CSTwBWsa6WevjtM1yAAdTMvxIE="; }; patches = [ From ada3f0ffac55c615b803d72ab0082d0619a29419 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:04 +0200 Subject: [PATCH 505/752] python3Packages.rtmixer: 0.1.1 -> 0.1.4 --- pkgs/development/python-modules/rtmixer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index 1d9b8114df7b..361ba5e7fb56 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "rtmixer"; - version = "0.1.1"; + version = "0.1.4"; disabled = isPy27; src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-rtmixer"; - rev = version; - sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y"; + rev = "refs/tags/${version}"; + sha256 = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; fetchSubmodules = true; }; From cd5311fd34eb5c5886b810ff486708e28e03cd3f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:04 +0200 Subject: [PATCH 506/752] python3Packages.sabctools: 7.0.2 -> 7.1.2 --- pkgs/development/python-modules/sabctools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index ce536c90c3d6..d20ea7318620 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "7.0.2"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 + version = "7.1.2"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AB5/McuOIDkhu7rtb3nFaqOTx3zwm92+3NEnH5HjzBo="; + hash = "sha256-wDgFXuxclmqMlRXyr9qpruJJcOXfOiOWTZXX53uYEB8="; }; pythonImportsCheck = ["sabctools"]; From 130a7db90372f3b02371e84c81ba85c6f2ce504e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:04 +0200 Subject: [PATCH 507/752] python3Packages.safetensors: 0.3.1 -> 0.3.3 --- pkgs/development/python-modules/safetensors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index 06a2c3966a2d..976d6b9b3fa8 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.3.1"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RoIBD+zBKVzXE8OpI8GR371YPxceR4P8B9T1/AHc9vA="; + hash = "sha256-U+indMoLFN6vMZkJTWFG08lsdXuK5gOfgaHmUVl6DPk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-tC0XawmKWNGCaByHQfJEfmHM3m/qgTuIpcRaEFJC6dM"; + hash = "sha256-MhRs9tFCmVZI5O0EVRUbo4ZnUVRQ0EfQTU+E1K+qKZI="; }; sourceRoot = "${src.name}/bindings/python"; From c4817e544afa3f619a6142c949a30e6dc80be8e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:05 +0200 Subject: [PATCH 508/752] python3Packages.scancode-toolkit: 31.2.6 -> 32.0.6 --- pkgs/development/python-modules/scancode-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 9c82820f8416..2affddbb6a4c 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,13 +61,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.2.6"; + version = "32.0.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VvhgXZpV58DHeY5+7nPbrbTTVuHkawFw5akbm4hPnBY="; + hash = "sha256-suqk7LOnZgSJGlaHq81LDOSCHZWdsJOUbma6MEpHxSM="; }; dontConfigure = true; From 5572b4f2371afbca80572bd42d090aa7eb86e0ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:05 +0200 Subject: [PATCH 509/752] python3Packages.scikit-bio: 0.5.8 -> 0.5.9 --- pkgs/development/python-modules/scikit-bio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 2c4920cf4c15..a1b355f1b832 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "0.5.8"; + version = "0.5.9"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; + hash = "sha256-euBE3IvuIxkAJIrcOoZZB352FA1WrJ9CvQH7eYEBSRA="; }; nativeBuildInputs = [ cython ]; From 0e1bea29dc970e5912159f001657d505d972d594 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:05 +0200 Subject: [PATCH 510/752] python3Packages.scikit-misc: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/scikit-misc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index 2cb24d76b2b9..2a988049f447 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "scikit-misc"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; src = fetchPypi { pname = "scikit_misc"; inherit version; - hash = "sha256-rBTdTpNeRC/DSrHFg7ZhHUYD0G9IgoqFx+A+LCxYK7w="; + hash = "sha256-mom0Ch+b3bViErh9ueVYiGfVz5SQUSqCCcGsBJ7+Nrg="; }; postPatch = '' From ef26a5c68afd6334d95e56786b6d951a61533e46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:05 +0200 Subject: [PATCH 511/752] python3Packages.scikit-rf: 0.28.0 -> 0.29.0 --- pkgs/development/python-modules/scikit-rf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 6940859b9f6a..130e56896e31 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.28.0"; + version = "0.29.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cTvWNfIs2bAOYpXDg6ghZA4tRXlaNbUZwcaZMjCi/YY="; + hash = "sha256-rBOw1rIEF8Ia6xXlXxVzRRiUxrOjOAlipFuKiL+gRl0="; }; buildInputs = [ From 4a0b4ffced45375e619fd4141ce588b10166abda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:05 +0200 Subject: [PATCH 512/752] python3Packages.scikit-survival: 0.20.0 -> 0.21.0 --- pkgs/development/python-modules/scikit-survival/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 7e2b8bf8bfd9..b2c4218e5f33 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw="; + hash = "sha256-rcdEtlmD3O2BQuwxRlOJ/HOEBdWJBRJR5UR6rZoeArw="; }; nativeBuildInputs = [ From 7410aaaa0bd98d6107a6f5f2e2f6aac327fce595 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:05 +0200 Subject: [PATCH 513/752] python3Packages.screenlogicpy: 0.8.2 -> 0.9.1 --- pkgs/development/python-modules/screenlogicpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 7ed829df1679..fef2b05f9e8c 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7w2cg+LfL3w2Xxf8s7lFxE/HkqZ6RBYp8LkZTOwgK+I="; + hash = "sha256-bBdOaAr9VH7UeY/UdeKS9oOevJwW2HChJiTGCNbbikM="; }; propagatedBuildInputs = [ From 612f8e91417ec1985cc865b7c2b42819f7a0ece9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:05 +0200 Subject: [PATCH 514/752] python3Packages.selenium: 4.8.0 -> 4.12.0 --- pkgs/development/python-modules/selenium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 053b42d90e9a..fdb052a47499 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.8.0"; + version = "4.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-YTi6SNtTWuEPlQ3PTeis9osvtnWmZ7SRQbne9fefdco="; + hash = "sha256-A2lI40bPSIri/0yp6C3aJZBX5p6ON1fWGfJTcul9/2o="; }; postPatch = '' From d5db4e0df49a410fa96be60550cb601364a3e384 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:06 +0200 Subject: [PATCH 515/752] python3Packages.setuptools-rust: 1.6.0 -> 1.7.0 --- .../setuptools-rust/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index e71d8bc78dc0..e1c04780b8e8 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -6,25 +6,40 @@ , semantic-version , setuptools , setuptools-scm +, tomli , typing-extensions }: buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.6.0"; + version = "1.7.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yG5zTerDMFl5mL+8CNpFGH5rJ4N+I72R6tsyBzI5ImI="; + hash = "sha256-xxAJmZSCNaOK5+VV/hmapmwlPcOEsSX12FRzv4Hq46M="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ semantic-version setuptools typing-extensions ]; + propagatedBuildInputs = [ + semantic-version + setuptools + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + pythonImportsCheck = [ + "setuptools_rust" + ]; doCheck = false; - pythonImportsCheck = [ "setuptools_rust" ]; passthru.tests.pyo3 = callPackage ./pyo3-test { }; From 272b7db8913b298f659e319a13ae85ea10f821f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:06 +0200 Subject: [PATCH 516/752] python3Packages.sh: 2.0.2 -> 2.0.6 --- pkgs/development/python-modules/sh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 20e4d95928ea..46332d0d528a 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sh"; - version = "2.0.2"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "amoffat"; repo = "sh"; rev = "refs/tags/${version}"; - hash = "sha256-qMYaGNEvv2z47IHFGqb64TRpN3JHycpEmhYhDjrUi6s="; + hash = "sha256-c4Ms4ydcW7LgmAI1WuYD74nzILuY/Xg+JePJe0q5AQQ="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "tests/test.py" + "tests" ]; # A test needs the HOME directory to be different from $TMPDIR. From 36a54c2e92062d366234d196d7d3164957545a7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:06 +0200 Subject: [PATCH 517/752] python3Packages.simple-salesforce: 1.12.4 -> 1.12.5 --- pkgs/development/python-modules/simple-salesforce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 8598f04918c3..5da242e7b4c3 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.4"; + version = "1.12.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nYL2kSDS6DSrBzAKbg7Wj6boSZ52+T/yX+NYnYQ9rQo="; + hash = "sha256-mj7lbBGEybsEzWo4TYmPrN3mBXItdo/JomVIYmzIDAY="; }; propagatedBuildInputs = [ From 72a19feb5c223900655f2e32166422ccd340fd46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:06 +0200 Subject: [PATCH 518/752] python3Packages.simpy: 4.0.1 -> 4.0.2 --- pkgs/development/python-modules/simpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 2be43f157a16..e1544a0b89a6 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "simpy"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; + sha256 = "sha256-bYrcAinfawL7fibc0TOHA7T09j8WelrCpyE8uAq6RIQ="; }; nativeBuildInputs = [ From ac619be2fa01b4c559408d7b0de00daf529a7b76 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:06 +0200 Subject: [PATCH 519/752] python3Packages.single-version: 1.5.1 -> 1.6.0 --- .../python-modules/single-version/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index 53989afe94f8..558126bbbd71 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -8,25 +8,16 @@ buildPythonPackage rec { pname = "single-version"; - version = "1.5.1"; + version = "1.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hongquan"; repo = pname; - rev = "v${version}"; - hash = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + rev = "refs/tags/v${version}"; + hash = "sha256-dUmJhNCPuq/7WGzFQXLjb8JrQgQn7qyBqzPWaKzD9hc="; }; - patches = [ - # https://github.com/hongquan/single-version/pull/4 - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://github.com/hongquan/single-version/commit/0cdf9795cb0522e90a8dc00306f1ff7bb85621ad.patch"; - hash = "sha256-eT9G1XvkNF0+NKgx+yN7ei53xIEMvnc7V/KtPLqlWik="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; From a968290c0e5325f82471f900050cf203d6619d4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:06 +0200 Subject: [PATCH 520/752] python3Packages.sip: 6.7.7 -> 6.7.11 --- pkgs/development/python-modules/sip/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5d6fde555d6f..f4870f2fa6f1 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,22 +2,24 @@ , stdenv , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , wheel , packaging , ply , toml +, tomli }: buildPythonPackage rec { pname = "sip"; - version = "6.7.7"; + version = "6.7.11"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-3unAb6iubUQaQB+SKGf8YZbt2idO69n7/sVPB2nCqeI="; + hash = "sha256-8Nwyh6CxcuVmSTHIeEd1DUfk/c2k/jYrUUr47dZVtGk="; }; nativeBuildInputs = [ @@ -25,7 +27,9 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ packaging ply toml ]; + propagatedBuildInputs = [ packaging ply toml ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; # There aren't tests doCheck = false; From 17cf1b7df36e1c0446dd516326ee78a8c745e70b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:07 +0200 Subject: [PATCH 521/752] python3Packages.skia-pathops: 0.7.4 -> 0.8.0.post1 --- pkgs/development/python-modules/skia-pathops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 0fefc6d41f7c..9ea3b058295e 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "skia-pathops"; - version = "0.7.4"; + version = "0.8.0.post1"; src = fetchPypi { pname = "skia-pathops"; inherit version; extension = "zip"; - hash = "sha256-Ci/e6Ht62wGMv6bpXvnkKZ7WOwCAvidnejD/77ypE1A="; + hash = "sha256-oFYkneL2H6VRFrnuVVE8aja4eK7gDJFFDkBNFgZIXLs="; }; postPatch = '' From 190d423ebdcc27ff58a14f9a42233935b4ec4143 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:07 +0200 Subject: [PATCH 522/752] python3Packages.skrl: 0.10.2 -> 1.0.0 --- pkgs/development/python-modules/skrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 266fb65bf213..20f43924b9d0 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "0.10.2"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OY5+bUPg+G1eKFMvHlXSHwc2WWHTpyoyCKjY3MvlLyM="; + hash = "sha256-89OoJanmaB74SLF1qMI8WFBdN1czS7Yr7BmojaRdo4M="; }; patches = [ From d4e7dc201a908fa018d543cfc1861eaef91e770d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:07 +0200 Subject: [PATCH 523/752] python3Packages.smart-open: 6.3.0 -> 6.4.0 --- .../python-modules/smart-open/default.nix | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index e0d7757d0bfe..df0cbdc8a01c 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -11,11 +11,12 @@ , moto , paramiko , pytestCheckHook +, responses }: buildPythonPackage rec { pname = "smart-open"; - version = "6.3.0"; + version = "6.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,30 +25,52 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "refs/tags/v${version}"; - hash = "sha256-sVKrCph5M7xsE7gtzsP/eVEbZyFfoucW3p30YYpwVFI="; + hash = "sha256-fciNaVw603FAcgrSrND+LEycJffmnFQij2ZpatYZ/e4="; }; - propagatedBuildInputs = [ - azure-common - azure-core - azure-storage-blob - boto3 - google-cloud-storage - requests + passthru.optional-dependencies = { + s3 = [ + boto3 + ]; + gcs = [ + google-cloud-storage + ]; + azure = [ + azure-storage-blob + azure-common + azure-core + ]; + http = [ + requests + ]; + webhdfs = [ + requests + ]; + ssh = [ + paramiko + ]; + }; + + pythonImportsCheck = [ + "smart_open" ]; nativeCheckInputs = [ moto - paramiko pytestCheckHook - ]; + responses + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "smart_open" ]; - pythonImportsCheck = [ - "smart_open" + disabledTests = [ + # https://github.com/RaRe-Technologies/smart_open/issues/784 + "test_https_seek_forward" + "test_seek_from_current" + "test_seek_from_end" + "test_seek_from_start" ]; meta = with lib; { From 2976f8ec14aff4ac8b7a7f1f4ddf59859562c478 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:07 +0200 Subject: [PATCH 524/752] python3Packages.snitun: 0.36.1 -> 0.36.2 --- pkgs/development/python-modules/snitun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 35d7a877fed1..9701824a4df2 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.36.1"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ViFAPAA6uU5MQNHCTIw0OTR8eZPgF34GqRP+py6L6RU="; + hash = "sha256-ViNsmTq1iLxNujA71b9JZB5AZ79ZbiqdTyDeBGd4gUA="; }; propagatedBuildInputs = [ From fb892c745e9003d3973d8839845f322fff7d0137 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:08 +0200 Subject: [PATCH 525/752] python3Packages.snowflake-sqlalchemy: 1.4.6 -> 1.5.0 --- .../python-modules/snowflake-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 8f1f2cb95423..41f7c2e10c3d 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.6"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xkx8QlabOCodqj4tRYxpln0z+HHVwYdqlXkaitzmKx8="; + hash = "sha256-PtD3fQnIqd79NcYFdDMlpNwhCY6PHGL/wDR/QnKdsFo="; }; propagatedBuildInputs = [ From 05af9b21b2cedb590e8b591924138ecd794414f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:08 +0200 Subject: [PATCH 526/752] python3Packages.somajo: 2.2.4 -> 2.3.0 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 98f98741a986..14530ec68aba 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.4"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-vO3wEM3WkPQqq+ureJY+cpRHQ4cOLPV6DukA5LOscEM="; + hash = "sha256-CNGSol77Q3uAZPLeV43NhIffO31tnZoMYOsevkZh3pc="; }; propagatedBuildInputs = [ From 6607c1b7eff871b8e7889320762be38c3e90271f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:08 +0200 Subject: [PATCH 527/752] python3Packages.soupsieve: 2.4 -> 2.5 --- pkgs/development/python-modules/soupsieve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index e26a04192f48..1ae1cb7b8d2b 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.4"; + version = "2.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4o26nKbHwAFz405LpXRI8GiLtoG3xei/SXHar8CT1po="; + hash = "sha256-VmPVp7O/ru4LxDcuf8SPnP9JQLPuxUpkUcxSmfEJdpA="; }; nativeBuildInputs = [ From 2a3c79f3ca0baa52a1a811c570ec883833fbd616 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:08 +0200 Subject: [PATCH 528/752] python3Packages.soxr: 0.3.5 -> 0.3.6 --- pkgs/development/python-modules/soxr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 20532f4c00fa..941b6e596a2f 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "soxr"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; src = fetchFromGitHub { @@ -27,7 +27,7 @@ buildPythonPackage rec { repo = "python-soxr"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-q/K7XlqvDHAna+fqN6iiJ9wD8efsuwHiEfKjXS46jz8="; + hash = "sha256-H2sueQq32o/9EHENANKVoiWlFoSF88P0LZ7DfEh/Esg="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From 7fdccc3ea237d97341910fb5887afdf692aa283c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:08 +0200 Subject: [PATCH 529/752] python3Packages.spacy-alignments: 0.8.4 -> 0.9.0 --- .../python-modules/spacy-alignments/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index ff6e0eff1f04..9bcb74a242ff 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -2,7 +2,6 @@ , stdenv , cargo , fetchPypi -, fetchpatch , buildPythonPackage , isPy3k , rustPlatform @@ -13,19 +12,19 @@ buildPythonPackage rec { pname = "spacy-alignments"; - version = "0.8.4"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s="; + hash = "sha256-jcNYghWR9Xbu97/hAYe8ewa5oMQ4ofNGFwY4cY7/EmM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg="; + hash = "sha256-I5uI+qFyb4/ArpUZi4yS/E/bmwoW7+CalMq02Gnm9S8="; }; nativeBuildInputs = [ From 0c23c62738ff2d6021cf6128dd7f3abfa31de632 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:08 +0200 Subject: [PATCH 530/752] python3Packages.spacy: 3.5.4 -> 3.6.1 --- pkgs/development/python-modules/spacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a3cf5a63cf50..944fef7909c1 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.5.4"; + version = "3.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mpwWfp3Ov++sx12sNKjnK+y+NI60W78GpsBSOuBaxCU="; + hash = "sha256-YyOphwauLVVhaUsDqLC1dRiHoAKQOkiU5orrKcxnIWY="; }; pythonRelaxDeps = [ @@ -81,7 +81,7 @@ buildPythonPackage rec { typing-extensions ]; postPatch = '' substituteInPlace setup.cfg \ - --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" + --replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8" ''; nativeCheckInputs = [ From fe3584c7d4bf51c2661be310f5edbf572181bc62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:09 +0200 Subject: [PATCH 531/752] python3Packages.spacy-transformers: 1.2.5 -> 1.3.0 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index db50edc66aff..6a34745848d1 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.2.5"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+VIQXcffodzR6QEr2ZfvEIBGIxqKwsNZotI+Eh0EOIw="; + hash = "sha256-vxzDGLa+LoKnLpaqG7kGLfSLxqQdW+9AXw2YzBAz0UY="; }; nativeBuildInputs = [ From 6c493847589d9168653ea4906d2499177aa661c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:09 +0200 Subject: [PATCH 532/752] python3Packages.spglib: 2.0.2 -> 2.1.0 --- .../python-modules/spglib/default.nix | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 6bbff9e28f3a..95d73246aab9 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,25 +1,54 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, pytest, pyyaml }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, scikit-build-core +, cmake +, pathspec +, ninja +, pyproject-metadata + +# dependencies +, numpy + +# tests +, pytestCheckHook +, pyyaml +}: buildPythonPackage rec { pname = "spglib"; - version = "2.0.2"; + version = "2.1.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HQgewi2kq0/DGY6URd2tbewiYcQ5J4MRUdk+OUImEKo="; + hash = "sha256-gUNUX9/8EfvNpNcFpra81Iid6bw1JLeN+GajbdDeCks="; }; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + scikit-build-core + cmake + pathspec + ninja + pyproject-metadata + ]; - nativeCheckInputs = [ pytest pyyaml ]; + dontUseCmakeConfigure = true; - # pytestCheckHook doesn't work - # ImportError: cannot import name '_spglib' from partially initialized module 'spglib' - checkPhase = '' - pytest - ''; + propagatedBuildInputs = [ + numpy + ]; - pythonImportsCheck = [ "spglib" ]; + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + pythonImportsCheck = [ + "spglib" + ]; meta = with lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; From d81764140ec2f439c1ebe8d6063d7fad2f43546e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:09 +0200 Subject: [PATCH 533/752] python3Packages.sphinx-autoapi: 2.0.1 -> 2.1.1 --- .../python-modules/sphinx-autoapi/default.nix | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index d8d98a803b8c..3d47f22c8726 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -1,41 +1,50 @@ { lib -, astroid , buildPythonPackage , fetchPypi -, jinja2 -, mock -, pytestCheckHook , pythonOlder + +# build-system +, setuptools + +# dependencies +, astroid +, anyascii +, jinja2 , pyyaml , sphinx -, stdenv -, typing-extensions -, unidecode + +# tests +, beautifulsoup4 +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "2.0.1"; - format = "setuptools"; + version = "2.1.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zfR5aMIIUvT+sMzv0J5BS7ggr4r4+C+rFaJLCaPRuro="; + hash = "sha256-+625bnkCDWsOxF2IhRe/gW1rWHotNA++HsMRNeMApsg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + anyascii astroid jinja2 pyyaml sphinx - unidecode - ] ++ lib.optionals (pythonOlder "3.11") [ - typing-extensions ]; nativeCheckInputs = [ + beautifulsoup4 mock pytestCheckHook ]; From 0e1c55eaac5489e4d2ab2c2f41bf556437caa749 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:09 +0200 Subject: [PATCH 534/752] python3Packages.sphinx-autodoc-typehints: 1.23.0 -> 1.24.0 --- .../python-modules/sphinx-autodoc-typehints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index aca87f3c893c..d99577fd234e 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.23.0"; + version = "1.24.0"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-XUTimWYzza2kmbbSeklt3528ld0fDwn3s3lAJJ5h9uk="; + hash = "sha256-lORABmlBuyN3BLuIB4Xi0F6K5UBsiGdP7vu5OK0Nxq8="; }; nativeBuildInputs = [ From cd01c4a78b4c7a992e9b39a1122912aea213f98a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:09 +0200 Subject: [PATCH 535/752] python3Packages.sphinx-automodapi: 0.14.1 -> 0.16.0 --- .../python-modules/sphinx-automodapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index 7560b37036d3..3071d86dc46b 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinx-automodapi"; - version = "0.14.1"; + version = "0.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = pname; - rev = "v${version}"; - hash = "sha256-olD9LIyFCNEu287wQIRqoabfrdcdyZpNc69jq/e1304="; + rev = "refs/tags/v${version}"; + hash = "sha256-7/b3PlgoqXyzmj4KDoHJf5gd3SUSiyhkpcDWl3u+0Bs="; }; propagatedBuildInputs = [ sphinx ]; From c953633dfabe3cc1aac1e231cace402d8279a290 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:09 +0200 Subject: [PATCH 536/752] python3Packages.sphinxcontrib-apidoc: 0.3.0 -> 0.4.0 --- .../python-modules/sphinxcontrib-apidoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 530803478614..ad89521a5b59 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; + hash = "sha256-/lnRWIJHKqk8Jzevvepr7bNM41y9NKpJR5CfXfFQCq0="; }; postPatch = '' From 215e55ee0f1ff8c9d42e89ff901a482d5bf4d414 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:10 +0200 Subject: [PATCH 537/752] python3Packages.sphinxcontrib-bibtex: 2.5.0 -> 2.6.1 --- .../python-modules/sphinxcontrib-bibtex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 4a0dcda23887..8c7cd9b966a9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; - version = "2.5.0"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cbQuXbDi4oTyQ4dTJr+ZNqqadjKCJ311BIgm/vWwDqo="; + hash = "sha256-BGtJ8HCuUnavNMG43bm8lWLvbeL3pS03qRy45T9UuGM="; }; propagatedBuildInputs = [ From 281efd9f64d892955a6e7034a870c720ea96630b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:10 +0200 Subject: [PATCH 538/752] python3Packages.sphinxcontrib-confluencebuilder: 2.0.0 -> 2.3.0 --- .../sphinxcontrib-confluencebuilder/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 5830ff0caf57..111db7922b49 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , docutils , sphinx , requests @@ -9,13 +10,19 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.0.0"; + version = "2.3.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-RyShQt/t8tnE5ZHM0WDQ+jrvXem3y24tCpj3s6Thq+g="; + pname = "sphinxcontrib_confluencebuilder"; + inherit version; + hash = "sha256-Zpe2n131afnq4IhQEEZtquvSEkkjv/uznXt2tQhGfZA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ docutils sphinx From 807ebc41a12fc9a64b0ba78adf771c3789e866a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:10 +0200 Subject: [PATCH 539/752] python3Packages.sphinxcontrib-websupport: 1.2.4 -> 1.2.6 --- .../sphinxcontrib-websupport/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 45027ba15c43..ad800984ee46 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -1,20 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, flit-core +, jinja2 , sphinxcontrib-serializinghtml -, six }: buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.4"; + version = "1.2.6"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232"; + pname = "sphinxcontrib_websupport"; + inherit version; + hash = "sha256-1ZK+jhEmG7vGRmjyWO/E/ULJOrYXQRFDtSRf4wxjPYw="; }; - propagatedBuildInputs = [ six sphinxcontrib-serializinghtml ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + jinja2 + sphinxcontrib-serializinghtml + ]; doCheck = false; From 1cb6b716e9bd5759059f588825386e9044de98ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:11 +0200 Subject: [PATCH 540/752] python3Packages.sphinxcontrib-youtube: 1.2.0 -> 1.3.0 --- .../python-modules/sphinxcontrib-youtube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix index 795556797b93..67249bd88283 100644 --- a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-youtube"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "youtube"; - rev = "v${version}"; - hash = "sha256-SUnnrzYJ6cOktE0IdnRWTvPGcL/eVS9obtHBMpS2s4A="; + rev = "refs/tags/v${version}"; + hash = "sha256-/mu/OGMc+iP7DV36fmE8pb5y6MMOQ0fmzT8R7RP/tjM="; }; propagatedBuildInputs = [ sphinx requests ]; From 95b22a869b46394ab89ef783cddaeb2b713d6868 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:11 +0200 Subject: [PATCH 541/752] python3Packages.sphinx-prompt: 1.5.0 -> 1.7.0 Not updating to 1.8.0, since packaging has been messed up by the upstream. --- .../python-modules/sphinx-prompt/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index cc5d5f0b2eca..776752d74c45 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -1,21 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub -, sphinxHook +, poetry-core +, poetry-dynamic-versioning , sphinx }: buildPythonPackage rec { pname = "sphinx-prompt"; - version = "1.5.0"; + version = "1.7.0"; # read before updating past 1.7.0 https://github.com/sbrunner/sphinx-prompt/issues/398 + format = "pyproject"; src = fetchFromGitHub { owner = "sbrunner"; repo = "sphinx-prompt"; - rev = version; - hash = "sha256-ClUPAIyPrROJw4GXeakA8U443Vlhy3P/2vFnAtyrPHU="; + rev = "refs/tags/${version}"; + hash = "sha256-/XxUSsW8Bowks7P+d6iTlklyMIfTb2otXva/VtRVAkM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"poetry-plugin-tweak-dependencies-version", ' "" + ''; + + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + propagatedBuildInputs = [ sphinx ]; meta = with lib; { From de61bc2225e13c67069411bfde0004c51b96f923 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:11 +0200 Subject: [PATCH 542/752] python3Packages.sphinx-pytest: 0.0.3 -> 0.1.1 --- pkgs/development/python-modules/sphinx-pytest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index ecb2cbf55e77..a034b2b3f01d 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sphinx-pytest"; - version = "0.0.3"; + version = "0.1.1"; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; - rev = "v${version}"; - hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; + rev = "refs/tags/v${version}"; + hash = "sha256-26cV6mfNos/1YLhz5aVQVb54qsiyHWdcHtvmmSzMurk="; }; format = "pyproject"; From dbbdf4090b97c8b29a2bb382b5c674733f75c11a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:11 +0200 Subject: [PATCH 543/752] python3Packages.sphinx-rtd-theme: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/sphinx-rtd-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 613f19981216..fe056b3e70bc 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - hash = "sha256-oNi9Gi7VLgszjL4ZxLLu88XnoEh2l1PaxqnwWce2Qbg="; + hash = "sha256-WQsDDHq7nPA47AU7leU4C1xw1hWR6wtVIGP758QfCTE="; }; preBuild = '' From cbe4ff66fb07667f68c216628ce1ac4034242f9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:11 +0200 Subject: [PATCH 544/752] python3Packages.sqlalchemy-utils: 0.40.0 -> 0.41.1 --- pkgs/development/python-modules/sqlalchemy-utils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index d3ad0bf97038..84b42ad27f2f 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -37,13 +37,13 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.40.0"; + version = "0.41.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - hash = "sha256-r4AwiaeSmAP662FzuQ8p0aZ60C8dHnMvQLBUqOs8c3A="; + hash = "sha256-ohgb/wHuuER544Vx0sBxjrUgQvmv2MGU0NAod+hLfXQ="; }; patches = [ @@ -92,6 +92,7 @@ buildPythonPackage rec { "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice" "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop" "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop" + "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG3::test_create_and_drop" ]; meta = with lib; { From 96889ae749c1959ca8bf26a6b97ef4918ad6b109 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:11 +0200 Subject: [PATCH 545/752] python3Packages.starlette: 0.27.0 -> 0.31.1 --- pkgs/development/python-modules/starlette/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 1c08e61f6660..acac9c99f13a 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.27.0"; + version = "0.31.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,18 +31,13 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qT3ZJQY5l1K88llJdKoSkwHvfcWwjH6JysMnHYGknqw="; + hash = "sha256-Tq414cEpXX8MQDR0KYyB+J7lFqorbiwP/sGnUFvs7wA="; }; nativeBuildInputs = [ hatchling ]; - postPatch = '' - # remove coverage arguments to pytest - sed -i '/--cov/d' setup.cfg - ''; - propagatedBuildInputs = [ anyio itsdangerous @@ -79,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/encode/starlette/releases/tag/${version}"; + downloadPage = "https://github.com/encode/starlette"; homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; From e53aedf567d0595f325c593a4f40409fe7cb4614 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:11 +0200 Subject: [PATCH 546/752] python3Packages.steamship: 2.17.27 -> 2.17.28 --- pkgs/development/python-modules/steamship/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index e79b9993b883..5309312bba35 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.27"; + version = "2.17.28"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Wgz0jkMaMUTM7ubb/TsGaQm8UbdPtEvzapl0h4xrqq0="; + hash = "sha256-NdWQiHu5YDIEtL4zJj5Vydjmwq1b5aqVcmqIe7zYv3g="; }; pythonRelaxDeps = [ From 47534cda2e9ef70b8abf7674c544becb6dd686a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:12 +0200 Subject: [PATCH 547/752] python3Packages.stravalib: 1.2.0 -> 1.5 --- pkgs/development/python-modules/stravalib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index b05e147dcaa9..df64dbebab50 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "stravalib"; - version = "1.2.0"; + version = "1.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; + hash = "sha256-OEdMRg3KjUrXt/CgJgsUqa/sVFAE0JONNZg5MBKtxmY="; }; nativeBuildInputs = [ From 22ac536e1ba9e6581af24afcde95ec5ea4ca7489 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:12 +0200 Subject: [PATCH 548/752] python3Packages.strawberry-graphql: 0.205.0 -> 0.208.0 --- .../development/python-modules/strawberry-graphql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 761a14fbfd03..93704c953ee8 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.205.0"; + version = "0.208.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok="; + hash = "sha256-Gp58q1oZblbEQftEiq3il12eVIVF68jbGiqLdlolHvU="; }; patches = [ From 23e890358fe0491686d09552c5e3ab76cc383388 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:12 +0200 Subject: [PATCH 549/752] python3Packages.stripe: 5.5.0 -> 6.5.0 --- pkgs/development/python-modules/stripe/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 9f1f11e1c18c..c70241afeb37 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,22 +3,24 @@ , fetchPypi , requests , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "stripe"; - version = "5.5.0"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BKlzKzekYijs8OSWFjo+3ZNZaw5iAAKfvEiRFjhifhk="; + hash = "sha256-9fTHare5AfJjHvd3QdBpMg8zKMHjGRjax+20qgSssP0="; }; propagatedBuildInputs = [ requests + typing-extensions ]; # Tests require network connectivity and there's no easy way to disable them From 35467164440b74b5857c26e3d8cfcac4cb80c014 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:12 +0200 Subject: [PATCH 550/752] python3Packages.sunpy: 4.1.3 -> 5.0.1 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index e81365767432..a676f28d2758 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.1.3"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YNShjuLC7gBRn11oAd5Kp5CfCn92vAo/K4QNIXm/Mtc="; + hash = "sha256-7tmyywyfQw1T9qr5UbPH/KR+AmmhSaHunkeUGRKDl+Q="; }; nativeBuildInputs = [ From 067b903ca47f07faffbdc645851b0b33226c1a03 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:12 +0200 Subject: [PATCH 551/752] python3Packages.sv-ttk: 2.4.5 -> 2.5.5 --- pkgs/development/python-modules/sv-ttk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sv-ttk/default.nix b/pkgs/development/python-modules/sv-ttk/default.nix index 3032761032e2..660d32a6735c 100644 --- a/pkgs/development/python-modules/sv-ttk/default.nix +++ b/pkgs/development/python-modules/sv-ttk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "sv-ttk"; - version = "2.4.5"; + version = "2.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sv_ttk"; - hash = "sha256-ysRhRxrml+wmluH8F5AE7vZYXrTNUg5ZzI+26jwpOpc="; + hash = "sha256-m7/iq6bMb5/fcNeTMQRlQ8lmb8zMeLrV/2SKmYfjzts="; }; # No tests available From 37db6205d655a3eb4fee1a44eab7a750f6c504d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:12 +0200 Subject: [PATCH 552/752] python3Packages.symengine: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/symengine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 60ae59584805..38ceda098209 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.2"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; - rev = "v${version}"; - hash = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; + rev = "refs/tags/v${version}"; + hash = "sha256-03lHip0iExfptrUe5ObA6xXrsfS4QJPrh1Z0v7q2lDI="; }; patches = [ From f4e97eb05c88371c3f5a4bed64c1b1fa1675244c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 553/752] python3Packages.syrupy: 4.2.1 -> 4.5.0 --- pkgs/development/python-modules/syrupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index cd9d2addc604..8759f3562596 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.2.1"; + version = "4.5.0"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM="; + hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg="; }; nativeBuildInputs = [ From 15249d87997ba974714c871066252716e8d840f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 554/752] python3Packages.tableauserverclient: 0.25 -> 0.26 --- .../python-modules/tableauserverclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index 601fdee70310..c473a3755fe0 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.25"; + version = "0.26"; src = fetchPypi { inherit pname version; - sha256 = "sha256-01TRYkXEWagFrSB7zvP6Bj4YvIFoaVkgrIm/gSWkILY="; + sha256 = "sha256-vn7A7n0Z4kTtrm8MEoUJiv94K3qA/4Kx8lElhDM/LlI="; }; propagatedBuildInputs = [ defusedxml requests packaging ]; From 2de392508d66c613f17743fc2e592ae9bcd65529 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 555/752] python3Packages.tabula-py: 2.7.0 -> 2.8.1 --- pkgs/development/python-modules/tabula-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 585cf7205e1f..b985ebf8d893 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.7.0"; + version = "2.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chezou"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SV4QLvk7dXtU0/husS5A5mBYvbTejLyO9PpiO2oBtjs="; + hash = "sha256-QqTfbSwGaNRXBiAzB1fsEawxCvlIunB1j2jSFD9imPI="; }; patches = [ From caa0a6ec732cc10d8ed113e193d2bc7c963df7e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 556/752] python3Packages.tblib: 1.7.0 -> 2.0.0 --- pkgs/development/python-modules/tblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 2f06b665d33f..0441fb2894fd 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.7.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c"; + sha256 = "sha256-pt8w8nLAi/i+ZuB3X62GIAXZUKa4RJuU98eIcx1w7Nc="; }; meta = with lib; { From db6bf206886fbc1d8b45f40fcf490e99fdb0acd9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 557/752] python3Packages.tenacity: 8.2.2 -> 8.2.3 --- pkgs/development/python-modules/tenacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 91017b840359..5fe70090feea 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tenacity"; - version = "8.2.2"; + version = "8.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Q68DeCK9ACkCWHfzstl8xNe7DCmRAAo9WdcVF8XJaeA="; + hash = "sha256-U5jvDXjmP0AAfB+0wL/5bhkROU0vqNGU93YZwF/2zIo="; }; nativeBuildInputs = [ From f8e4539743e26e5d597f14d51cc1b82d09e3c162 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 558/752] python3Packages.tensorboard-data-server: 0.6.1 -> 0.7.1 --- .../python-modules/tensorboard-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix index d6df4fc0b241..5ff48c7cc3d1 100644 --- a/pkgs/development/python-modules/tensorboard-data-server/default.nix +++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "tensorboard-data-server"; - version = "0.6.1"; + version = "0.7.1"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit version format; dist = "py3"; python = "py3"; - hash = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + hash = "sha256-mTi9OfUEF5ezOSEGb7oOqwOg3RDRiHoF5irliEGtTD8="; }; pythonImportsCheck = [ "tensorboard_data_server" ]; From 7e95ecd1f9340247a53985fbaa5db0e3918fb0ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 559/752] python3Packages.tensorboard: 2.11.0 -> 2.14.0 --- pkgs/development/python-modules/tensorboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index c49fcad07531..73c76d74771c 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.11.0"; + version = "2.14.0"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-oOWS7oeWLhevPw3Of6rj+70jkDAVnp5iXM6BC341xT0="; + hash = "sha256-Nmf5dF2ZKAg2rWcwIjYshA9g7Y/v1aPjC/Bx9aj9ABc="; }; nativeBuildInputs = [ From 955091b94aee9a3ec37a9cf84c0251242e414b99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 560/752] python3Packages.termcolor: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/termcolor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index ba5244f66af3..0d40a1b44f96 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-38isPzUHiPI7KUez5s+lpTtjC2EubNiWWgFad2AguZo="; + hash = "sha256-tbCPaJN/E4/pL2wIm5nx4toK5WxSt4v3B1/ZVCD9mlo="; }; nativeBuildInputs = [ From dfe3283f77c2ceafcdf3947679ea79602bd8f631 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:14 +0200 Subject: [PATCH 561/752] python3Packages.testfixtures: 7.1.0 -> 7.2.0 --- pkgs/development/python-modules/testfixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 4ccc1251a8fb..64b49efbd1de 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "7.1.0"; + version = "7.2.0"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-RWzk85MWDyfNaEClNw7PSnDxchc39eZ6KveebIF4BKQ="; + hash = "sha256-jIwg3TDqETVIUHWEodqud5JI26pXEmcseruXCfD7+LI="; }; nativeCheckInputs = [ From 4b15f056710058d022138d58fba42f54fae58ccb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:14 +0200 Subject: [PATCH 562/752] python3Packages.testtools: 2.5.0 -> 2.6.0 --- pkgs/development/python-modules/testtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index e0780dd768cb..c4f74d377d5f 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f"; + sha256 = "sha256-KLZeFMDy0+y7+19VydzeXk+qgKwWo3qCOQmh/jy8swo="; }; propagatedBuildInputs = [ pbr python-mimeparse extras ]; From dae4df7ebc2cbd7ecb38c7bfcd0e9628cbbee6f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:14 +0200 Subject: [PATCH 563/752] python3Packages.textacy: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/textacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 2986f3428eb1..80c40f7d5514 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2c92bdd6b47305447b64e4cb6cc43c11675f021f910a8074bc8149dbf5325e5b"; + sha256 = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; }; propagatedBuildInputs = [ From a8a92f36aacf17290348746ae62698296e26fe5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:14 +0200 Subject: [PATCH 564/752] python3Packages.tf2onnx: 1.14.0 -> 1.15.1 --- pkgs/development/python-modules/tf2onnx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index b1fe7abfae25..f1359e6fdaac 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tf2onnx"; - version = "1.14.0"; + version = "1.15.1"; format = "setuptools"; src = fetchFromGitHub { owner = "onnx"; repo = "tensorflow-onnx"; - rev = "v${version}"; - hash = "sha256-JpXwf+GLjn0krsb5KnEhVuemWa0V2+wF10neDsdtOfI="; + rev = "refs/tags/v${version}"; + hash = "sha256-HqzcoPPX9+NOj0uFfOSVI2MNCkxq1NmLqXflwdi5RF0="; }; nativeBuildInputs = [ From 80b228847bc7a024c782f6a97cc0c1ce8b6a03d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:14 +0200 Subject: [PATCH 565/752] python3Packages.thefuzz: 0.19.0 -> 0.20.0 --- pkgs/development/python-modules/thefuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix index 2748381f7dc2..8d240fe19e3e 100644 --- a/pkgs/development/python-modules/thefuzz/default.nix +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "thefuzz"; - version = "0.19.0"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0="; + hash = "sha256-ol5JeGscRgPH/G4taea8ZgmCopGWmLU2/4NU4GMcxA0="; }; propagatedBuildInputs = [ levenshtein ]; From 0a0cf7601f775ffd0d7c0a0e9a1af7775a83a382 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:14 +0200 Subject: [PATCH 566/752] python3Packages.thinc: 8.1.10 -> 8.2.0 --- pkgs/development/python-modules/thinc/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index a712f0078b9a..18f8623f4539 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -21,6 +21,7 @@ , pytestCheckHook , python , pythonOlder +, setuptools , srsly , tqdm , typing-extensions @@ -29,16 +30,25 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.10"; + version = "8.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bEpI19oH4EToSmjLubIvMvhJCZWiurC/xg5BLRSvuZE="; + hash = "sha256-gsoeeDHjVNdMZ3bth9vXP0qtWe0ljIdGy+hoaIGG/Ek="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "preshed>=3.0.2,<3.1.0" "preshed" + ''; + + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin [ From de737dec83edd964bbc82198f5228b7c36f2cd51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:14 +0200 Subject: [PATCH 567/752] python3Packages.tifffile: 2023.7.18 -> 2023.8.30 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 655f6b8eb107..95ccd7185fdb 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.7.18"; + version = "2023.8.30"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-WlpiSy96t/N+nsQXSuLfGAW5ZY+JAT+bS1VQZy9l8qE="; + hash = "sha256-aoxTsBKihrddCaFJirMvIC8kzGJwoQW11ZEdxEJvFio="; }; propagatedBuildInputs = [ From 2587e7b0f2bd778ef5c0bc3a6fa525d58dcc8e84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:15 +0200 Subject: [PATCH 568/752] python3Packages.tiktoken: 0.3.3 -> 0.5.1 --- .../python-modules/tiktoken/Cargo.lock | 191 ++++++++++-------- .../python-modules/tiktoken/default.nix | 19 +- 2 files changed, 121 insertions(+), 89 deletions(-) diff --git a/pkgs/development/python-modules/tiktoken/Cargo.lock b/pkgs/development/python-modules/tiktoken/Cargo.lock index 1d992854518e..e65fd819d3d4 100644 --- a/pkgs/development/python-modules/tiktoken/Cargo.lock +++ b/pkgs/development/python-modules/tiktoken/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -40,12 +40,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bstr" -version = "1.4.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -58,9 +57,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "fancy-regex" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" dependencies = [ "bit-set", "regex", @@ -74,15 +73,15 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -90,24 +89,24 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -121,31 +120,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" dependencies = [ "cfg-if", "indoc", @@ -160,9 +159,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" dependencies = [ "once_cell", "target-lexicon", @@ -170,9 +169,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" dependencies = [ "libc", "pyo3-build-config", @@ -180,67 +179,73 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pyo3-macros-backend" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -250,21 +255,35 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "syn" @@ -278,14 +297,25 @@ dependencies = [ ] [[package]] -name = "target-lexicon" -version = "0.12.6" +name = "syn" +version = "2.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tiktoken" -version = "0.3.3" +version = "0.5.1" dependencies = [ "bstr", "fancy-regex", @@ -296,9 +326,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unindent" @@ -306,20 +336,11 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -332,42 +353,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index 13eaecc0fb4d..3cf68063f119 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -6,7 +6,9 @@ , rustPlatform , cargo , rustc +, setuptools , setuptools-rust +, wheel , libiconv , requests , regex @@ -14,10 +16,10 @@ }: let pname = "tiktoken"; - version = "0.3.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - hash = "sha256-l7WLe/2pRXkeyFXlPRZujsIMY3iUK5OFGmyRnd+dBJY="; + hash = "sha256-J+dzVkIyAE9PgQ/R+FI2Zz7DpW7X8SBvye2GcOvtuXo="; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock @@ -25,18 +27,20 @@ let in buildPythonPackage { inherit pname version src postPatch; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.8"; nativeBuildInput = [ + setuptools setuptools-rust + wheel ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-27xR7xVH/u40Xl4VbJW/yEbURf0UcGPG5QK/04igseA="; + hash = "sha256-Q7XO+auj4tKDAGbqNn9pmJg8EJvooN2ie0lWwZVrld4="; }; nativeBuildInputs = [ @@ -54,6 +58,13 @@ buildPythonPackage { blobfile ]; + # almost all tests require network access + doCheck = false; + + pythonImportsCheck = [ + "tiktoken" + ]; + meta = with lib; { description = "tiktoken is a fast BPE tokeniser for use with OpenAI's models."; homepage = "https://github.com/openai/tiktoken"; From 6e0b5bbb83c3e5ee0ff8dd51fa18857a689dc6c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:15 +0200 Subject: [PATCH 569/752] python3Packages.tiledb: 0.20.0 -> 0.23.0 --- pkgs/development/python-modules/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 34597923f3be..516a22f44cce 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.20.0"; + version = "0.23.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - hash = "sha256-Be83b9JVxGxPYoOfqTfVm7qAjZD7cfH5BG6tbSHXhIQ="; + hash = "sha256-QxqUYu8y+k5SLRFtxpcs57gnAHgXIre0smURlqUzC1s="; }; nativeBuildInputs = [ From bb55a99c185a3dbe1e032f705ae68755ca4dbc0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:15 +0200 Subject: [PATCH 570/752] python3Packages.timm: 0.9.2 -> 0.9.7 --- pkgs/development/python-modules/timm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index e67ed91c135f..63f32e9563cd 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timm"; - version = "0.9.2"; + version = "0.9.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-gYrc8ds6urZvwDsTnzPjxjSTiAGzUD3RlCf0wogCrDI="; + hash = "sha256-poLyhwdpZpSH0w95Uj5n/fRoMe7fK0auMDWUna1d6/U="; }; propagatedBuildInputs = [ From df40f0e03057688147b5ae37914da9ecfc0078d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:15 +0200 Subject: [PATCH 571/752] python3Packages.tinycss2: 1.1.1 -> 1.2.1 --- pkgs/development/python-modules/tinycss2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 35c8578cab44..5e6f441d3d3b 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tinycss2"; - version = "1.1.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,10 +17,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; # for tests fetchSubmodules = true; - hash = "sha256-RUF/3cjNgDFofoxl9iKY3u5ZAVVQmXu2Qbb5U4brdcQ="; + hash = "sha256-rJtxMmW30NK+E+Dhh/fu6FPrEojWWdoEWNt0raYEubs="; }; postPatch = '' From eada10f5f9f64a05fd70fea2148da07c9a2fe5ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:15 +0200 Subject: [PATCH 572/752] python3Packages.torchinfo: 1.7.2 -> 1.64 --- pkgs/development/python-modules/torchinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index 420a5fd8dfc5..e22993e8d23f 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "torchinfo"; - version = "1.7.2"; + version = "1.64"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TylerYep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O+I7BNQ5moV/ZcbbuP/IFoi0LO0WsGHBbSfgPmFu1Ec="; + hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; }; propagatedBuildInputs = [ From 8d322fb5092e5c5651d44c975ec8327fb8dec2db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:15 +0200 Subject: [PATCH 573/752] python3Packages.torchlibrosa: 0.0.9 -> 0.1.0 --- pkgs/development/python-modules/torchlibrosa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchlibrosa/default.nix b/pkgs/development/python-modules/torchlibrosa/default.nix index bab73b0dae93..d1ac7076d7bb 100644 --- a/pkgs/development/python-modules/torchlibrosa/default.nix +++ b/pkgs/development/python-modules/torchlibrosa/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "torchlibrosa"; - version = "0.0.9"; + version = "0.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+LzejKvLlJIIwWm9rYPCWQDSueIwnG5gbkwNE+wbv0A="; + hash = "sha256-Yqi+7fnJtBQaBiNN8/ECKfe6huZ2eMzuAkiexO8EQCg="; }; propagatedBuildInputs = [ From e279116b18c1f07c5b9537c154f1480cf3176fef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:16 +0200 Subject: [PATCH 574/752] python3Packages.torchmetrics: 0.11.4 -> 1.1.2 --- pkgs/development/python-modules/torchmetrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index e3d51f7b551f..f458db0ced03 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.11.4"; + version = "1.1.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-K8QLdDpnS4N8s3zXsifFloRXW/QXEm36mJXXKEBEJBs="; + hash = "sha256-qbO2POXJp2O0VL16zY5mb6TDpogs1L34anFVeSf502g="; }; propagatedBuildInputs = [ From 298e1e443ad8a845ffa57d2bffde3849827d304a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:16 +0200 Subject: [PATCH 575/752] python3Packages.towncrier: 22.12.0 -> 23.6.0 --- pkgs/development/python-modules/towncrier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 06ec0f00a5b2..03b916883438 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "towncrier"; - version = "22.12.0"; + version = "23.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nEnX519kaprqAq6QTAvBY5yP0UoBKS0rEjuNMHVkA00="; + hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME="; }; propagatedBuildInputs = [ From d305ec285dacbebf9ba18c69fa3cea45f6252d5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:16 +0200 Subject: [PATCH 576/752] python3Packages.tox: 4.4.6 -> 4.11.3 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index de9707116600..1b0bf1755ab7 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.4.6"; + version = "4.11.3"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-kWvYN2PA4al2X813Mu4R/n2ZLsZ+MaYCCWNfmYD3nBo="; + hash = "sha256-VLoWRAiQ1TP9S0f8TKwQ0H2Lgemd+dTzSM+TjhioDMk="; }; postPatch = '' From 8a2ddf23461179ed62c80393defdff42da4533f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:16 +0200 Subject: [PATCH 577/752] python3Packages.tqdm: 4.64.1 -> 4.66.1 --- pkgs/development/python-modules/tqdm/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 891771ebc698..640e62212081 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -2,7 +2,9 @@ , stdenv , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm +, wheel , pytestCheckHook , pytest-asyncio , pytest-timeout @@ -14,15 +16,18 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.64.1"; + version = "4.66.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ="; + hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc="; }; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; nativeCheckInputs = [ @@ -38,8 +43,7 @@ buildPythonPackage rec { lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; pytestFlagsArray = [ - # pytest-asyncio 0.17.0 compat; https://github.com/tqdm/tqdm/issues/1289 - "--asyncio-mode=strict" + "-W" "ignore::FutureWarning" ]; # Remove performance testing. From 8e1a5457b05c817b899449cfac2135b4c2bfaecb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:16 +0200 Subject: [PATCH 578/752] python3Packages.trainer: 0.0.29 -> 0.0.31 --- pkgs/development/python-modules/trainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 43f147a6a9ca..466d6db8da5a 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ let pname = "trainer"; - version = "0.0.29"; + version = "0.0.31"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI="; + hash = "sha256-avZuujeWG/UGkj7fcGB99Fw7KYktJPIDf8oB4wjoiD4="; }; postPatch = '' From 258141f3ce324d46f123053b6da345c52ebe4cc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:16 +0200 Subject: [PATCH 579/752] python3Packages.traitlets: 5.9.0 -> 5.10.0 --- pkgs/development/python-modules/traitlets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index aa37946026f9..6df71a041b25 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.9.0"; + version = "5.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9s3iGpxoz3Vq8CA19y1acjv2B+hi574z7OUFq/Sjutk="; + hash = "sha256-9YTqIJJARm5m6R88gap9AEukz3lJkLDHdZOKFUQhfNE="; }; nativeBuildInputs = [ hatchling ]; From f26da2ac49e71fe948472c7813923135f343c3af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:17 +0200 Subject: [PATCH 580/752] python3Packages.traitsui: 7.4.3 -> 8.0.0 --- pkgs/development/python-modules/traitsui/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index de0928508844..0c7245225d10 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, setuptools , traits , pyface , pythonOlder @@ -8,16 +9,20 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.4.3"; - format = "setuptools"; + version = "8.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2zJRfpYioFgMIyCeE/gDLOoA5hxndJNnCf9F52M11bk="; + hash = "sha256-kBudHLxFUT4Apzl2d7CYRBsod0tojzChWbrUgBv0A2Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ traits pyface From deaf8440aef71fd48a5c19c8d8639c4e78909f37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:17 +0200 Subject: [PATCH 581/752] python3Packages.treeo: 0.0.11 -> 0.4.0 --- pkgs/development/python-modules/treeo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 1560e1810ba6..789eb346e8c6 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { # Note that there is a version 0.4.0, but it was released in error. At the # time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub # and PyPI. - version = "0.0.11"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; - rev = version; - hash = "sha256-zs3F8i+G5OX/A9wOO60xVuvnm2QqrL+dHIrC0qwH37o="; + rev = "refs/tags/${version}"; + hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw="; }; # See https://github.com/cgarciae/treex/issues/68. From 755bd6e98d750ebf0d5135c3b6af02de4ce18100 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:17 +0200 Subject: [PATCH 582/752] python3Packages.trio: 0.22.0 -> 0.22.2 https://github.com/python-trio/trio/releases/tag/v0.22.1 https://github.com/python-trio/trio/releases/tag/v0.22.2 The package now requires pytest-trio for its tests to succeed, which resulted in an infinite recursion. Crimes have therefore been committed to resolve this unfortunate situation. --- .../python-modules/trio/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index fb985e890a77..c01db3259a7d 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -6,6 +6,7 @@ , idna , outcome , pytestCheckHook +, pytest-trio , pyopenssl , trustme , sniffio @@ -16,15 +17,24 @@ , coreutils }: +let + # escape infinite recursion with pytest-trio + pytest-trio' = (pytest-trio.override { + trio = null; + }).overrideAttrs { + doCheck = false; + pythonImportsCheck = []; + }; +in buildPythonPackage rec { pname = "trio"; - version = "0.22.0"; + version = "0.22.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8="; + hash = "sha256-OIfPGMi8yJRDNCAwVGg4jax2ky6WaK+hxJqjgGtqzLM="; }; propagatedBuildInputs = [ @@ -46,13 +56,16 @@ buildPythonPackage rec { jedi pyopenssl pytestCheckHook + pytest-trio' trustme yapf ]; preCheck = '' - substituteInPlace trio/tests/test_subprocess.py \ + substituteInPlace trio/_tests/test_subprocess.py \ --replace "/bin/sleep" "${coreutils}/bin/sleep" + + export HOME=$TMPDIR ''; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. @@ -64,6 +77,8 @@ buildPythonPackage rec { "static_tool_sees_all_symbols" # tests pytest more than python "fallback_when_no_hook_claims_it" + # requires mypy + "test_static_tool_sees_class_members" ]; pytestFlagsArray = [ From 13f0b8f1d2a15f67155114e4c8af0a74681693bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:17 +0200 Subject: [PATCH 583/752] python3Packages.trove-classifiers: 2023.7.6 -> 2023.8.7 --- pkgs/development/python-modules/trove-classifiers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 7cd0dd7ca8a5..e9691044a926 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -9,14 +9,14 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.7.6"; + version = "2023.8.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-io4Wi1HSD+1gcEODHTdjK7UJGdHICmTg8Tk3RGkaiyI="; + hash = "sha256-yfKgqF1UXlNi6Wfk8Gn1b939kSFeIv+kjGb7KDUhMZo="; }; postPatch = '' From 490ef2cb1b0d706556f3253c7abc83c8eecc6295 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:18 +0200 Subject: [PATCH 584/752] python3Packages.twisted: 22.10.0 -> 23.8.0 --- .../python-modules/twisted/default.nix | 85 ++++++++++--------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 6c9014d5bd33..801adb77da37 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,34 +1,42 @@ { lib , stdenv , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchPypi , fetchpatch , python -, appdirs + +# build-system +, hatchling +, hatch-fancy-pypi-readme + +# dependencies , attrs , automat -, bcrypt , constantly -, cryptography -, git -, glibcLocales -, h2 , hyperlink -, hypothesis -, idna , incremental +, typing-extensions +, zope_interface + +# optional-dependencies +, appdirs +, bcrypt +, cryptography +, h2 +, idna , priority , pyasn1 -, pyhamcrest -, pynacl , pyopenssl , pyserial , service-identity -, setuptools -, typing-extensions -, zope_interface + +# tests +, cython-test-exception-raiser +, git +, glibcLocales +, pyhamcrest +, hypothesis # for passthru.tests , cassandra-driver @@ -46,16 +54,15 @@ buildPythonPackage rec { pname = "twisted"; - version = "22.10.0"; - format = "setuptools"; + version = "23.8.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "Twisted"; - inherit version; + inherit pname version; extension = "tar.gz"; - hash = "sha256-Mqy9QKlPX0bntCwQm/riswIlCUVWF4Oot6BZBI8tTTE="; + hash = "sha256-PHM2Ct0XM2piLA2BHCos4phmtuWbESX9ZQmxclIJiiQ="; }; patches = [ @@ -70,42 +77,27 @@ buildPythonPackage rec { url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch"; hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI="; }) - # remove half broken pyasn1 integration that blow up with pyasn 0.5.0 - # https://github.com/twisted/twisted/pull/11843 - (fetchpatch { - url = "https://github.com/twisted/twisted/commit/bdee0eb835a76b2982beaf10c85269ff25ea09fa.patch"; - excludes = [ "pyproject.toml" "tox.ini" ]; - hash = "sha256-oGAHmZMpMWfK+2zEDjHD115sW7exCYqfORVOLw+Wa6M="; - }) - ] ++ lib.optionals (pythonAtLeast "3.11") [ - (fetchpatch { - url = "https://github.com/twisted/twisted/pull/11734.diff"; - excludes = [ ".github/workflows/*" ]; - hash = "sha256-Td08pDxHwl7fPLCA6rUySuXpy8YmZfvXPHGsBpdcmSo="; - }) - (fetchpatch { - url = "https://github.com/twisted/twisted/commit/00bf5be704bee022ba4d9b24eb6c2c768b4a1921.patch"; - hash = "sha256-fnBzczm3OlhbjRcePIQ7dSX6uldlCZ9DJTS+UFO2nAQ="; - }) ]; __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ + hatchling + hatch-fancy-pypi-readme + incremental + ]; + propagatedBuildInputs = [ attrs automat constantly hyperlink incremental - setuptools typing-extensions zope_interface ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"pyasn1 >= 0.4",' "" - echo 'ListingTests.test_localeIndependent.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_newFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_newSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py @@ -128,6 +120,13 @@ buildPythonPackage rec { # fails since migrating to libxcrypt echo 'HelperTests.test_refuteCryptedPassword.skip = "OSError: Invalid argument"' >> src/twisted/conch/test/test_checkers.py + # expectation mismatch with `python -m twisted --help` and `python -m twisted.trial --help` usage output + echo 'MainTests.test_twisted.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py + echo 'MainTests.test_trial.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py + + # tests for missing https support in usage + echo 'ServiceTests.test_HTTPSFailureOnMissingSSL.skip = "Expectation Mismatch"' >> src/twisted/web/test/test_tap.py + # not packaged substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" @@ -154,12 +153,15 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + cython-test-exception-raiser git glibcLocales hypothesis pyhamcrest ] ++ passthru.optional-dependencies.conch + ++ passthru.optional-dependencies.http2 + ++ passthru.optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls; @@ -171,9 +173,8 @@ buildPythonPackage rec { ''; passthru = { - optional-dependencies = rec { + optional-dependencies = { conch = [ appdirs bcrypt cryptography pyasn1 ]; - conch_nacl = conch ++ [ pynacl ]; http2 = [ h2 priority ]; serial = [ pyserial ]; tls = [ idna pyopenssl service-identity ]; From 3ac28e382ffd3201a8d51ff0e2e25524375e17ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:18 +0200 Subject: [PATCH 585/752] python3Packages.txredisapi: 1.4.7 -> 1.4.9 --- .../python-modules/txredisapi/default.nix | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/txredisapi/default.nix b/pkgs/development/python-modules/txredisapi/default.nix index 9d8b268b30b2..315e7f8e2713 100644 --- a/pkgs/development/python-modules/txredisapi/default.nix +++ b/pkgs/development/python-modules/txredisapi/default.nix @@ -1,20 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub, nixosTests, six, twisted }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, six +, twisted +, nixosTests +}: buildPythonPackage rec { pname = "txredisapi"; - version = "1.4.7"; + version = "1.4.9"; + format = "pyproject"; src = fetchFromGitHub { owner = "IlyaSkriblovsky"; repo = "txredisapi"; - rev = "1.4.7"; - sha256 = "1f7j3c5l7jcfphvsk7nqmgyb4jaydbzq081m555kw0f9xxak0pgq"; + rev = "refs/tags/${version}"; + hash = "sha256-6Z2vurTAw9YHxvEiixtdxBH0YHj+Y9aTdsSkafPMZus="; }; - propagatedBuildInputs = [ six twisted ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + twisted + ] + ++ twisted.optional-dependencies.tls; + + pythonImportsCheck = [ + "txredisapi" + ]; doCheck = false; - pythonImportsCheck = [ "txredisapi" ]; passthru.tests.unit-tests = nixosTests.txredisapi; From 1fab226ec29d3749722ad671cf4ed78c7847e11c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:18 +0200 Subject: [PATCH 586/752] python3Packages.typed-settings: 2.0.2 -> 23.0.1 --- pkgs/development/python-modules/typed-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index af8b9c5ef364..3511a87127ba 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "2.0.2"; + version = "23.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-AYHA1xFS0g99cloGIjvi8loKS/Q/AteyLiLH8rf+2No="; + hash = "sha256-gnwiSCVWU0mpUDiHt9GE2DtfFd2xpOsDL5r/fFctkg4="; }; nativeBuildInputs = [ From 26f4b6c1dccfc9a9b2c2f7e60833ae4a2a9eb20f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:18 +0200 Subject: [PATCH 587/752] python3Packages.typeguard: 2.13.3 -> 4.1.5 --- .../python-modules/typeguard/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index c2a6171e1b81..7fd258e9123f 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -2,6 +2,7 @@ , fetchPypi , pythonOlder , lib +, setuptools , setuptools-scm , pytestCheckHook , typing-extensions @@ -13,30 +14,39 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.13.3"; + version = "4.1.5"; + format = "pyproject"; + disabled = pythonOlder "3.5"; - outputs = [ "out" "doc" ]; src = fetchPypi { inherit pname version; - sha256 = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"; + hash = "sha256-6goRO7wRG8/8kHieuyFWJcljQR9wlqfpBi1ORjDBVf0="; }; + outputs = [ + "out" + "doc" + ]; + nativeBuildInputs = [ glibcLocales + setuptools setuptools-scm sphinxHook sphinx-autodoc-typehints sphinx-rtd-theme ]; - LC_ALL = "en_US.utf-8"; + propagatedBuildInputs = [ + typing-extensions + ]; - postPatch = '' - substituteInPlace setup.cfg --replace " --cov" "" - ''; + env.LC_ALL = "en_US.utf-8"; - nativeCheckInputs = [ pytestCheckHook typing-extensions ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # mypy tests aren't passing with latest mypy From 33a0e1961b34cb3fcf8cee0bb68b6dc2cd4257e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:18 +0200 Subject: [PATCH 588/752] python3Packages.types-docutils: 0.19.1.6 -> 0.20.0.3 --- pkgs/development/python-modules/types-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index d42e2c0a2c84..c67234d5f25d 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.6"; + version = "0.20.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ozSnA6hoiRDQhpRk8fb4vTMNdYQ72rT4k1R7+ylBegE="; + hash = "sha256-SSjnkPQrmdWDOZD5nI3Z+p8Wgl9u0wOAypgYRtNocM0="; }; # Module doesn't have tests From 58feef741533fb825d9c5cec4fc553a7daac3448 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 589/752] python3Packages.types-pillow: 10.0.0.2 -> 10.0.0.3 --- pkgs/development/python-modules/types-pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index c3c63592624f..74b85c6e4a4d 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.0.0.2"; + version = "10.0.0.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-/gk4CrItQSztmJoGfp7kr3Gfo6R7obU7IytGUUqHEEI="; + hash = "sha256-rgyHfTY9o0m7uCxUY8nngDcpDMB9NxTLDOr10vf1yCU="; }; # Modules doesn't have tests From 0ead74b28f042201930125704ecd83bdde557e1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 590/752] python3Packages.types-setuptools: 67.4.0.3 -> 68.2.0.0 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index efa9b6cf24b7..bac128984bfb 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "67.4.0.3"; + version = "68.2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GelY39vxxaYo5UwqfuhJNQUa+3J40MHNsIrBlHV+47E="; + hash = "sha256-pCFvHi7ynQiYd7OvOrKs9InrhpzK+QUSXGnS3Dky/YU="; }; # Module doesn't have tests From 8b58bfbba4a78d8997871efe3fb730f1fe11a92c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 591/752] python3Packages.types-toml: 0.10.8.5 -> 0.10.8.7 --- pkgs/development/python-modules/types-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index 3e475b17cfd1..140664989f3b 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8.5"; + version = "0.10.8.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-v4D859LXS+kRSPR7iNmuWt6xAkq+8iqi/bq8A21rizw="; + hash = "sha256-WLB4HGgeZx/wtcAxkwmRBon0q0DookMeIF1wyUu277E="; }; # Module doesn't have tests From e770ad06c344a045a0b794496a6fb5d329c64ef5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 592/752] python3Packages.types-typed-ast: 1.5.8.6 -> 1.5.8.7 --- pkgs/development/python-modules/types-typed-ast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index ad4207769a1d..32671d584641 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.8.6"; + version = "1.5.8.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lUO1hj25e0EqKx1fQHyQgzY2WgutME1k6DKKdp9IwjA="; + hash = "sha256-93lfb51ZezUhIxQEC5k/ZhO1HYFzjtzjweOj6e9lUSQ="; }; # Module doesn't have tests From 43c6d611f3d197f067ca361d22e8a2d4242a1bf4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 593/752] python3Packages.tzdata: 2022.7 -> 2023.3 --- pkgs/development/python-modules/tzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 879024957937..91bbc854a26d 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2022.7"; + version = "2023.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-/l+Gbt3YuW6fy6l4+OUDyQmxnqfv2hHlLjlJS606e/o="; + hash = "sha256-Ee8eCOVKyw1Plb2xvgXaZZZz3krL0hv5xp6UzF6Qejo="; }; nativeBuildInputs = [ From c4249ddb762354da40cad99b3ebd9e6f22bead60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 594/752] python3Packages.tzlocal: 4.3 -> 5.0.1 --- pkgs/development/python-modules/tzlocal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 5b32b4343a05..e9ab0bc6abe3 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "4.3"; # version needs to be compatible with APScheduler + version = "5.0.1"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-PyHQnhsqqfLazKEtokDKN947pSN6k63f1tWTr+kHM1U="; + hash = "sha256-RuuZrUvbcfP3K30k9CZ3U+JAlE7PwW8l0nGbqJgnqAM="; }; nativeBuildInputs = [ From 91410ef0abd85c20846fc75ef04d2d35272a681d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 595/752] python3Packages.uamqp: 1.6.4 -> 1.6.5 --- pkgs/development/python-modules/uamqp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 2ae0d32a5679..207ad3d43727 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-uamqp-python"; - rev = "refs/tags/v.${version}"; - hash = "sha256-OjZTroaBuUB/dakl5gAYigJkim9EFiCwUEBo7z35vhQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-q8FxM4PBXLD5q68nrUJ+TGkui1yQJ3HHNF7jn+e+HkA="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ From 13f2cc97044bc8deca79ea17cbb63b347fb06f1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:19 +0200 Subject: [PATCH 596/752] python3Packages.uc-micro-py: 1.0.1 -> 1.0.2 --- .../python-modules/uc-micro-py/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix index d83a4cbd54d2..f6aa059d709c 100644 --- a/pkgs/development/python-modules/uc-micro-py/default.nix +++ b/pkgs/development/python-modules/uc-micro-py/default.nix @@ -3,24 +3,34 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "uc-micro-py"; - version = "1.0.1"; - format = "setuptools"; + version = "1.0.2"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tsutsu3"; repo = "uc.micro-py"; - rev = "v${version}"; - hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; + rev = "refs/tags/v${version}"; + hash = "sha256-PUeWYG/VyxCfhB7onAcDFow1yYqArjmfMT99+058P7U="; }; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "uc_micro" ]; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "uc_micro" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Micro subset of unicode data files for linkify-it-py"; From 0424699b657a6a207884068558437a67828d9631 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 597/752] python3Packages.ucsmsdk: 0.9.14 -> 0.9.15 --- pkgs/development/python-modules/ucsmsdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index f9d1cf6c1d79..90f5b783cc8d 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.14"; + version = "0.9.15"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; - rev = "v${version}"; - hash = "sha256-lSkURvKRgW+qV1A8OT4WYsMGlxxIqaFnxQ3Rnlixdw0="; + rev = "refs/tags/v${version}"; + hash = "sha256-xNRfsIfhoVI5ORWn6NmLCuMMJregIZWQ20QBiBsA1Pc="; }; propagatedBuildInputs = [ From eb02717d5e92992e43b0cacf984e51ad40e8f796 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 598/752] python3Packages.ufo2ft: 2.30.0 -> 2.33.4 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 9ed1ec78e1bd..98087eaae75d 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.30.0"; + version = "2.33.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ZpO55rNXkVbqMdGxsZn77gJnGBbM8c8GIAaQnTzVnf8="; + hash = "sha256-e6p/H1Vub0Ln0VhQvwsVLuD/p8uNG5oCPhfQPCTl1nY="; }; nativeBuildInputs = [ From b85c22cee804bc38fd41f6b3ffcc4ca9be83beb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 599/752] python3Packages.ufoLib2: 0.14.0 -> 0.16.0 --- pkgs/development/python-modules/ufoLib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index eba49e474aaf..c2fef2e4656a 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "ufoLib2"; - version = "0.14.0"; + version = "0.16.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-OdUJfNe3nOQyCf3nT9/5y/C8vZXnSAWiLHvZ8GXMViw="; + hash = "sha256-SfDcf3LMrP5/rv4NU9N5cdRWZNiwVj7zaVb6e/pVor0="; }; nativeBuildInputs = [ From 5bbc0c25500c32906eb8dd46756110bd1fa23dc2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 600/752] python3Packages.uharfbuzz: 0.37.0 -> 0.37.3 --- pkgs/development/python-modules/uharfbuzz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index b93552c4e07f..34bb5fef6df4 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.37.0"; + version = "0.37.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,9 +19,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "harfbuzz"; repo = "uharfbuzz"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-CZp+/5fG5IBawnIZLeO9lXke8rodqRcSf+ofyF584mc="; + hash = "sha256-876gFYyMqeGYoXMdBguV6bi7DJKHJs9HNLw9xRu+Mxk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 47197f65525f84948d4779eefe3d999c1913fbc3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 601/752] python3Packages.ujson: 5.7.0 -> 5.8.0 --- pkgs/development/python-modules/ujson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 02376023260d..9816c88f3e6b 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.7.0"; + version = "5.8.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-54jl1dyuj2EYrJtF0LiRoNVfesSA7dy38HJj8rzzeyM="; + hash = "sha256-eOMY3vSt6JikYbPZKnn5RB5+Dk0q1UGavtQzbXAsdCU="; }; nativeBuildInputs = [ From 9b7a607691cb759ca5362243721eebb1978c32d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 602/752] python3Packages.univers: 30.10.0 -> 30.11.0 --- pkgs/development/python-modules/univers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index ea450651da7e..3308be6a9b29 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "univers"; - version = "30.10.0"; + version = "30.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IJeM9Nzfqs1B0xP43i6u65XSEVPdiGhXWuORglbNARI="; + hash = "sha256-xyrg8B+C5xUN8zHLrMbAe/MWjZb8fCL0MIAz2w4B7/U="; }; nativeBuildInputs = [ From 1cc572eac1ada4f270b456de0beb0da9646a9dd7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 603/752] python3Packages.unstructured: 0.10.12 -> 0.10.14 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 2754f192d506..bf4a2f76373d 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.10.12"; + version = "0.10.14"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-v5hNl93dUEo90Hgm5u2N7tB1W5fnu+Pmnv+iw7QyQKM="; + hash = "sha256-3oLnZp6DYR4odqwsVq5B7KVgdzKZrSoGQWnvNI0fKMs="; }; propagatedBuildInputs = [ From b59720c85d6127de2c8d7439f97a22e0f70524c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:20 +0200 Subject: [PATCH 604/752] python3Packages.unstructured-inference: 0.5.22 -> 0.5.28 --- .../python-modules/unstructured-inference/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index eb34584736d3..0752fd3cf053 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.5.22"; + version = "0.5.28"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-YMPChP8/KB/UioavIa0pdj0wH9bTkN8frFmkQZ3bUPc="; + hash = "sha256-98TThX3mBInw/bnydWfgpKSANOt6OcxOdRq01nm13nA="; }; postPatch = '' From 6beb683e972947a36ab08bad407b9861388524fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:21 +0200 Subject: [PATCH 605/752] python3Packages.urllib3: 1.26.16 -> 2.0.4 --- pkgs/development/python-modules/urllib3/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 13ef39be76db..b16d4f837af9 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -5,6 +5,7 @@ , certifi , cryptography , fetchPypi +, hatchling , idna , isPyPy , mock @@ -20,14 +21,18 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.16"; - format = "setuptools"; + version = "2.0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; + hash = "sha256-jSL4aq6O9eQQ1PU5/enOayEToAG7TRieCu1wZC1gKxE="; }; + nativeBuildInputs = [ + hatchling + ]; + # FIXME: remove backwards compatbility hack propagatedBuildInputs = passthru.optional-dependencies.brotli ++ passthru.optional-dependencies.socks; From d383f499a0e3c04656fe5dbda853babc60956cca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:21 +0200 Subject: [PATCH 606/752] python3Packages.uvicorn: 0.23.1 -> 0.23.2 --- pkgs/development/python-modules/uvicorn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 9baa150afb71..bbec8df096fa 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.23.1"; + version = "0.23.2"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-X/G6K0X4G1EsMIBpvqy62zZ++8paTHNqgYLi+B7YK+0="; + rev = "refs/tags/${version}"; + hash = "sha256-98Ahb6syD/J9StwaOqVj/MCdzbHOgey0sixp7SJnROE="; }; outputs = [ From 62e0c656d2eea6eaf5907d55ec5a26c71c29befa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:21 +0200 Subject: [PATCH 607/752] python3Packages.validators: 0.21.1 -> 0.22.0 --- pkgs/development/python-modules/validators/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 1c0131c0549d..8e29effda9a2 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "validators"; - version = "0.21.1"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,11 +17,11 @@ buildPythonPackage rec { owner = "python-validators"; repo = "validators"; rev = "refs/tags/${version}"; - hash = "sha256-b5K1WP+cEAjPBXu9sAZQf1J5H7PLnn94400Zd/0Y9ew="; + hash = "sha256-Qu6Tu9uIluT1KBJYkFjDFt9AWN2Kez3uCYDQknXqYrU="; }; nativeBuildInputs = [ - poetry-core + setuptools ]; nativeCheckInputs = [ From 5fd4fe4d3559135a57aa702f6d8447de072e5355 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:21 +0200 Subject: [PATCH 608/752] python3Packages.vcrpy: 4.2.1 -> 5.1.0 --- pkgs/development/python-modules/vcrpy/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 043d08a022bb..fc4283766b52 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, mock , pytest-httpbin , pytestCheckHook , pythonOlder @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.2.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; + hash = "sha256-u/FTLyYYoE8RvOKpmvOpZHoyyICVcpP/keCl8Ye2s9I="; }; propagatedBuildInputs = [ @@ -41,6 +40,9 @@ buildPythonPackage rec { disabledTests = [ "TestVCRConnection" + # https://github.com/kevin1024/vcrpy/issues/645 + "test_get_vcr_with_matcher" + "test_testcase_playback" ]; pythonImportsCheck = [ From 717212f1badb8e72638c6cc21c8fe3eda4bc72ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:21 +0200 Subject: [PATCH 609/752] python3Packages.vector: 1.0.0 -> 1.1.1 --- pkgs/development/python-modules/vector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 03f38e12a6f1..cbfe657219e8 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.0.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-T62k/dqlwb1ppbopb/2UjMy1da16vlPRSWD1b+Mt1ME="; + hash = "sha256-aVdFHlnOUI9hgzVRnFPzDOuItwU9ZfPRZkWf1wjtOLU="; }; nativeBuildInputs = [ From dabe0b38a4d391191e93efd70c6159ea034759eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:21 +0200 Subject: [PATCH 610/752] python3Packages.velbus-aio: 2023.5.0 -> 20212.6.2 --- pkgs/development/python-modules/velbus-aio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index acce834fa7a1..33b8e68aa614 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2023.5.0"; + version = "20212.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Cereal2nd"; repo = pname; - rev = version; - hash = "sha256-8wRgH7t1s2X7mg3oN38KMvJQfWcn/ePw6rNIl2K9nNA="; + rev = "refs/tags/${version}"; + hash = "sha256-MqSqwyfNICEU6h7+HAep3z1Uak30rlQ6noWEB3awVpA="; fetchSubmodules = true; }; From 32436fab5679ef41ef2a72a0b53b72434e645abd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:22 +0200 Subject: [PATCH 611/752] python3Packages.virtualenv: 20.24.0 -> 20.24.5 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 10602bfd4f3a..18db218039d3 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.24.0"; + version = "20.24.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4qfO+dqIDWk7kz23ZUNndU8U4gZQ3GDo7nOFVx+Fk6M="; + hash = "sha256-6DYZZ/bab73xQmSDv+n8qCh8JCrAvDBCmQVyHO+/91I="; }; nativeBuildInputs = [ From 9a45ea12b8ce7bfc7b6f66545da794533f199861 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:22 +0200 Subject: [PATCH 612/752] python3Packages.vncdo: 0.12.0 -> 1.1.0 --- pkgs/development/python-modules/vncdo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix index b6d12a67185c..5f27bba823c4 100644 --- a/pkgs/development/python-modules/vncdo/default.nix +++ b/pkgs/development/python-modules/vncdo/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "vncdo"; - version = "0.12.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sibson"; repo = "vncdotool"; - rev = "v${version}"; - sha256 = "0h3ccr8zi7xpgn6hz43x1045x5l4bhha7py8x00g8bv6gaqlbwxn"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-m8msWa8uUuDEjEUlXHCgYi0HFPKXLVXpXLyuQ3quNbA="; }; propagatedBuildInputs = [ From 9ff9e356f8c7e0e7caeb61ee60d0c71bf3fabdd0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:22 +0200 Subject: [PATCH 613/752] python3Packages.vulture: 2.7 -> 2.9.1 --- pkgs/development/python-modules/vulture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index b56835032490..e3fcad870a95 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.7"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Z/uAoBTtn9tZndRLuWy1QxEDKhBBBvwucG73ptrYgDI="; + hash = "sha256-tqKqYytv1RSIqO6sZQq0pQm7GgMugZQ4F6ii5qY6MLM="; }; postPatch = '' From ae93c79e06212675201b7dc6659038f26786fc52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:22 +0200 Subject: [PATCH 614/752] python3Packages.w3lib: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/w3lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 08ce68fdd616..66e48a2b7f29 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "w3lib"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DhGY8bdFGVtrPdGkzWYBH7+C8wpNnauu4fnlyG8CAnQ="; + hash = "sha256-7Vt06ZfuoqvjwTIfkW40QUTujpBypvM0Y+6OV/hYpLE="; }; nativeCheckInputs = [ From caa691873b463e1dbe4944fcd1f7af112b3d7837 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:22 +0200 Subject: [PATCH 615/752] python3Packages.wagtail: 5.0.2 -> 5.1.1 --- pkgs/development/python-modules/wagtail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 54c30dabc781..c985cca8924d 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "5.0.2"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3r0h34el2zRF1l/94S7xTjBqJPWtSQFQvtVW8Mjq0rs="; + hash = "sha256-IR/wzXBZ+Win/EOFUDsg2AHB5otW9YMeCmpPxgCllD8="; }; postPatch = '' From 20e65736305b94ce97ab7b9c1cd54f469ff64e7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:22 +0200 Subject: [PATCH 616/752] python3Packages.wagtail-localize: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/wagtail-localize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 085eca293d11..29439bb2a2d1 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-RjJyx3sr69voJxa3lH8Nq/liZ3eMoTfZ4phykj7neZA="; + hash = "sha256-7r2FFfWGqjE3Z7wsdf6KwwbUZ+wXqOscsL/2CepSMLY="; }; nativeBuildInputs = [ From e400264b209123d71d875956f8d5eddab1a85fba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:22 +0200 Subject: [PATCH 617/752] python3Packages.watermark: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/watermark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index 6cb717679d1a..29b600624e87 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasbt"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-E3UxdGlxTcvkiKa3RoG9as6LybyW+QrCUZvA9VHwxlk="; + rev = "refs/tags/v${version}"; + hash = "sha256-4/1Y7cdh1tF33jgPrqdxCGPcRnnxx+Wf8lyztF54Ck0="; }; propagatedBuildInputs = [ From d9c1e21816c0e969a05627648e3e78b674bef8e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:23 +0200 Subject: [PATCH 618/752] python3Packages.weaviate-client: 3.22.1 -> 3.24.1 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 3e56109bcbe3..3ba0e22f83a1 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.22.1"; + version = "3.24.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-r/Yb0/XXTfIKYjKEQ+OqnIYNUzD9+xnE2N3ETLYEAy8="; + hash = "sha256-4HM1DCG9TcpcDqxd1dlftHQnjHFaryBB44LYa7dRisg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1cdd36197ffda01a1b03cec313abe07da4935085 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:23 +0200 Subject: [PATCH 619/752] python3Packages.webcolors: 1.12 -> 1.13 --- pkgs/development/python-modules/webcolors/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 5ec245676a6a..7ee91e7ea2b4 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -3,20 +3,25 @@ , fetchPypi , pythonOlder , unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "webcolors"; - version = "1.12"; - format = "setuptools"; + version = "1.13"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FtBD06CP1qGxt+Pp5iZA0JeQ3OgNK91HkqF1s1/nlKk="; + hash = "sha256-wiW2dMg/qSO+k9I1MwzgMANz0CiFzvIyOIE7DVZoMEo="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; From a58d84baf70858757c3fcce92dd8a57fbc873596 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:23 +0200 Subject: [PATCH 620/752] python3Packages.websocket-client: 1.5.1 -> 1.6.3 --- pkgs/development/python-modules/websocket-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index a2873a26f07d..26c27825f7bd 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.5.1"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Pwnm2CMIklRxMhd/V1pOPnPP3wZSbiDMAqocO0cYTUA="; + hash = "sha256-Oq0l0xKEJmvPz9H9inQ/YygjBaNkuNCUikO9YGrMZS8="; }; propagatedBuildInputs = [ From 712321b5d084d32e13146142ed785b3861982e17 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:23 +0200 Subject: [PATCH 621/752] python3Packages.websockets: 10.4 -> 11.0.3 --- pkgs/development/python-modules/websockets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 98bc6cc863ca..ec6e429f5945 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "websockets"; - version = "10.4"; + version = "11.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aaugustin"; repo = pname; - rev = version; - hash = "sha256-IylvnaS8cHatA+WMc5uY9E+l+52INqOMITU1VJPO2xY="; + rev = "refs/tags/${version}"; + hash = "sha256-RdkbIiZI/UYsWdnnl5gJPsnJ/6adfFtkiXC7MO/HwcI="; }; patchPhase = '' From 42afed71a46189df255f249579233a03c1bf5a6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:23 +0200 Subject: [PATCH 622/752] python3Packages.werkzeug: 2.2.3 -> 2.3.7 --- .../python-modules/werkzeug/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index e5b6a93eae6d..db045e77c52f 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, flit-core , watchdog , ephemeral-port-reserve , pytest-timeout @@ -15,30 +16,37 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.2.3"; - format = "setuptools"; + version = "2.3.7"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + inherit pname version; + hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ markupsafe - ] ++ lib.optionals (!stdenv.isDarwin) [ - # watchdog requires macos-sdk 10.13+ - watchdog ]; + passthru.optional-dependencies = { + watchdog = lib.optionals (!stdenv.isDarwin) [ + # watchdog requires macos-sdk 10.13[ + watchdog + ]; + }; + nativeCheckInputs = [ ephemeral-port-reserve pytest-timeout pytest-xprocess pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = lib.optionals stdenv.isDarwin [ "test_get_machine_id" From f597db92183ca61ceda14609c4597b700857ebb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:23 +0200 Subject: [PATCH 623/752] python3Packages.widgetsnbextension: 4.0.7 -> 4.0.9 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index a27ebf2ec589..679e19722f45 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.7"; + version = "4.0.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6mfBenzUrjWPj0bDswTEBpi8BCNzLj8nMyHuFBIyyL4="; + hash = "sha256-PB9eRtwRZt/UCkLWhealE5b9NP+Hh0Kj5HxvDMSio4U="; }; nativeBuildInputs = [ From 0fbba782d118255fea9ac064b3e31d53b3b9c041 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:23 +0200 Subject: [PATCH 624/752] python3Packages.willow: 1.5.1 -> 1.6.2 --- .../python-modules/willow/default.nix | 58 +++++++++++++++---- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index f7030f7c874e..0fc9b58fb704 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,34 +1,70 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +# build-system +, flit-core + # dependencies , filetype -, defusedxml, +, defusedxml + +# tests +, numpy +, opencv4 +, pillow +, pytestCheckHook +, wand }: buildPythonPackage rec { pname = "willow"; - version = "1.5.1"; - format = "setuptools"; + version = "1.6.2"; + format = "pyproject"; disabled = pythonOlder "2.7"; - src = fetchPypi { - pname = "Willow"; - inherit version; - hash = "sha256-t6SQkRATP9seIodZLgZzzCVeAobhzVNCfuaN8ckiDEw="; + src = fetchFromGitHub { + owner = "wagtail"; + repo = "Willow"; + rev = "refs/tags/v${version}"; + hash = "sha256-dW2FVN3/mBAhVQ094uBsnXzdyTRKgHUDx0SWLm3g374="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ filetype defusedxml ]; - # Test data is not included - # https://github.com/torchbox/Willow/issues/34 - doCheck = false; + passthru.optional-dependencies = { + heif = [ + # TODO: pillow-heif + ]; + }; + + nativeCheckInputs = [ + numpy + opencv4 + pytestCheckHook + pillow + wand + ]; + + disabledTests = [ + # pillow-heif missing + "test_avif" + "test_heic" + "test_heif" + "test_save_as_avif" + "test_save_as_heif" + "test_save_as_heic" + "test_detect_faces" + ]; meta = with lib; { description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; From d352ae57357bbea68223068905e90bb18bc9dba2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:24 +0200 Subject: [PATCH 625/752] python3Packages.wtf-peewee: 3.0.3 -> 3.0.4 --- .../python-modules/wtf-peewee/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index 326a56461a45..d4e37b597681 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch +, setuptools , peewee , wtforms , python @@ -9,19 +9,16 @@ buildPythonPackage rec { pname = "wtf-peewee"; - version = "3.0.3"; + version = "3.0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15"; + hash = "sha256-cTbYRdvAUTY86MPR33BH+nA6H/epR8sgHDgOBQ/TUkQ="; }; - patches = [ - (fetchpatch { - name = "fix-wtforms3.patch"; - url = "https://github.com/coleifer/wtf-peewee/commit/b1764f4474c73a9a2b34ae6b7db61274f5252a7f.patch"; - sha256 = "0maz3fm9bi8p80nk9sdb34xq55xq8ihm51y7k0m8ck9aaypvwbig"; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -30,7 +27,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck ${python.interpreter} runtests.py + runHook postCheck ''; meta = with lib; { From 458c58145981871a02e03692e1663441acbfae9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:24 +0200 Subject: [PATCH 626/752] python3Packages.xapp: 2.4.1 -> 21 --- pkgs/development/python-modules/xapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 58de4e7124ad..8b8b795edda9 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.4.1"; + version = "21"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; - rev = version; + rev = "refs/tags/master.mint${version}"; hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o="; }; From 6a31b3e7624375451b12b7334ca8626d9e436444 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:24 +0200 Subject: [PATCH 627/752] python3Packages.xarray: 2023.7.0 -> 2023.8.0 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 45e79fdd89d0..12cefa0332aa 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2023.7.0"; + version = "2023.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2s4v2/G3/xhdnBImokv4PCrlLzJT2/6A4X0RYmANBVw="; + hash = "sha256-glxtZCAqcxpOSTIe3R6d+r9L4GgC8bjIo8AKPr/Izt8="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From 4fa3e36493f21e90b990e20883c10358b02eab11 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:24 +0200 Subject: [PATCH 628/752] python3Packages.xdg: 5.1.1 -> 6.0.0 --- pkgs/development/python-modules/xdg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index d5583200becb..f44d2e443566 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "6.0.0"; pname = "xdg"; disabled = isPy27; format = "pyproject"; @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = pname; - rev = version; - hash = "sha256-z/Zvo2WGw9qA+M3Pt9r35DuxtuhL7/I75LlFEdDOJcc="; + rev = "refs/tags/${version}"; + hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; }; nativeBuildInputs = [ poetry-core ]; From 1a9a257cf753f104b59f19d14d04c148f721dfb2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:24 +0200 Subject: [PATCH 629/752] python3Packages.xdot: 1.2 -> 1.3 --- pkgs/development/python-modules/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index cd7fdd9a218b..49d68b6c9922 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "xdot"; - version = "1.2"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "3df91e6c671869bd2a6b2a8883fa3476dbe2ba763bd2a7646cf848a9eba71b70"; + sha256 = "sha256-FtyvfAY8x/smpSkKDRZgawPeF4plNePUndFnCbZCBoE="; }; disabled = !isPy3k; From 59aeb0c8a5de994c093058b9d2572249f3a99ac0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:24 +0200 Subject: [PATCH 630/752] python3Packages.xformers: 0.0.21 -> 0.03 --- pkgs/development/python-modules/xformers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 1dc11e5f01a4..c71c7f34261b 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -27,7 +27,7 @@ #, flash-attn }: let - version = "0.0.21"; + version = "0.03"; in buildPythonPackage { pname = "xformers"; @@ -39,8 +39,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "facebookresearch"; repo = "xformers"; - rev = "v${version}"; - hash = "sha256-zYziynjLtqjPPHjDbruuuG9209y0Sh+wYUFHUj+QG2Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-G8f7tny5B8SAQ6+2uOjhY7nD0uOT4sskIwtTdwivQXo="; fetchSubmodules = true; }; From b0e3a21dd38d4716da3b5daf54281ae9c41c6a10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:24 +0200 Subject: [PATCH 631/752] python3Packages.xxhash: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/xxhash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 9062026f742b..10afcbe83789 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "3.3.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - hash = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; + hash = "sha256-w/njIrHr7r1E49nS2bEk4MVQwe9BvVUq/c3XGVFu5Bo="; }; nativeBuildInputs = [ From d8a98efed67aa46c728bb5c8e25e59687474007f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:25 +0200 Subject: [PATCH 632/752] python3Packages.xyzservices: 2023.2.0 -> 2023.7.0 --- .../python-modules/xyzservices/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 5a03ed14fcbf..797242993f92 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -1,22 +1,28 @@ { lib , buildPythonPackage -, fetchFromGitHub , fetchPypi , mercantile , pytestCheckHook , requests +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "xyzservices"; - version = "2023.2.0"; - format = "setuptools"; + version = "2023.7.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-M0K7pBDXlBKQ7tDlii5arbD3uXhj7EKDsoPEBu5yOig="; + hash = "sha256-DskodCIn1vXUNn6ntFf8/tlDQp9N4pSbWwKoLN9VadY="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + disabledTests = [ # requires network connections "test_free_providers" From 372f7c2d20ba08f26577282e554dd485607e161e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:25 +0200 Subject: [PATCH 633/752] python3Packages.yangson: 1.4.18 -> 1.4.19 --- pkgs/development/python-modules/yangson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 05d26bcd4859..00cdf026c46f 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.18"; + version = "1.4.19"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-VMgx2MTiOoAw8tW8SckheN950JVbdWWSS3PWDNs0dT0="; + hash = "sha256-rYUxv3TEdyr2D3UEmmHcJJtlG6gXJnp1c2pez4H13SU="; }; nativeBuildInputs = [ From bb534765ed729bd322d806a3a87654c21aab81bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:25 +0200 Subject: [PATCH 634/752] python3Packages.yark: 1.2.7 -> 1.2.8 --- pkgs/development/python-modules/yark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index 8c171d9d74ae..9012efc8a81d 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "yark"; - version = "1.2.7"; + version = "1.2.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8O4EpHb1fP/O/t6hS1K1ylSXNKBuiipo7wvEnUJODSw="; + hash = "sha256-FXgJ/y8qN7FkR7nhpNgPvUH/EQgw8cgRFqUA9KiJKKM="; }; pythonRelaxDeps = [ From f5d46e234ad7256a738bb22dd916c6b16e9da334 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:25 +0200 Subject: [PATCH 635/752] python3Packages.zarr: 2.16.0 -> 2.16.1 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 0f27248c688c..78610073af01 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.16.0"; + version = "2.16.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hONraVvaDs6lKvmGEnGYTLIqXIZGeZB7e5uj95toT34="; + hash = "sha256-QnbPS0plNDEELNU/8igrxNKSpoQkEeiFKZZFBPsHMoY="; }; nativeBuildInputs = [ From f03a2ba3e18b5f6d52879b42956810bec97066c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:25 +0200 Subject: [PATCH 636/752] python3Packages.zict: 2.2.0 -> 3.0.0 --- .../python-modules/zict/default.nix | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index d1e7891eee52..4bd3e7692283 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -1,19 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, heapdict, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest-asyncio +, pytest-repeat +, pytest-timeout +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "zict"; - version = "2.2.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-1zZsLiKTMUES3PJDIQhCime5J7AABWGf7vwxDRLYM/M="; - }; + version = "3.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ heapdict ]; + src = fetchPypi { + inherit pname version; + hash = "sha256-4yHiY7apeq/AeQw8+zwEZWtwZuZzjDf//MqV2APJ+6U="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + pytest-repeat + pytest-timeout + ]; meta = with lib; { description = "Mutable mapping tools."; From d62c572d51e64d69a29e31d80712c63a43f2a6ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:26 +0200 Subject: [PATCH 637/752] python3Packages.zope-deferredimport: 4.4 -> 5.0 --- .../python-modules/zope-deferredimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index b60a393e4286..526e6954f57e 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zope-deferredimport"; - version = "4.4"; + version = "5.0"; src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add"; + sha256 = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; propagatedBuildInputs = [ zope_proxy ]; From 67e086216ef80c9f4d6ef6fff4f58eaa2538162b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:26 +0200 Subject: [PATCH 638/752] python3Packages.zope-testbrowser: 5.6.1 -> 6.0 --- pkgs/development/python-modules/zope-testbrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 59c6e676938e..15b3f74a4394 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "zope-testbrowser"; - version = "5.6.1"; + version = "6.0"; format = "setuptools"; src = fetchPypi { pname = "zope.testbrowser"; inherit version; - sha256 = "035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7"; + sha256 = "sha256-RLd6XpA3q+3DZHai6j3H6XTWE85Sk913zAL4iO4x+ho="; }; postPatch = '' From 3104fde37530c414e09cfbc45251a25f0f6ef3cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:26 +0200 Subject: [PATCH 639/752] python3Packages.zopfli: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/zopfli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index 97625a3e3c1c..c8ecd77730d8 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.2.2"; + version = "0.2.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1z1akqx3fjnwa75insch9p08hafikqdvqkj6mxv1k6fr81sxnj9d"; + sha256 = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; extension = "zip"; }; From 1f40b8b8ba9c24564258e1ebc813d5a166e95ec4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:26 +0200 Subject: [PATCH 640/752] python3Packages.zstandard: 0.20.0 -> 0.21.0 --- pkgs/development/python-modules/zstandard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 2da5ae524bb3..2bc20be4d4ed 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YT2q3XLHGxSIdCyvssOzgcOdDJu4xswVeqLV6kXMLvw="; + hash = "sha256-8I46ENAaJHh35MthqCoxnqdGw1ajeGVYvtJIHmxAVUY="; }; propagatedNativeBuildInputs = [ From c79d8276b79a785142d277b4737bdc6c3cf4a380 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 18:12:39 +0200 Subject: [PATCH 641/752] python311Packages.requests-toolbelt: disable failing tests A number of tests started failing after bumping urllib3 past version 2.0. --- .../python-modules/requests-toolbelt/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index d7b6f01d16c2..0d4bf487d7bf 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -29,6 +29,16 @@ buildPythonPackage rec { trustme ]; + disabledTests = [ + # incompatible with urllib3 2.0 + "test_dump_response" + "test_dump_all" + "test_prepared_request_override_base" + "test_prepared_request_with_base" + "test_request_override_base" + "test_request_with_base" + ]; + pythonImportsCheck = [ "requests_toolbelt" ]; From 4cac09e184f21eb69e25cc27a5f045deebe40409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 15 Sep 2023 21:15:55 +0200 Subject: [PATCH 642/752] python310Packages.anyio: disable timing sensitive test --- pkgs/development/python-modules/anyio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 9fc63cb0d161..06112cccdc3f 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -84,6 +84,10 @@ buildPythonPackage rec { "test_exception_group_children" "test_exception_group_host" "test_exception_group_filtering" + # timing sensitive + # assert threading.active_count() == initial_count + 1 + # assert 4 == (4 + 1) + "test_run_sync_from_thread_pooling" ] ++ lib.optionals stdenv.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' "test_is_block_device" From 08781ce85ea6658f9b17175fbd19d98af58a8555 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 00:22:20 +0200 Subject: [PATCH 643/752] python311Packages.scipy: relax meson-python constraint and reference their repo URL in meta. --- pkgs/development/python-modules/scipy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 7312e53ed413..b875c452b43e 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -79,6 +79,7 @@ in buildPythonPackage { # Relax deps a bit postPatch = '' substituteInPlace pyproject.toml \ + --replace 'meson-python>=0.12.1,<0.14.0' 'meson-python' \ --replace 'numpy==' 'numpy>=' \ --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" \ --replace 'wheel<0.41.0' 'wheel' @@ -214,6 +215,7 @@ in buildPythonPackage { meta = with lib; { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; + downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fridh doronbehar ]; From 6e5d2c7e838827d754a5f3cb16d0d86c8e202489 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 01:59:31 +0200 Subject: [PATCH 644/752] python311Packages.rich: disable failing tests These are due to mismatching expectations with pygments 2.16.1. --- pkgs/development/python-modules/rich/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index c6646749730d..86c3ac1ffeeb 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -46,6 +46,20 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # pygments 2.16 compat + # https://github.com/Textualize/rich/issues/3088 + "test_card_render" + "test_markdown_render" + "test_markdown_render" + "test_python_render" + "test_python_render_simple" + "test_python_render_simple_passing_lexer_instance" + "test_python_render_indent_guides" + "test_option_no_wrap" + "test_syntax_highlight_ranges" + ]; + pythonImportsCheck = [ "rich" ]; From 91534a23a2a46554f82a33db41788655b7da05df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 02:10:25 +0200 Subject: [PATCH 645/752] python311Packages.stack-data: disable tests Tests require typeguard<3 and an issue has been open for half a year with no movement. --- pkgs/development/python-modules/stack-data/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index e1649db165bc..cba83f5df09b 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -47,6 +47,10 @@ buildPythonPackage rec { typeguard ]; + # https://github.com/alexmojaki/stack_data/issues/50 + # incompatible with typeguard>=3 + doCheck = false; + disabledTests = [ # AssertionError "test_example" From 9d95c15178198eee21576e0ffce96a1792720a37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 02:18:06 +0200 Subject: [PATCH 646/752] python311Packages.flake8: 6.0.0 -> 6.1.0 --- pkgs/development/python-modules/flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 860f449fd8b3..4a05efc146ba 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flake8"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-dN9LlLpQ/ZoVIFrAQ1NxMvsHqWsgdJVLUIAFwkheEL4="; + hash = "sha256-N8bufkn1CUREHusVc2mQ1YlNr7lrESEZGmlN68bhgbE="; }; propagatedBuildInputs = [ From c81eb0f330b8c3de1cc3acabee5d63e11a7e9746 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 12:07:20 +0200 Subject: [PATCH 647/752] python311Packages.pytest-benchmark: fix tests expose optional-dependencies. --- .../python-modules/pytest-benchmark/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 135b0c2295e3..f9011b6d721b 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -2,6 +2,7 @@ , aspectlib , buildPythonPackage , elasticsearch +, elastic-transport , fetchFromGitHub , fetchpatch , freezegun @@ -11,6 +12,7 @@ , pygal , pytest , pytestCheckHook +, pytest-xdist , pythonOlder , isPy311 }: @@ -45,19 +47,24 @@ buildPythonPackage rec { py-cpuinfo ]; + passthru.optional-dependencies = { + aspect = [ aspectlib ]; + histogram = [ pygal ]; + elasticsearch = [ elasticsearch ]; + }; + pythonImportsCheck = [ "pytest_benchmark" ]; nativeCheckInputs = [ - aspectlib - elasticsearch + elastic-transport freezegun git mercurial - pygal pytestCheckHook - ]; + pytest-xdist + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" From 580cb8df0a9308ae89368fb3ebfcffb33b954f12 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 12:15:17 +0200 Subject: [PATCH 648/752] python311Packages.dirty-equals: run tests in passthru.tests to escape infinite recursion with pydantic. --- .../python-modules/dirty-equals/default.nix | 79 ++++++++++--------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index 5d0c94686926..9f40226e6bb3 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -9,43 +9,48 @@ , pytz }: -buildPythonPackage rec { - pname = "dirty-equals"; - version = "0.7.0"; - format = "pyproject"; +let + dirty-equals = buildPythonPackage rec { + pname = "dirty-equals"; + version = "0.7.0"; + format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "samuelcolvin"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pytz + ]; + + doCheck = false; + passthru.tests.pytest = dirty-equals.overrideAttrs { doCheck = true; }; + + nativeCheckInputs = [ + pydantic + pytest-examples + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirty_equals" + ]; + + meta = with lib; { + description = "Module for doing dirty (but extremely useful) things with equals"; + homepage = "https://github.com/samuelcolvin/dirty-equals"; + changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; }; - - nativeBuildInputs = [ - hatchling - ]; - - propagatedBuildInputs = [ - pytz - ]; - - nativeCheckInputs = [ - pydantic - pytest-examples - pytestCheckHook - ]; - - pythonImportsCheck = [ - "dirty_equals" - ]; - - meta = with lib; { - description = "Module for doing dirty (but extremely useful) things with equals"; - homepage = "https://github.com/samuelcolvin/dirty-equals"; - changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} +in dirty-equals From c19f199d725dc8ceaef8b17b829c81fd7bd49005 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 12:22:47 +0200 Subject: [PATCH 649/752] python311Packages.pytest-httpbin: disable failing test Likely broke with the flask 2.3 update. --- pkgs/development/python-modules/pytest-httpbin/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index c56c34dff574..db94f2b6e163 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { requests ]; + disabledTests = [ + # incompatible with flask 2.3 + "test_redirect_location_is_https_for_secure_server" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ From f1a3b9747f264d9b50cccd7d397315c3b2a2f268 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 12:30:00 +0200 Subject: [PATCH 650/752] release-python.nix: Update tested set to python311 --- pkgs/top-level/release-python.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 691f50708ace..75e0b2def622 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -36,11 +36,11 @@ let meta.description = "Release-critical packages from the python package sets"; constituents = [ jobs.remarshal.x86_64-linux # Used in pkgs.formats helper - jobs.python39Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert - jobs.python39Packages.colorama.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.ptpython.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.requests.x86_64-linux # Almost ubiquous package - jobs.python39Packages.sphinx.x86_64-linux # Document creation for many packages + jobs.python311Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert + jobs.python311Packages.colorama.x86_64-linux # Used in nixos test-driver + jobs.python311Packages.ptpython.x86_64-linux # Used in nixos test-driver + jobs.python311Packages.requests.x86_64-linux # Almost ubiquous package + jobs.python311Packages.sphinx.x86_64-linux # Document creation for many packages ]; }; From 29d27793fa7cd60ec757d8d8e796059d304c583c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 12:38:14 +0200 Subject: [PATCH 651/752] python311Packages.pydantic-settings: init at 2.0.3 Packaged for fastapi tests. --- .../pydantic-settings/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pydantic-settings/default.nix diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix new file mode 100644 index 000000000000..a375ded35f04 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pydantic +, python-dotenv +, pytestCheckHook +, pytest-examples +, pytest-mock +}: + +buildPythonPackage rec { + pname = "pydantic-settings"; + version = "2.0.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-settings"; + rev = "v${version}"; + hash = "sha256-3V6daCibvVr8RKo2o+vHC++QgIYKAOyRg11ATrCzM5Y="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pydantic + python-dotenv + ]; + + pythonImportsCheck = [ "pydantic_settings" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-examples + pytest-mock + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Settings management using pydantic"; + homepage = "https://github.com/pydantic/pydantic-settings"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3e300204e26..299aead418c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9075,6 +9075,8 @@ self: super: with self; { pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; + pydantic-settings = callPackage ../development/python-modules/pydantic-settings { }; + pydash = callPackage ../development/python-modules/pydash { }; pydata-google-auth = callPackage ../development/python-modules/pydata-google-auth { }; From b473fdf73696127ad625f56674ebcfd4f72de1d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 12:51:07 +0200 Subject: [PATCH 652/752] python311Packages.pydantic-extra-types: init at 2.1.0 Packaged for fastapi tests. --- .../pydantic-extra-types/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/pydantic-extra-types/default.nix diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix new file mode 100644 index 000000000000..539873a1a4be --- /dev/null +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pydantic +, phonenumbers +, pycountry +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pydantic-extra-types"; + version = "2.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-extra-types"; + rev = "v${version}"; + hash = "sha256-QPBOHIssTsWQlEg2WRpLRKrB6zmae43EExnPn5P4oAY="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pydantic + ]; + + passthru.optional-dependencies = { + all = [ + phonenumbers + pycountry + ]; + }; + + pythonImportsCheck = [ "pydantic_extra_types" ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.all; + + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + + meta = with lib; { + description = "Extra Pydantic types"; + homepage = "https://github.com/pydantic/pydantic-extra-types"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 299aead418c7..7066f275e20f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9073,6 +9073,8 @@ self: super: with self; { pydantic-core = callPackage ../development/python-modules/pydantic-core { }; + pydantic-extra-types = callPackage ../development/python-modules/pydantic-extra-types { }; + pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; pydantic-settings = callPackage ../development/python-modules/pydantic-settings { }; From 73e2ff80e42b0235aaa9d3734f8bbc6c6cb947f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 12:56:04 +0200 Subject: [PATCH 653/752] python311Packages.watchfiles: disable failing test and clean up unused arguments. --- pkgs/development/python-modules/watchfiles/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 2d2b9aa649ca..98d80db36369 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -6,13 +6,11 @@ , fetchFromGitHub , rustPlatform , rustc -, setuptools-rust , pythonOlder , dirty-equals , pytest-mock , pytest-timeout , pytestCheckHook -, python , CoreServices , libiconv }: @@ -73,6 +71,11 @@ buildPythonPackage rec { rm -rf watchfiles ''; + disabledTests = [ + # BaseExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception) + "test_awatch_interrupt_raise" + ]; + pythonImportsCheck = [ "watchfiles" ]; From 3e547e1985d672b640ad78de652997a348a5eef1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 13:50:02 +0200 Subject: [PATCH 654/752] python311Packages.dbus-deviation: fix build Cannot be installed using the legacy setuptools.installer any longer. Does not detect sphinx, but also does not require it. Unmaintained since 2021. --- pkgs/development/python-modules/dbus-deviation/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix index 016b18f25081..164c543a5ed7 100644 --- a/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/pkgs/development/python-modules/dbus-deviation/default.nix @@ -9,12 +9,17 @@ buildPythonPackage rec { pname = "dbus-deviation"; version = "0.6.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-4GuI7+IjiF0nJd9Rz3ybe0Y9HG8E6knUaQh0MY0Ot6M="; }; + postPatch = '' + sed -i "/'sphinx',/d" setup.py + ''; + nativeBuildInputs = [ setuptools-git sphinx From cc8f9cba45d9f6d938ebf3a265c1b7fb6d570c94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 14:20:18 +0200 Subject: [PATCH 655/752] python311Packages.aws-sam-translator: fix tests Apply patch for pydantic 2.x compat and disable failing tests due to urllib3 2.x update. --- .../aws-sam-translator/default.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 7fe9fdac96eb..5a7b1af3e8f1 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -2,6 +2,7 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, fetchpatch , jsonschema , parameterized , pydantic @@ -28,6 +29,13 @@ buildPythonPackage rec { hash = "sha256-uOfBR0bvLVyBcfSAkSqOx4KjmSYbfktpJlxKjipfj50="; }; + patches = [ + (fetchpatch { + url = "https://github.com/aws/serverless-application-model/commit/e41b0f02204635a655100b68dd38220af32a2728.patch"; + hash = "sha256-V6KXdXQUr9fvLzxI6sUMrSRnGX5SrAaDygcaQ87FaQ8="; + }) + ]; + postPatch = '' substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" @@ -57,6 +65,26 @@ buildPythonPackage rec { sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini ''; + disabledTests = [ + # urllib3 2.0 compat + "test_plugin_accepts_different_sar_client" + "test_plugin_accepts_flags" + "test_plugin_accepts_parameters" + "test_plugin_default_values" + "test_plugin_invalid_configuration_raises_exception" + "test_plugin_must_setup_correct_name" + "test_must_process_applications" + "test_must_process_applications_validate" + "test_process_invalid_applications" + "test_process_invalid_applications_validate" + "test_resolve_intrinsics" + "test_sar_service_calls" + "test_sar_success_one_app" + "test_sar_throttling_doesnt_stop_processing" + "test_sleep_between_sar_checks" + "test_unexpected_sar_error_stops_processing" + ]; + meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; homepage = "https://github.com/awslabs/serverless-application-model"; From 7c806bff21e35ad1030630e0d971eb508f80fc6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Sep 2023 14:29:10 +0200 Subject: [PATCH 656/752] python311Packages.brotlicffi: 1.0.9.2 -> 1.1.0.0 https://github.com/python-hyper/brotlicffi/compare/v1.0.9.2...v1.1.0.0 --- pkgs/development/python-modules/brotlicffi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix index 5e0600d343a8..fd30ab86c07c 100644 --- a/pkgs/development/python-modules/brotlicffi/default.nix +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "brotlicffi"; - version = "1.0.9.2"; - disabled = pythonOlder "3.6"; + version = "1.1.0.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-hyper"; repo = pname; rev = "v${version}"; - sha256 = "0qx7an7772brmx1rbbrqzqnkqqvicc70mx740nl31kzzyv4jjs00"; + sha256 = "sha256-oW4y1WBJ7+4XwNwwSSR0qUqN03cZYXUYQ6EAwce9dzI="; }; buildInputs = [ From b6bd677495fec9be846e1828635a22ed9e272ba2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 16 Sep 2023 22:51:58 +0900 Subject: [PATCH 657/752] awscli2: relax docutils and prompt-toolkit constraint and pin urllib3 to v1 --- pkgs/tools/admin/awscli2/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 8b9739df8b7d..3bd464a28e4f 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -17,6 +17,13 @@ let hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; }); + urllib3 = prev.urllib3.overridePythonAttrs (prev: { + format = "setuptools"; + src = prev.src.override { + version = "1.26.16"; + hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; + }; + }); }); }; @@ -37,7 +44,9 @@ with py.pkgs; buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ --replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \ - --replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' + --replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' \ + --replace 'docutils>=0.10,<0.20' 'docutils>=0.10' \ + --replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' substituteInPlace requirements-base.txt \ --replace "wheel==0.38.4" "wheel>=0.38.4" \ From 3be90afab5169f968c7c28f03676918ef9c2f8b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 02:35:56 +0200 Subject: [PATCH 658/752] python311Packages.aprslib: untie from mox3 The mox3 package is unmaintained and incompatible with python3.11, and aprslib only requires it for its test. This reenables the the aprs integration in home-assistant. --- pkgs/development/python-modules/aprslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix index ce73dadd8d66..ab56bf58b8e3 100644 --- a/pkgs/development/python-modules/aprslib/default.nix +++ b/pkgs/development/python-modules/aprslib/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, mox3 , pytestCheckHook }: @@ -24,8 +23,9 @@ buildPythonPackage rec { }) ]; + doCheck = false; # mox3 is disabled on python311 + nativeCheckInputs = [ - mox3 pytestCheckHook ]; From 84d271f391938d44b0c4ce71e2326367e2154cbd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 14:06:49 +0200 Subject: [PATCH 659/752] python311Packages.cython-test-exception-raiser: init at 1.0.2 Packaged up for twisted testsuite. --- .../cython-test-exception-raiser/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/cython-test-exception-raiser/default.nix diff --git a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix new file mode 100644 index 000000000000..e6f3f8b451b3 --- /dev/null +++ b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "cython-test-exception-raiser"; + version = "1.0.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "twisted"; + repo = "cython-test-exception-raiser"; + rev = "v${version}"; + hash = "sha256-fwMq0pOrFUJnPndH/a6ghoo6mlcVSxtsWazqE9mCx3M="; + }; + + nativeBuildInputs = [ + cython + setuptools + wheel + ]; + + pythonImportsCheck = [ + "cython_test_exception_raiser" + ]; + + meta = with lib; { + description = "Testing only. A cython simple extension which is used as helper for twisted/twisted Failure tests"; + homepage = "https://github.com/twisted/cython-test-exception-raiser"; + changelog = "https://github.com/twisted/cython-test-exception-raiser/blob/${src.rev}/CHANGELOG.rst"; + license = with licenses; [ publicDomain mit ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7066f275e20f..55becaba3e44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2453,6 +2453,8 @@ self: super: with self; { patches = [ ]; }); + cython-test-exception-raiser = callPackage ../development/python-modules/cython-test-exception-raiser { }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; dacite = callPackage ../development/python-modules/dacite { }; From ac7f49118f31a818082d3c7d50dd143c12596ea1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 14:49:28 +0200 Subject: [PATCH 660/752] python311Packages.sanic: disable failing tests Probably due to the websockets 11 upgrade, even though sanic does not exclude this version. --- pkgs/development/python-modules/sanic/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index b27b75e91b22..752802df209c 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -141,6 +141,10 @@ buildPythonPackage rec { "test_default_reload_shutdown_order" # App not found. "test_input_is_dir" + # HTTP 500 with Websocket subprotocols + "test_websocket_route_with_subprotocols" + # Socket closes early + "test_no_exceptions_when_cancel_pending_request" ]; disabledTestPaths = [ From d9f294909ada577230302f98a0dcbac14d80901a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 16:46:30 +0200 Subject: [PATCH 661/752] python311Packages.mypy: 1.5.1 -> 1.5.1 https://github.com/python/mypy/compare/refs/tags/v1.5.1...v1.5.1 --- pkgs/development/python-modules/mypy/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 90fafe527bd7..0ee96a6d690d 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,14 +2,12 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build-system , setuptools , types-psutil , types-setuptools -, types-typed-ast # propagates , mypy-extensions @@ -32,7 +30,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.4.1"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,23 +39,14 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-2PeE/L9J6J0IuUpHZasemM8xxefNJrdzYnutgJjevWQ="; + hash = "sha256-qs+axm2+UWNuWzLW8CI4qBV7k7Ra8gBajid8mYKDsso="; }; - patches = [ - (fetchpatch { - # pytest 7.4 compat - url = "https://github.com/python/mypy/commit/0a020fa73cf5339a80d81c5b44e17116a5c5307e.patch"; - hash = "sha256-3HQPo+V7T8Gr92clXAt5QJUJPmhjnGjQgFq0qR0whfw="; - }) - ]; - nativeBuildInputs = [ mypy-extensions setuptools types-psutil types-setuptools - types-typed-ast typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli From 61dac96af51b77aebb664e18daadd471dbec604f Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 19 Sep 2023 00:20:32 +0900 Subject: [PATCH 662/752] python311Packages.gevent: patch to replace pkg_resources with importlib-metadata Avoid errors caused by pkg_resources when calling gevent.events. --- pkgs/development/python-modules/gevent/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index b21e40c7a600..938cb99cf8fa 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , isPyPy , python @@ -7,6 +8,7 @@ , cffi , cython_3 , greenlet +, importlib-metadata , setuptools , wheel , zope_event @@ -26,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY="; }; + patches = [ + # Replace deprecated pkg_resources with importlib-metadata + (fetchpatch { + url = "https://github.com/gevent/gevent/commit/bd96d8e14dc99f757de22ab4bb98439f912dab1e.patch"; + hash = "sha256-Y+cxIScuEgAVYmmxBJ8OI+JuJ4G+iiROTcRdWglo3l0="; + includes = [ "src/gevent/events.py" ]; + }) + ]; + nativeBuildInputs = [ cython_3 setuptools @@ -39,6 +50,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + importlib-metadata zope_event zope_interface ] ++ lib.optionals (!isPyPy) [ @@ -50,6 +62,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gevent" + "gevent.events" ]; meta = with lib; { From 3b11cba2d03eda7c72ae1a6dce7c7a65854578f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 18:48:30 +0200 Subject: [PATCH 663/752] python311Packages.pynput: fix build --- .../python-modules/pynput/default.nix | 57 ++++++++++++++++--- 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 394c6f87b65c..88c46532d997 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -1,22 +1,61 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, setuptools-lint +, sphinx + +# dependencies +, xlib +, evdev +, darwin +, six + + # tests +, unittestCheckHook + }: buildPythonPackage rec { pname = "pynput"; version = "1.7.6"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "3a5726546da54116b687785d38b1db56997ce1d28e53e8d22fc656d8b92e533c"; + src = fetchFromGitHub { + owner = "moses-palmer"; + repo = "pynput"; + rev = "refs/tags/v${version}"; + hash = "sha256-gRq4LS9NvPL98N0Jk09Z0GfoHS09o3zM284BEWS+NW4="; }; - nativeBuildInputs = [ sphinx ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'sphinx >=1.3.1'" "" + ''; - propagatedBuildInputs = [ setuptools-lint xlib ] - ++ lib.optionals stdenv.isLinux [ - evdev + nativeBuildInputs = [ + setuptools + setuptools-lint + sphinx ]; - doCheck = false; + propagatedBuildInputs = [ + six + ] ++ lib.optionals stdenv.isLinux [ + evdev + xlib + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + Quartz + ]); + + doCheck = false; # requires running X server + + nativeCheckInputs = [ + unittestCheckHook + ]; meta = with lib; { broken = stdenv.isDarwin; From d7db508b65d47ff42320cc868e06e4c4f0ae5b41 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 18:51:31 +0200 Subject: [PATCH 664/752] python311Packages.asn1tools: expose extras, use pytest --- .../python-modules/asn1tools/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 8bc58e992c86..89abcb152639 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -7,6 +7,7 @@ , pyparsing , python , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { @@ -25,14 +26,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitstruct - diskcache - prompt-toolkit pyparsing ]; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + passthru.optional-depdendencies = { + shell = [ + prompt-toolkit + ]; + cache = [ + diskcache + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies); + pythonImportsCheck = [ "asn1tools" From 2a5d77bf040115b6b1232b1b6eb7aec649de1f02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 21:33:18 +0200 Subject: [PATCH 665/752] python311Packages.flask-login: disable failing tests --- .../python-modules/flask-login/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index c1b8c15bea03..1caf53c7a2d8 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -36,10 +36,20 @@ buildPythonPackage rec { semantic-version ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ + disabledTests = [ + # https://github.com/maxcountryman/flask-login/issues/747 + "test_remember_me_accepts_duration_as_int" + "test_remember_me_custom_duration_uses_custom_cookie" + "test_remember_me_refresh_every_request" + "test_remember_me_uses_custom_cookie_parameters" + ] ++ lib.optionals (pythonAtLeast "3.10") [ "test_hashable" ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + pythonImportsCheck = [ "flask_login" ]; From 2e597489bd6987e920b6369a0e9145eb0b885708 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Sep 2023 21:45:56 +0200 Subject: [PATCH 666/752] python311Packages.flask-wtf: fix build, ignore deprecation warnings --- pkgs/development/python-modules/flask-wtf/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 4954f19f91de..f00d2cd8dfbd 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,17 +1,18 @@ { lib , fetchPypi -, fetchpatch , buildPythonPackage , flask , itsdangerous , wtforms , email-validator , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "flask-wtf"; version = "1.1.1"; + format = "pyproject"; src = fetchPypi { pname = "Flask-WTF"; @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-QcQkTprmJtY77UKuR4W5Bme4hbFTXVpAleH2MGDRKqk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask itsdangerous @@ -33,6 +38,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + meta = with lib; { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; From 12ff8fb6bc3c0bbced69217cfddbeb98b4e30056 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 00:57:24 +0200 Subject: [PATCH 667/752] python311Packages.numba: 2023-08-11 -> 0.58.0rc2 --- .../development/python-modules/numba/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 874cbe2376d1..406b7c16d491 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,7 +12,6 @@ , importlib-metadata , substituteAll , runCommand -, fetchpatch , config @@ -29,15 +28,15 @@ let in buildPythonPackage rec { # Using an untagged version, with numpy 1.25 support, when it's released # also drop the versioneer patch in postPatch - version = "unstable-2023-08-11"; + version = "0.58.0rc2"; pname = "numba"; format = "setuptools"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "numba"; repo = "numba"; - rev = "6f0c5060a69656319ab0bae1d8bb89484cd5631f"; + rev = "refs/tags/${version}"; # Upstream uses .gitattributes to inject information about the revision # hash and the refname into `numba/_version.py`, see: # @@ -50,7 +49,7 @@ in buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-34qEn/i2X6Xu1cjuiRrmrm/HryNoN+Am4A4pJ90srAE="; + hash = "sha256-ktFBjzd2vEahdr86lhVLVFEadCIhPP3hRF/EuZhHCC4="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; @@ -78,13 +77,6 @@ in buildPythonPackage rec { cuda_toolkit_lib_path = cudatoolkit.lib; }) ]; - # with untagged version we need to specify the correct version ourselves - - postPatch = '' - substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='0.57.1'" - substituteInPlace numba/_version.py \ - --replace 'git_refnames = " (HEAD -> main)"' 'git_refnames = "tag: 0.57.1"' - ''; postFixup = lib.optionalString cudaSupport '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do From 2c56b087b6e7eafb63e1ca28c7187c37d0b6424a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 02:09:13 +0200 Subject: [PATCH 668/752] python311Packages.pystray: fix build --- .../python-modules/pystray/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index cf6a79853cbc..a6d073dbd669 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -5,15 +5,17 @@ , xlib , six , xvfb-run -, sphinx +, setuptools , gobject-introspection , pygobject3 , gtk3 -, libayatana-appindicator }: +, libayatana-appindicator +}: buildPythonPackage rec { pname = "pystray"; version = "0.19.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "moses-palmer"; @@ -22,9 +24,28 @@ buildPythonPackage rec { hash = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; }; - nativeBuildInputs = [ gobject-introspection sphinx ]; - propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ]; - nativeCheckInputs = [ xvfb-run ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'sphinx >=1.3.1'" "" + ''; + + nativeBuildInputs = [ + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + pillow + xlib + six + pygobject3 + gtk3 + libayatana-appindicator + ]; + + nativeCheckInputs = [ + xvfb-run + ]; checkPhase = '' rm tests/icon_tests.py # test needs user input From bc7b9a88c26d3f2392d80d8d946aebf98fd41a51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 02:36:47 +0200 Subject: [PATCH 669/752] python311Packages.pytablewriter: disable elasticsearch tests Fails to find the elastic_transport module. --- pkgs/development/python-modules/pytablewriter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 86af2ae0846f..d78fd1e7f186 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -117,6 +117,7 @@ buildPythonPackage rec { disabledTestPaths = [ "test/writer/binary/test_excel_writer.py" "test/writer/binary/test_sqlite_writer.py" + "test/writer/test_elasticsearch_writer.py" ]; meta = with lib; { From 7bb85c7f1cb037dcfb1db760422d53b817cdf6a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 03:28:07 +0200 Subject: [PATCH 670/752] python311Packages.kaptan: fix tests by making the test phase explicit. --- .../python-modules/kaptan/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 5597980acde1..c86e2a2d6f3a 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , fetchPypi , pyyaml -, pytest +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "kaptan"; version = "0.6.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg="; + hash = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg="; }; postPatch = '' @@ -20,9 +22,17 @@ buildPythonPackage rec { substituteInPlace requirements/base.txt --replace 'PyYAML>=3.13,<6' 'PyYAML>=3.13' ''; - propagatedBuildInputs = [ pyyaml ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytest ]; + propagatedBuildInputs = [ + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Configuration manager for python applications"; From 0c6f0cb2f9b30a5303f1dc94de29264fcf19749d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 03:30:32 +0200 Subject: [PATCH 671/752] python311Packages.influxdb: disable failing tests --- pkgs/development/python-modules/influxdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index ce6bccdd409f..e270df9746d2 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , python-dateutil , fetchPypi -, fetchpatch , mock , msgpack , nose @@ -56,6 +55,7 @@ buildPythonPackage rec { # b'foo[30 chars]_one="1",column_two=1i 0\nfoo,tag_one=red,tag_[46 chars]00\n' "test_write_points_from_dataframe_with_nan_json" "test_write_points_from_dataframe_with_tags_and_nan_json" + "test_write_points_from_dataframe_with_numeric_precision" # Reponse is not empty but `s = '孝'` and the JSON decoder chokes on that "test_query_with_empty_result" # Pandas API changes cause it to no longer infer datetimes in the expected manner From 98382760682873af6416029e9c6bc7952741e1b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 03:40:13 +0200 Subject: [PATCH 672/752] python311Packages.httpie: disable failing tests --- pkgs/development/python-modules/httpie/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 22b6918bccc9..43f69ecd3c9b 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -106,6 +106,11 @@ buildPythonPackage rec { "test_valid_xml" "test_xml_format_options" "test_xml_xhtm" + # httpbin compatibility issues + "test_compress_form" + "test_binary_suppresses_when_terminal" + "test_binary_suppresses_when_not_terminal_but_pretty" + "test_binary_included_and_correct_when_suitable" ] ++ lib.optionals stdenv.isDarwin [ # flaky "test_daemon_runner" From aadcf41da094eb0774a68c73f6fcd508a8a7176d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 04:24:11 +0200 Subject: [PATCH 673/752] python311Packages.snaptime: init at 0.2.4 Packaged as a test dependency for maya. --- .../python-modules/snaptime/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/snaptime/default.nix diff --git a/pkgs/development/python-modules/snaptime/default.nix b/pkgs/development/python-modules/snaptime/default.nix new file mode 100644 index 000000000000..ce43b0e59fba --- /dev/null +++ b/pkgs/development/python-modules/snaptime/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, pytz +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "snaptime"; + version = "0.2.4"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4/HriQQ9WNMHIauYy2UCPxpMJ0DjsZdwQpixY8ktUIs="; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + ]; + + pythonImportsCheck = [ + "snaptime" + ]; + + doCheck = false; # git has tests, but no tags :( + + meta = with lib; { + description = "Transform timestamps with a simple DSL"; + homepage = "https://github.com/zartstrom/snaptime"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55becaba3e44..313ff7f18c6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12101,6 +12101,8 @@ self: super: with self; { snapshottest = callPackage ../development/python-modules/snapshottest { }; + snaptime = callPackage ../development/python-modules/snaptime { }; + sniffio = callPackage ../development/python-modules/sniffio { }; snitun = callPackage ../development/python-modules/snitun { }; From 64358475b7da8d532a6c28694c8302d900cacf4d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 04:34:28 +0200 Subject: [PATCH 674/752] python311Packages.maya: fix build, reformat make compatible with recent humanize versions, through access of the private _abs_timedelta function. Enable tests. --- .../python-modules/maya/default.nix | 60 ++++++++++++++----- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 707602350544..e96d66826583 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -1,28 +1,58 @@ -{ lib, fetchPypi, fetchpatch, buildPythonPackage -, dateparser, humanize, pendulum, ruamel-yaml, tzlocal }: +{ lib +, fetchFromGitHub +, buildPythonPackage + +# build-system +, setuptools + +# dependencies +, dateparser +, humanize +, tzlocal +, pendulum +, snaptime +, pytz + +# tests +, freezegun +, pytestCheckHook +}: buildPythonPackage rec { pname = "maya"; version = "0.6.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-f1PgbVoSNhPc58Jwy8ZHZDppQlkNunoZ7DYZTQM4w/Q="; + src = fetchFromGitHub { + owner = "kennethreitz"; + repo = "maya"; + rev = "refs/tags/v${version}"; + hash = "sha256-4fUyUqVQk/AcQL3xMnU1cQlF5yiD/N9NPAsUPuDTTNY="; }; - patches = [ - (fetchpatch { - # https://github.com/kennethreitz/maya/issues/112 - # Merged, so should be in next release. - url = "https://github.com/kennethreitz/maya/commit/f69a93b1103130139cdec30511777823957fb659.patch"; - sha256 = "152ba7amv9dhhx1wcklfalsdzsxggik9f7rsrikms921lq9xqc8h"; - }) + postPatch = '' + # function was made private in humanize + substituteInPlace maya/core.py \ + --replace "humanize.time.abs_timedelta" "humanize.time._abs_timedelta" + ''; + + nativeBuildInputs = [ + setuptools ]; - propagatedBuildInputs = [ dateparser humanize pendulum ruamel-yaml tzlocal ]; + propagatedBuildInputs = [ + dateparser + humanize + pendulum + pytz + snaptime + tzlocal + ]; - # No tests - doCheck = false; + nativeCheckInputs = [ + freezegun + pytestCheckHook + ]; meta = with lib; { description = "Datetimes for Humans"; From af0c46c6cf7f171c926bd156abd7a757b77de5e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 04:50:42 +0200 Subject: [PATCH 675/752] python311Packages.releases: 1.6.3 -> 2.1.1 https://github.com/bitprophet/releases/compare/1.6.3...2.1.1 --- pkgs/development/python-modules/releases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix index 9c1fc34cae46..05c6d5ae75d0 100644 --- a/pkgs/development/python-modules/releases/default.nix +++ b/pkgs/development/python-modules/releases/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "releases"; - version = "1.6.3"; + version = "2.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bitprophet"; repo = pname; rev = version; - hash = "sha256-XX2e6bjBNMun31h0sNJ9ieZE01U+PhA5JYYNOuMgD20="; + hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8="; }; postPatch = '' From de9fe3145b9d9b0068fa4f65d77daf661c5271be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 04:58:35 +0200 Subject: [PATCH 676/752] python311Packages.sphinx-togglebutton: fix build --- .../sphinx-togglebutton/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/pkgs/development/python-modules/sphinx-togglebutton/default.nix index 391fb9205c95..3b3e146b98e8 100644 --- a/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -1,23 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , wheel -, sphinx , docutils +, sphinx }: buildPythonPackage rec { pname = "sphinx-togglebutton"; version = "0.3.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-qwyLNmQnsB5MiYAtXQeEcsQn+m6dEtUhw0+gRCVZ3Ho="; }; - propagatedBuildInputs = [ wheel sphinx docutils ]; + nativeBuildInputs = [ + setuptools + wheel + ]; - pythonImportsCheck = [ "sphinx_togglebutton" ]; + propagatedBuildInputs = [ + docutils + sphinx + ]; + + pythonImportsCheck = [ + "sphinx_togglebutton" + ]; meta = with lib; { description = "Toggle page content and collapse admonitions in Sphinx"; From 54f5dfae7995effda24ef312a437aeeed05527c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 05:09:24 +0200 Subject: [PATCH 677/752] python311Packages.mdformat-gfm: disable failing tests --- pkgs/development/python-modules/mdformat-gfm/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mdformat-gfm/default.nix b/pkgs/development/python-modules/mdformat-gfm/default.nix index 2b48bcfa45de..de5a1d2ac68b 100644 --- a/pkgs/development/python-modules/mdformat-gfm/default.nix +++ b/pkgs/development/python-modules/mdformat-gfm/default.nix @@ -4,7 +4,6 @@ , linkify-it-py , markdown-it-py , mdformat -, mdformat-gfm , mdformat-tables , mdit-py-plugins , poetry-core @@ -45,6 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "test_default_style__api" + "test_default_style__cli" + ]; + pythonImportsCheck = [ "mdformat_gfm" ]; From 87f9f87d04b4831f2e59a7e98ec7e13d05805c60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 05:36:06 +0200 Subject: [PATCH 678/752] python311Packages.podcastparser: 0.6.5 -> 0.6.10 --- .../python-modules/podcastparser/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index 31472409ee71..758aabf34cbf 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -1,22 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "podcastparser"; - version = "0.6.5"; + version = "0.6.10"; src = fetchFromGitHub { owner = "gpodder"; repo = "podcastparser"; - rev = version; - sha256 = "1s83iq0mxcikxv6gi003iyavl1ai3siw1d7arijh0g28l0fff23a"; + rev = "refs/tags/${version}"; + hash = "sha256-P9wVyxTO0nz/DfuBhCE+VjhH1uYx4jBd30Ca26yBzbo="; }; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests test_*.py + postPatch = '' + rm pytest.ini ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = { description = "podcastparser is a simple, fast and efficient podcast parser written in Python."; homepage = "http://gpodder.org/podcastparser/"; From e72365c9f6d8a0f0ef43197788b31455d5f13da1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 05:39:17 +0200 Subject: [PATCH 679/752] python311Packages.fsspec: 2023.4.0 -> 2023.9.1 https://github.com/fsspec/filesystem_spec/raw/2023.9.1/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index e158692e9af7..89d493bc87d6 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.4.0"; + version = "2023.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-qkvhmXJNxA8v+kbZ6ulxJAQr7ReQpb+JkbhOUnL59KM="; + hash = "sha256-1ai+/8akUlP9kfzSKYEpDnobBfUC6EAPFPVVxh4jb/0="; }; propagatedBuildInputs = [ @@ -146,6 +146,11 @@ buildPythonPackage rec { "test_touch" ]; + disabledTestPaths = [ + # JSON decoding issues + "fsspec/implementations/tests/test_dbfs.py" + ]; + pythonImportsCheck = [ "fsspec" ]; From 0ea54c2bf7756daadcc51926c1b273861fd883cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 05:50:15 +0200 Subject: [PATCH 680/752] python311Packages.aioxmpp: disable failing test --- pkgs/development/python-modules/aioxmpp/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index edc9b8def3da..6c7660f9f3e1 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -60,6 +60,11 @@ buildPythonPackage rec { "benchmarks" ]; + disabledTests = [ + # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize' + "test_convert_field_datetime_default_locale" + ]; + meta = { changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; description = "Pure-python XMPP library for asyncio"; From a74ad6ccd7b7649ac5d843ab9a40b0627a8cd6cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 06:36:12 +0200 Subject: [PATCH 681/752] python311Packages.dask: 2023.8.0 -> 2023.9.2 https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 355e16553be0..341a133c987c 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.8.0"; + version = "2023.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-ZKjfxTJCu3EUOKz16+VP8+cPqQliFNc7AU1FPC1gOXw="; + hash = "sha256-NJLZyxVS5L25wC79mZ6kRjxxd5dYcjWiC3x3A5Topm8="; }; nativeBuildInputs = [ @@ -140,6 +140,9 @@ buildPythonPackage rec { "test_dot" "test_dot_nan" "test_merge_column_with_nulls" + # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part' + "test_to_csv_nodir" + "test_to_json_results" ]; __darwinAllowLocalNetworking = true; From 34c1b3b274001c56f2ca363ec19bb91521204e77 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 19 Sep 2023 18:13:17 +0900 Subject: [PATCH 682/752] python3Packages.google-auth: support urllib3 v2 --- .../python-modules/google-auth/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 13f0ea961f0d..4785bed59fb3 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , cachetools , cryptography +, fetchpatch , fetchPypi , flask , freezegun @@ -37,6 +38,18 @@ buildPythonPackage rec { hash = "sha256-so6ASOV3J+fPDlvY5ydrISrvR2ZUoJURNUqoJ1O0XGY="; }; + patches = [ + # Although the migration to urllib3-2.0.0 is incomplete, + # the discussion in the following PR has addressed the concerns. + # https://github.com/googleapis/google-auth-library-python/pull/1290 + (fetchpatch { + name = "support-urllib3_2.patch"; + url = "https://github.com/googleapis/google-auth-library-python/commit/9ed006d02d7c9de3e6898ee819648c2fd3367c1d.patch"; + hash = "sha256-64g0GzZeyO8l/s1jqfsogr8pTOBbG9xfp/UeVZNA4q8="; + includes = [ "google/auth/transport/urllib3.py" ]; + }) + ]; + propagatedBuildInputs = [ cachetools pyasn1-modules From 9e25a706d2ff38e608a6a468ddf5fcd91902d8c8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 19 Sep 2023 20:20:17 +0900 Subject: [PATCH 683/752] paperless-ngx: 1.17.2 -> 1.17.4 Diff: https://github.com/paperless-ngx/paperless-ngx/compare/refs/tags/v1.17.2...v1.17.4 Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.17.4 --- .../office/paperless-ngx/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 7d9346c153b7..87a838b4bcc2 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildNpmPackage , nixosTests , gettext @@ -19,13 +20,13 @@ }: let - version = "1.17.2"; + version = "1.17.4"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-/0Ml3NRTghqNykB1RZfqDW9TtENnSRM7wqG7Vn4Kl04="; + hash = "sha256-Kl8AUfHfEiEy40qeDI8x2rxdXcj01mpitw7T/96ibQQ="; }; # Use specific package versions required by paperless-ngx @@ -51,7 +52,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-6EvC9Ka8gl0eRgJtHooB3yQNVGYzuH/WRga4AtzQ0EY="; + npmDepsHash = "sha256-5Q9NtIO7k/6AiF9Er10HhmEBFyQOP9CiTkTZglUeChg="; nativeBuildInputs = [ python3 @@ -91,6 +92,16 @@ python.pkgs.buildPythonApplication rec { inherit version src; + patches = [ + # https://github.com/paperless-ngx/paperless-ngx/pull/4146 + (fetchpatch { + name = "fix-tests-for-python311.patch"; + url = "https://github.com/paperless-ngx/paperless-ngx/commit/73f6c0a056e3859061339e295f57213fd4239b2d.patch"; + hash = "sha256-sZcRug5T4cw5ppKpGYrrfz9RxtYxnkeNOlXcMgdWT0E="; + }) + ]; + + nativeBuildInputs = [ gettext ]; From 72ea34da135ac732e10bc25df01700c964acdf0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 16:02:04 +0200 Subject: [PATCH 684/752] catt: 0.12.7 -> 0.12.11 https://github.com/skorokithakis/catt/blob/v0.12.11/CHANGELOG.md --- pkgs/applications/video/catt/default.nix | 59 ++++++++---------------- 1 file changed, 18 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 1270fbae33d2..90081d4e5908 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -1,55 +1,32 @@ { lib -, fetchFromGitHub , fetchPypi +, fetchpatch , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - # Upstream is pinning releases incl. dependencies of their dependencies - zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { - version = "0.31.0"; - src = fetchFromGitHub { - owner = "jstasiak"; - repo = "python-zeroconf"; - rev = version; - hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU="; - }; - }); - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "7.1.2"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 - }); - - pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec { - version = "9.2.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "catt"; - version = "0.12.7"; - format = "setuptools"; + version = "0.12.11"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Q9ePWRLwuuTG+oPKFg7xn1gj4uAVlXUxegWdyH3Yd90="; + hash = "sha256-0bqYYfWwF7yYoAbjZPhi/f4CLcL89imWGYaMi5Bwhtc="; }; - propagatedBuildInputs = [ + patches = [ + (fetchpatch { + # set explicit build-system + url = "https://github.com/skorokithakis/catt/commit/08e7870a239e85badd30982556adc2aa8a8e4fc1.patch"; + hash = "sha256-QH5uN3zQNVPP6Th2LHdDBF53WxwMhoyhhQUAZOeHh4k="; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ click ifaddr pychromecast From d7876ccf9eadd195895ab233de5b78150dfa4cfc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 16:06:01 +0200 Subject: [PATCH 685/752] haxor-news: fix click fetcher --- pkgs/applications/misc/haxor-news/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index fb3489893be3..d5ea27c9d50b 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, fetchPypi, python3 }: let @@ -18,7 +18,8 @@ let # Use click 7 click = super.click.overridePythonAttrs (old: rec { version = "7.1.2"; - src = old.src.override { + src = fetchPypi { + pname = "click"; inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; From 61ceb299202fe1f1736969ab76ce03ae51b96c37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 16:11:19 +0200 Subject: [PATCH 686/752] oci-cli: fix click fetcher --- pkgs/tools/admin/oci-cli/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 43e5ad9d650b..1d09e02b6ba6 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchPypi , python3 }: @@ -10,10 +11,10 @@ let click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; - src = oldAttrs.src.override { + src = fetchPypi { + pname = "click"; inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - sha256 = ""; }; disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 }); From 7d4464314585fa04698e132f9687d0979a61b9ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 16:23:13 +0200 Subject: [PATCH 687/752] python310Packages.jupyter-console: propagate exceptiongroup This is a built-in on 3.11 and newer, so propagate it on older python releases. --- pkgs/development/python-modules/jupyter-console/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix index e847c341f4d8..715557bad733 100644 --- a/pkgs/development/python-modules/jupyter-console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , fetchPypi , pythonOlder -, substituteAll , hatchling , ipykernel +, exceptiongroup , ipython , jupyter-client , jupyter-core @@ -51,6 +51,8 @@ buildPythonPackage rec { pygments pyzmq traitlets + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; pythonImportsCheck = [ From 73d61327b3566cb4ba87b56e2e8893b576a41f81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 16:38:01 +0200 Subject: [PATCH 688/752] python311Packages.pygls: 1.0.1 -> 1.0.2 https://github.com/openlawlibrary/pygls/blob/refs/tags/v1.0.2/CHANGELOG.md --- pkgs/development/python-modules/pygls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 7ca6b344c9a2..caf3e014eed6 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-ovm897Vu6HRziGee3NioM1BA65mLe3F5Z2k0E+A35Gs="; + hash = "sha256-z673NRlnudFyDjKoM+xCbMRTFwh+tjUf4BaNtjwvKx8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 4f49f2187759d8259a7e00a886c196de899048e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 16:41:27 +0200 Subject: [PATCH 689/752] python310Packages.ipdb: propagate exceptiongroup for older python This is a builtin only available from python 3.11. --- pkgs/development/python-modules/ipdb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 4aec18990732..f5911b627c8d 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -5,6 +5,7 @@ , decorator , ipython , isPyPy +, exceptiongroup , tomli , setuptools , unittestCheckHook @@ -30,6 +31,7 @@ buildPythonPackage rec { ipython decorator ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup tomli ]; From 0c4bdff912e4dbb12cde9186b3682dd5f7bbc1fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 17:15:26 +0200 Subject: [PATCH 690/752] python311Packages.netutils: propagate jsonschema, expose extras --- pkgs/development/python-modules/netutils/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index c1f43e64f8f0..517c90b3f449 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , jinja2 +, jsonschema , napalm , poetry-core , pytestCheckHook @@ -30,6 +31,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + jsonschema + napalm + ]; + + passthru.optional-dependencies.optionals = [ + jsonschema napalm ]; From 34cf2f9ffacb957afc1f88fb3a5f9d0350239e55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 17:34:52 +0200 Subject: [PATCH 691/752] python311Packages.sphinxemoji: fix build --- .../python-modules/sphinxemoji/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sphinxemoji/default.nix b/pkgs/development/python-modules/sphinxemoji/default.nix index 726ba8132b01..02abae52c4d1 100644 --- a/pkgs/development/python-modules/sphinxemoji/default.nix +++ b/pkgs/development/python-modules/sphinxemoji/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , sphinx , sphinxHook }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "sphinxemoji"; version = "0.2.0"; + format = "pyproject"; outputs = [ "out" "doc" ]; @@ -18,14 +20,15 @@ buildPythonPackage rec { hash = "sha256-TLhjpJpUIoDAe3RZ/7sjTgdW+5s7OpMEd1/w0NyCQ3A="; }; + nativeBuildInputs = [ + setuptools + sphinxHook + ]; + propagatedBuildInputs = [ sphinx ]; - nativeBuildInputs = [ - sphinxHook - ]; - pythonImportsCheck = [ "sphinxemoji" ]; From ef78e2451adb73c8e199211b92686de52d3c8f71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 17:41:28 +0200 Subject: [PATCH 692/752] python311Packages.sphinx-tabs: fix build --- pkgs/development/python-modules/sphinx-tabs/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-tabs/default.nix b/pkgs/development/python-modules/sphinx-tabs/default.nix index a2714c2d1260..1c43bcd6a661 100644 --- a/pkgs/development/python-modules/sphinx-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonImportsCheckHook + +# build-system +, setuptools + # documentation build dependencies , sphinxHook # runtime dependencies @@ -16,6 +19,8 @@ buildPythonPackage rec { pname = "sphinx-tabs"; version = "3.4.1"; + format = "pyproject"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { @@ -30,7 +35,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pythonImportsCheckHook + setuptools sphinxHook ]; From c29e28efdc48f4b1c8d87a025e7b38d8680a544b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 19 Sep 2023 19:09:06 +0200 Subject: [PATCH 693/752] python311Packages.flask-restful: disable failing tests Can likely be attributed to changes in werkzeug 2.3.x. --- pkgs/development/python-modules/flask-restful/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 9db70e044e19..68072b7ddde9 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { disabledTests = [ # Broke in flask 2.2 upgrade "test_exception_header_forwarded" + # Broke in werkzeug 2.3 upgrade + "test_media_types_method" + "test_media_types_q" ]; pythonImportsCheck = [ From 3dabf45cf878d539c451496fa9a7176b62ac1a66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 01:43:34 +0200 Subject: [PATCH 694/752] python311Packages.poezio: drop reference This is not a library and already exists on the top-level. > error: poezio should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set. --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 313ff7f18c6d..88adc9fe691e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8567,8 +8567,6 @@ self: super: with self; { poetry-semver = callPackage ../development/python-modules/poetry-semver { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { }; - polars = callPackage ../development/python-modules/polars { }; polarizationsolver = callPackage ../development/python-modules/polarizationsolver { }; From a8bcb38cf2b024c84e24e3b1234814ec3874d2e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 13:14:18 +0200 Subject: [PATCH 695/752] python311Packages.pytest-trio: 0.7.0 -> 0.8.0 https://github.com/python-trio/pytest-trio/compare/v0.7.0...v0.8.0 --- pkgs/development/python-modules/pytest-trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 36f31a0288c8..872e9dc8fc0d 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pytest-trio"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-trio"; repo = pname; rev = "v${version}"; - sha256 = "0bhh2nknhp14jzsx4zzpqm4qnfaihyi65cjf6kf6qgdhc0ax6nf4"; + sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk="; }; buildInputs = [ pytest ]; From ecbe8e0030227da0bbfb88e82f6e0a2b4cb0ef8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 15:55:16 +0200 Subject: [PATCH 696/752] python311Packages.sphinx-version-warning: fix build --- .../python-modules/sphinx-version-warning/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 52a6a26124cd..1fb89f3a2849 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -15,9 +15,11 @@ # Latest tagged release release "1.1.2" (Nov 2018) does not contain # documenation, it was added in commits Aug 10, 2019. Repository does not have # any activity since then. -buildPythonPackage rec { +buildPythonPackage { pname = "sphinx-version-warning"; version = "unstable-2019-08-10"; + format = "pyproject"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { From 429452520d15a9fb4ed1e7e8ca9dca364ecc41eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 15:59:35 +0200 Subject: [PATCH 697/752] python311Packages.flask-restx: disable failing tests --- pkgs/development/python-modules/flask-restx/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index cdee90d222a6..42132b2da539 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -58,6 +58,12 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; + disabledTests = [ + # broken in werkzeug 2.3 upgrade + "test_media_types_method" + "test_media_types_q" + ]; + pythonImportsCheck = [ "flask_restx" ]; From d7f45e3428e013e5e39a958bbf989f37bc4d1e39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 16:41:16 +0200 Subject: [PATCH 698/752] python311Packages.sphinx-comments: fix build --- pkgs/development/python-modules/sphinx-comments/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sphinx-comments/default.nix b/pkgs/development/python-modules/sphinx-comments/default.nix index fc2e9517ce23..2ffed0c091fb 100644 --- a/pkgs/development/python-modules/sphinx-comments/default.nix +++ b/pkgs/development/python-modules/sphinx-comments/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinx-comments"; version = "0.0.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; From f15b59e7b1e6794724f0e3c381be1870f7410047 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 16:41:41 +0200 Subject: [PATCH 699/752] python311Packages.sphinx-thebe: fix build --- pkgs/development/python-modules/sphinx-thebe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index 1bf8685282ee..d2e05c755a25 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinx-thebe"; version = "0.2.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; From c6e4a61b6f65e7c1d7a0068e0dee82eb420a532b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 16:42:19 +0200 Subject: [PATCH 700/752] python311Packages.sphinx-multitoc-numbering: fix build --- .../python-modules/sphinx-multitoc-numbering/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix index 612717120f83..33e346638e9c 100644 --- a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix +++ b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinx-multitoc-numbering"; version = "0.1.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; From 5e23ce7c47dc08e2f1c2ba26e8b76d8da17f34e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 17:34:21 +0200 Subject: [PATCH 701/752] python311Packages.urllib3: 2.0.4 -> 2.0.5 https://github.com/urllib3/urllib3/blob/2.0.5/CHANGES.rst --- pkgs/development/python-modules/urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index b16d4f837af9..a5a3e6b8b644 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "2.0.4"; + version = "2.0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-jSL4aq6O9eQQ1PU5/enOayEToAG7TRieCu1wZC1gKxE="; + hash = "sha256-E6vzc4LqLOb7dE1NrWeDjuyFfJ9PVwCYkYBeC14SNZQ="; }; nativeBuildInputs = [ From 7c8215a8a18c0c53ba7fca57209fcbe5a0097d74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 17:50:40 +0200 Subject: [PATCH 702/752] python311Packages.pybotvac: make compatible with urllib3 2.0 --- .../python-modules/pybotvac/default.nix | 4 ++++ .../pybotvac/urllib3-2.0-compat.patch | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 004572279abb..a104e1e1aeb7 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; }; + patches = [ + ./urllib3-2.0-compat.patch + ]; + propagatedBuildInputs = [ requests requests-oauthlib diff --git a/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch b/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch new file mode 100644 index 000000000000..8b6ef4e91cc3 --- /dev/null +++ b/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch @@ -0,0 +1,21 @@ +diff --git a/pybotvac/robot.py b/pybotvac/robot.py +index f87546f..e9a61de 100644 +--- a/pybotvac/robot.py ++++ b/pybotvac/robot.py +@@ -6,7 +6,6 @@ from datetime import datetime, timezone + from email.utils import format_datetime + + import requests +-import urllib3 + from voluptuous import ( + ALLOW_EXTRA, + All, +@@ -21,8 +20,6 @@ from voluptuous import ( + from .exceptions import NeatoRobotException, NeatoUnsupportedDevice + from .neato import Neato # For default Vendor argument + +-# Disable warning due to SubjectAltNameWarning in certificate +-urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning) + + _LOGGER = logging.getLogger(__name__) + From 00e2c926b4f98e4668191145382c6c46526c48fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 19:04:22 +0200 Subject: [PATCH 703/752] python311Packages.requests-cache: disable failing tests These started failing after upgrading urllib3 to 2.0.5. --- pkgs/development/python-modules/requests-cache/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 1900090b09f5..d04f25ae0e01 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -108,6 +108,9 @@ buildPythonPackage rec { disabledTests = [ # Tests are flaky in the sandbox "test_remove_expired_responses" + # Tests that broke with urllib 2.0.5 + "test_request_only_if_cached__stale_if_error__expired" + "test_stale_if_error__error_code" ]; pythonImportsCheck = [ From e4d383983dfeaccb0abf4f988914be88dab083c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 19:43:15 +0200 Subject: [PATCH 704/752] python311Packages.mockfs: init at 1.1.4 Packaged for pyatv tests. --- .../python-modules/mockfs/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/mockfs/default.nix diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix new file mode 100644 index 000000000000..234a3d14d696 --- /dev/null +++ b/pkgs/development/python-modules/mockfs/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mockfs"; + version = "1.1.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mockfs"; + repo = "mockfs"; + rev = "v${version}"; + hash = "sha256-JwSkOI0dz9ZetfE0ZL3CthvcCSXGFYX+yQZy/oC6VBk="; + }; + + postPatch = '' + sed -i '/addopts/d' pytest.ini + ''; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + pythonImportsCheck = [ "mockfs" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A simple mock filesystem for use in unit tests"; + homepage = "https://github.com/mockfs/mockfs"; + changelog = "https://github.com/mockfs/mockfs/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88adc9fe691e..67955c81d236 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6824,6 +6824,8 @@ self: super: with self; { mock = callPackage ../development/python-modules/mock { }; + mockfs = callPackage ../development/python-modules/mockfs { }; + mockito = callPackage ../development/python-modules/mockito { }; mock-open = callPackage ../development/python-modules/mock-open { }; From 443c2da0ee5cf8c399086a541c1294f0a4c38137 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Sep 2023 22:11:40 +0200 Subject: [PATCH 705/752] cc2538-bsl: 2022-08-03 -> 2023-08-14 --- pkgs/tools/misc/cc2538-bsl/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/cc2538-bsl/default.nix b/pkgs/tools/misc/cc2538-bsl/default.nix index 16c858fc5817..c90fc3914d41 100644 --- a/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/pkgs/tools/misc/cc2538-bsl/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; - version = "unstable-2022-08-03"; - format = "setuptools"; + version = "unstable-2023-08-14"; + format = "pyproject"; src = fetchFromGitHub { owner = "JelmerT"; - repo = pname; - rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970"; + repo = "cc2538-bsl"; + rev = "641305fb5cae98415a28cbfab6e63436c1753abf"; hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE="; }; patches = [ - # https://github.com/JelmerT/cc2538-bsl/pull/138 (fetchpatch { - name = "clean-up-install-dependencies.patch"; - url = "https://github.com/JelmerT/cc2538-bsl/commit/bf842adf8e99a9eb8528579e5b85e59ee23be08d.patch"; - hash = "sha256-XKQ0kfl8yFrSF5RosHY9OvJR18Fh0dmAN1FlfZ024ME="; + # fix extras specification in setup.py; https://github.com/JelmerT/cc2538-bsl/pull/143 + url = "https://github.com/JelmerT/cc2538-bsl/commit/c70f58ec0222357db8020176711d6d45cf24da35.patch"; + hash = "sha256-Rxm/TRcm87WgRfq60cu0loyrbJmZou09XYR7uhrhhj8="; }) ]; From 8221464375dde8a808f45aad733df4233a3f3251 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 21 Sep 2023 01:09:15 +0200 Subject: [PATCH 706/752] python311Packages.python-uinput: disable tests --- .../development/python-modules/python-uinput/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index efb1288943af..8a187257ca76 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi -, udev }: +{ lib +, buildPythonPackage +, fetchPypi +, udev +}: buildPythonPackage rec { pname = "python-uinput"; @@ -14,6 +17,8 @@ buildPythonPackage rec { NIX_CFLAGS_LINK = "-ludev"; + doCheck = false; # no tests + meta = with lib; { description = "Pythonic API to Linux uinput kernel module"; homepage = "https://tjjr.fi/sw/python-uinput/"; From 26ee1ddb8923234fd40945a1c6538d78e6db3baf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 21 Sep 2023 01:31:48 +0200 Subject: [PATCH 707/752] Revert "python3Packages.pydantic: 1.10.9 -> 2.3.0" This reverts commit 1d1488d4c9cee70ae272b5a40ae925f95a44f71f. Still too many incompatible reverse dependencies. --- .../python-modules/pydantic/default.nix | 122 ++++++++++++------ 1 file changed, 83 insertions(+), 39 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index fd8341db5898..ea4943a06506 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,37 +1,46 @@ { lib +, stdenv , buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# build-system +, autoflake , cython -, hatchling -, hatch-fancy-pypi-readme - -# build -, libxcrypt - -# dependencies -, typing-extensions -, annotated-types -, pydantic-core - -# optional-dependencies +, devtools , email-validator - -# tests -, dirty-equals -, faker -, pytestCheckHook -, pytest-benchmark -, pytest-examples +, fetchFromGitHub +, fetchpatch , pytest-mock +, pytestCheckHook +, python-dotenv +, pythonAtLeast +, pythonOlder +, pyupgrade +, typing-extensions +# dependencies for building documentation. +# docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245 +, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin && pythonAtLeast "3.10") +, ansi2html +, markdown-include +, mike +, mkdocs +, mkdocs-exclude +, mkdocs-material +, mdx-truly-sane-lists +, sqlalchemy +, ujson +, orjson +, hypothesis +, libxcrypt }: buildPythonPackage rec { pname = "pydantic"; - version = "2.3.0"; - format = "pyproject"; + version = "1.10.9"; + format = "setuptools"; + + outputs = [ + "out" + ] ++ lib.optionals withDocs [ + "doc" + ]; disabled = pythonOlder "3.7"; @@ -39,54 +48,89 @@ buildPythonPackage rec { owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-toqrWg8bYzc3UmvG/YmXawfmT8nqaA9fxy24k1cdj+M="; + hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4="; }; + patches = [ + # Fixes racy doctests build failures on really fast machines + # FIXME: remove after next release + (fetchpatch { + url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff"; + hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs="; + }) + ]; + + postPatch = '' + sed -i '/flake8/ d' Makefile + ''; + buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; nativeBuildInputs = [ cython - hatchling - hatch-fancy-pypi-readme + ] ++ lib.optionals withDocs [ + # dependencies for building documentation + autoflake + ansi2html + markdown-include + mdx-truly-sane-lists + mike + mkdocs + mkdocs-exclude + mkdocs-material + sqlalchemy + ujson + orjson + hypothesis ]; propagatedBuildInputs = [ - annotated-types + devtools + pyupgrade typing-extensions - pydantic-core ]; passthru.optional-dependencies = { + dotenv = [ + python-dotenv + ]; email = [ email-validator ]; }; - pythonImportsCheck = [ - "pydantic" - ]; - nativeCheckInputs = [ - dirty-equals - faker - pytest-benchmark - pytest-examples pytest-mock pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pytestFlagsArray = [ - "--benchmark-disable" + # https://github.com/pydantic/pydantic/issues/4817 + "-W" "ignore::pytest.PytestReturnNotNoneWarning" ]; preCheck = '' export HOME=$(mktemp -d) ''; + # Must include current directory into PYTHONPATH, since documentation + # building process expects "import pydantic" to work. + preBuild = lib.optionalString withDocs '' + PYTHONPATH=$PWD:$PYTHONPATH make docs + ''; + + # Layout documentation in same way as "sphinxHook" does. + postInstall = lib.optionalString withDocs '' + mkdir -p $out/share/doc/$name + mv ./site $out/share/doc/$name/html + ''; + enableParallelBuilding = true; + pythonImportsCheck = [ "pydantic" ]; + meta = with lib; { description = "Data validation and settings management using Python type hinting"; homepage = "https://github.com/pydantic/pydantic"; From 2d10f80173081586b3398fbda28882e5c7f8e242 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 00:00:42 +0200 Subject: [PATCH 708/752] python311Packages.peewee-migrate: 1.10.1 -> 1.12.2 --- .../python-modules/peewee-migrate/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/peewee-migrate/default.nix b/pkgs/development/python-modules/peewee-migrate/default.nix index da6f60403c33..dc7cefd00c0d 100644 --- a/pkgs/development/python-modules/peewee-migrate/default.nix +++ b/pkgs/development/python-modules/peewee-migrate/default.nix @@ -17,24 +17,26 @@ buildPythonPackage rec { pname = "peewee-migrate"; - version = "1.10.1"; + version = "1.12.2"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "klen"; repo = "peewee_migrate"; rev = "refs/tags/${version}"; - hash = "sha256-SBHeXHfhYjyXr+tODryKQfxZKy7l4ez5C6eU6FjS2qI="; + hash = "sha256-jxM2cvlDsoiUlVoxdS3wpUKlwMveMraiR431A8kIdgI="; }; - nativeBuildInputs = [ - poetry-core - ]; - postPatch = '' sed -i '/addopts/d' pyproject.toml ''; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ peewee click @@ -49,6 +51,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # sqlite3.OperationalError: error in table order after drop column... + "test_migrator" + ]; + meta = with lib; { description = "Simple migration engine for Peewee"; homepage = "https://github.com/klen/peewee_migrate"; From 36d2c4f0e29217eff99d58c9cde9df6ba4570cb7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 21 Sep 2023 10:17:13 +0900 Subject: [PATCH 709/752] python311Packages.blspy: fix setuptools import error --- pkgs/development/python-modules/blspy/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index 41d8c13dc56e..929f1c90b7ce 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -48,6 +48,13 @@ buildPythonPackage rec { }) ]; + # ImportError: cannot import name 'setuptools' from 'setuptools' + # this is resolved in the next release, v2 + postPatch = '' + substituteInPlace setup.py \ + --replace "from setuptools import Extension, setup, setuptools" "from setuptools import Extension, setup" + ''; + nativeBuildInputs = [ cmake setuptools-scm ]; buildInputs = [ boost gmp.static pybind11 ]; From 12fc2d4207641f2808772fd5f6264816210f757d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 23:20:30 +0200 Subject: [PATCH 710/752] python311Packages.charset-normalizer: add changelog to meta --- .../python-modules/charset-normalizer/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index c36c266ed983..c2856a49060f 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -1,11 +1,9 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder - - # popular downstream dependencies -, aiohttp , requests }: @@ -23,15 +21,15 @@ buildPythonPackage rec { hash = "sha256-CfL5rlrwJs9453z+1xPUzs1B3OyjFBaU6klzY7gJCzA="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace " --cov=charset_normalizer --cov-report=term-missing" "" ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "charset_normalizer" ]; @@ -41,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for encoding and language detection"; homepage = "https://charset-normalizer.readthedocs.io/"; + changelog = "https://github.com/Ousret/charset_normalizer/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From d8484487e6a7b767cf49e3cab33111456cd9a505 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 23:06:18 +0100 Subject: [PATCH 711/752] python310Packages.paramiko: add changelog to meta --- pkgs/development/python-modules/paramiko/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index c5c01dc8fa65..278bb0583e35 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/paramiko/paramiko/"; + changelog = "https://github.com/paramiko/paramiko/blob/${version}/sites/www/changelog.rst"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; longDescription = '' From 8c4093db7a29fbefb9ddfded0bdf7bcbf28cd6bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:46:27 +0200 Subject: [PATCH 712/752] python311Packages.time-machine: 2.11.0 -> 2.12.0 Diff: https://github.com/adamchainz/time-machine/compare/2.11.0...2.12.0 --- pkgs/development/python-modules/time-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index a8749adfb616..799570ada1b8 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-4HwHNowif0/YflznQrn8YRITjuiaBCB2mFIO0iCf6tA="; + hash = "sha256-vBww78/3vC3IA4Nh9Ne+rBo/CO9FggjP+TUUV2/ih9c="; }; propagatedBuildInputs = [ From b9fa39f19c184a87beed6485f885be8ca8bd1677 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Aug 2023 18:09:45 +0200 Subject: [PATCH 713/752] python311Packages.path: add changelog to meta --- pkgs/development/python-modules/path/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index ca99357c7610..ee0329c4050d 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -1,15 +1,11 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi - -# build time -, setuptools-scm - -# tests -, pytestCheckHook , appdirs +, buildPythonPackage +, fetchPypi , packaging +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { @@ -45,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object-oriented file system path manipulation"; homepage = "https://github.com/jaraco/path"; + changelog = "https://github.com/jaraco/path/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 2707ba5a632ad3727d283925c179ce3defd06561 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 13:24:08 +0200 Subject: [PATCH 714/752] python311Packages.ppft: add changelog to meta --- pkgs/development/python-modules/ppft/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 3a868d78d86d..cd801f497a8c 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { # darwin seems to hang doCheck = !stdenv.isDarwin; + checkPhase = '' runHook preCheck ${python.interpreter} -m ppft.tests @@ -38,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed and parallel Python"; homepage = "https://ppft.readthedocs.io/"; + changelog = "https://github.com/uqfoundation/ppft/releases/tag/ppft-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; From 6ecc372d596625b933be889248f209bc19942634 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 13:18:53 +0200 Subject: [PATCH 715/752] python311Packages.dill: disable on unsupported Python releases --- pkgs/development/python-modules/dill/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 4107e62c7ed1..2f366abf602d 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python +, pythonOlder , setuptools # passthru tests @@ -14,6 +15,8 @@ buildPythonPackage rec { version = "0.3.7"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; From 7b6ccdc92916d19a07080a342fe27c80ec599a30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 13:18:12 +0200 Subject: [PATCH 716/752] python311Packages.dill: add changelog to meta --- pkgs/development/python-modules/dill/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 2f366abf602d..d6fdd2b97d2d 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; + changelog = "https://github.com/uqfoundation/dill/releases/tag/dill-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ tjni ]; }; From 11f11306b74215fe39ce074c880903acc5ac4765 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 13:12:27 +0200 Subject: [PATCH 717/752] python311Packages.pathos: add changelog to meta --- pkgs/development/python-modules/pathos/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index febd24ef5768..cf9d9eaa48ca 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage -, fetchFromGitHub , dill +, fetchFromGitHub +, multiprocess , pox , ppft -, multiprocess , pythonOlder }: @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parallel graph management and execution in heterogeneous computing"; homepage = "https://pathos.readthedocs.io/"; + changelog = "https://github.com/uqfoundation/pathos/releases/tag/pathos-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; From 1b22e5902a2d0fff2049eccb1ff96113bf50c1af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 02:32:32 +0200 Subject: [PATCH 718/752] python311Packages.kbcstorage: fix build --- pkgs/development/python-modules/kbcstorage/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 162d530bd4bb..04d5b17c55e9 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -4,6 +4,8 @@ , pythonOlder # build +, setuptools +, setuptools-git-versioning , setuptools-scm # propagates @@ -18,7 +20,7 @@ buildPythonPackage rec { pname = "sapi-python-client"; version = "0.7.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,6 +34,8 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools + setuptools-git-versioning setuptools-scm ]; From 3bfa033e57455861bc9a678edb953f0a947f1c50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 03:57:12 +0200 Subject: [PATCH 719/752] python311Packages.polling: init at 0.3.0 Packaged for linode-api. --- .../python-modules/polling/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/polling/default.nix diff --git a/pkgs/development/python-modules/polling/default.nix b/pkgs/development/python-modules/polling/default.nix new file mode 100644 index 000000000000..22e7e0c3916d --- /dev/null +++ b/pkgs/development/python-modules/polling/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "polling"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "justiniso"; + repo = "polling"; + rev = "v${version}"; + hash = "sha256-Qy2QxCWzAjZMJ6yxZiDT/80I2+rLimoG8/SYxq960Tk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ + "polling" + ]; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + meta = with lib; { + description = "Powerful polling utility in Python"; + homepage = "http://github.com/justiniso/polling"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67955c81d236..54114f0cd441 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8573,6 +8573,8 @@ self: super: with self; { polarizationsolver = callPackage ../development/python-modules/polarizationsolver { }; + polling = callPackage ../development/python-modules/polling { }; + polib = callPackage ../development/python-modules/polib { }; policy-sentry = callPackage ../development/python-modules/policy-sentry { }; From 57a5cbaae9edc34772f4b434dcffb7a7786aa2ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 14:46:30 +0200 Subject: [PATCH 720/752] python311Packages.urwid: 2.1.2 -> 2.2.1 https://github.com/urwid/urwid/releases/tag/2.2.0 https://github.com/urwid/urwid/releases/tag/2.2.1 --- .../python-modules/urwid/default.nix | 48 ++++++++++++------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 014382b21501..7f9512be2cb1 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,43 +1,57 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch -, isPy3k + +# build-system +, setuptools +, setuptools-scm +, wheel + +# tests , glibcLocales +, pytestCheckHook }: buildPythonPackage rec { pname = "urwid"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; + hash = "sha256-4zkRqxjyxz/dvpvyFtAh504gstWqm+MEA8WPVRMbuKE="; }; - patches = [ - # https://github.com/urwid/urwid/pull/517 - (fetchpatch { - name = "python311-compat.patch"; - url = "https://github.com/urwid/urwid/commit/42c1ed1eeb663179b265bae9b384d7ec11c8a9b5.patch"; - hash = "sha256-Oz8O/M6AdqbB6C/BB5rtxp8FgdGhZUxkSxKIyq5Dmho="; - }) + postPatch = '' + sed -i '/addopts =/d' pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; - # tests need to be able to set locale - LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = [ glibcLocales ]; + nativeCheckInputs = [ + glibcLocales + pytestCheckHook + ]; - # tests which assert on strings don't decode results correctly - doCheck = isPy3k; + env.LC_ALL = "en_US.UTF8"; + + disabledTestPaths = [ + # expect call hangs + "urwid/tests/test_vterm.py" + ]; pythonImportsCheck = [ "urwid" ]; meta = with lib; { + changelog = "https://github.com/urwid/urwid/releases/tag/${version}"; description = "A full-featured console (xterm et al.) user interface library"; + downloadPage = "https://github.com/urwid/urwid"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; From 37ead196e0bae2c452863027ba2079e4881e9ce4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 15:13:33 +0200 Subject: [PATCH 721/752] python311Packages.django-allauth: 0.54.0 -> 0.55.2 https://github.com/pennersr/django-allauth/blob/0.55.2/ChangeLog.rst --- .../python-modules/django-allauth/default.nix | 66 ++++++++++++++----- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 439c4c2cb564..738cb1c58d32 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,18 +1,35 @@ { lib , buildPythonPackage -, django , fetchFromGitHub -, python3-openid , pythonOlder + +# build-system +, setuptools + +# dependencies +, django +, python3-openid , requests , requests-oauthlib , pyjwt + +# optional-dependencies +, python3-saml +, qrcode + +# tests +, pillow +, pytestCheckHook +, pytest-django + +# passthru tests +, dj-rest-auth }: buildPythonPackage rec { pname = "django-allauth"; - version = "0.54.0"; - format = "setuptools"; + version = "0.55.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +37,12 @@ buildPythonPackage rec { owner = "pennersr"; repo = pname; rev = version; - hash = "sha256-0yJsHJhYeiCHQg/QzFD/metb97rcUJ+LYlsl7fGYmuM="; + hash = "sha256-i0thQymrEDkx2Yt9kM10j4LxL7yChHkG9vsS0508EQA="; }; - postPatch = '' - chmod +x manage.py - patchShebangs manage.py - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ django @@ -37,19 +53,39 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkPhase = '' - # test is out of date - rm allauth/socialaccount/providers/cern/tests.py - - ./manage.py test - ''; + passthru.optional-dependencies = { + saml = [ + python3-saml + ]; + mfa = [ + qrcode + ]; + }; pythonImportsCheck = [ "allauth" ]; + nativeCheckInputs = [ + pillow + pytestCheckHook + pytest-django + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + disabledTestPaths = [ + # tests are out of date + "allauth/socialaccount/providers/cern/tests.py" + ]; + + passthru.tests = { + inherit dj-rest-auth; + }; + meta = with lib; { + changelog = "https://github.com/pennersr/django-allauth/blob/${version}/ChangeLog.rst"; description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; + downloadPage = " https://github.com/pennersr/django-allauth"; homepage = "https://www.intenct.nl/projects/django-allauth"; license = licenses.mit; maintainers = with maintainers; [ derdennisop ]; From 97d1d96a9d0c460d88d72c1978035c0eea72e386 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 15:17:59 +0200 Subject: [PATCH 722/752] python311Packages.dj-rest-auth: 5.0.0 -> 5.0.1 https://github.com/iMerica/dj-rest-auth/compare/refs/tags/5.0.0...5.0.1 --- pkgs/development/python-modules/dj-rest-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 2f9ae61b1a79..4bd5d486d4a9 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-GSNY8AC4KvxHxq+18qTDgSlyKpJvq0kSVRp7NdMHe18="; + hash = "sha256-PTFUZ54vKlufKCQyJb+QB/+hI15r+Z0auTjnc38yMLg="; }; postPatch = '' From d3473c1de4a9812737189b8dc0822b73ea0d1ed2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 15:42:52 +0200 Subject: [PATCH 723/752] python311Packages.psycopg: 3.1.10 -> 3.1.11 https://github.com/psycopg/psycopg/blob/3.1.11/docs/news.rst#current-release --- pkgs/development/python-modules/psycopg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index e2d775f0b3b3..38554ad8e97a 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.10"; + version = "3.1.11"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GdgzHmzPCK3wq/8sCc1NaPEVwl4Q5OBZMp86RXkhE0M="; + hash = "sha256-cQTGaiVgdgaq1fmDdtqvc+uCp66S+s0GsTcFTARR+SI="; }; patches = [ From bf70dbe2cbdec54a0cf9d1ceabfd72e7963c9c50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 15:50:16 +0200 Subject: [PATCH 724/752] Revert "python3Packages.pyatv: 0.13.4 -> 0.14.0" This reverts commit 213d74e57e763a64ec3da7931978dd76f02a1197. Requires pydantic>2.0 which was reverted in 9135cf087. --- .../python-modules/pyatv/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index c1f28e575cf0..7401af8e47d3 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -10,27 +10,22 @@ , miniaudio , netifaces , protobuf -, pydantic -, pydantic-settings -, pyfakefs , pytest-aiohttp , pytest-asyncio , pytest-httpserver , pytest-timeout -, pytest-xdist , pytestCheckHook , pythonRelaxDepsHook , pythonOlder , requests , srptools , stdenv -, tabulate , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.14.0"; + version = "0.13.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +34,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MVDjoo0v+zUXrluoUBc/hwVX+FeIYGzJgHsqNoI6HVo="; + hash = "sha256-rZnL18vO8eYn70GzeKSY528iTc0r/seGv0dYDYGHNzw="; }; postPatch = '' @@ -75,25 +70,24 @@ buildPythonPackage rec { miniaudio netifaces protobuf - pydantic - pydantic-settings requests srptools - tabulate zeroconf ]; nativeCheckInputs = [ deepdiff - pyfakefs pytest-aiohttp pytest-asyncio pytest-httpserver pytest-timeout - pytest-xdist pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" From 08eae121e011864826b1059f31c96b1049974ab6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 16:30:31 +0200 Subject: [PATCH 725/752] python311Packages.quart: disable failing tests The signal tests have been removed for the next release already. --- pkgs/development/python-modules/quart/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix index 932d972eef76..6cf51d6920ff 100644 --- a/pkgs/development/python-modules/quart/default.nix +++ b/pkgs/development/python-modules/quart/default.nix @@ -75,6 +75,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # remove after 0.18.4 + "tests/test_signals.py" + ]; + meta = with lib; { description = "An async Python micro framework for building web applications"; homepage = "https://github.com/pallets/quart/"; From d5de3e286e2652871c563dae8e62e56e7a91291f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 16:32:24 +0200 Subject: [PATCH 726/752] python311Packages.quart-cors: 0.6.0 -> 0.7.0 https://github.com/pgjones/quart-cors/blob/refs/tags/0.7.0/CHANGELOG.rst --- pkgs/development/python-modules/quart-cors/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quart-cors/default.nix b/pkgs/development/python-modules/quart-cors/default.nix index 8ffe47b4eda4..78f3f0311f88 100644 --- a/pkgs/development/python-modules/quart-cors/default.nix +++ b/pkgs/development/python-modules/quart-cors/default.nix @@ -12,18 +12,19 @@ # tests , pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "quart-cors"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pgjones"; repo = "quart-cors"; rev = "refs/tags/${version}"; - hash = "sha256-SbnYrpeyEn47JgP9p3Us0zfkjC1sJ7jPPUIHYHAiSgc="; + hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-asyncio ]; meta = with lib; { From 9789f6dd224f1fee4725ed2a7052a514d6014149 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 16:41:15 +0200 Subject: [PATCH 727/752] python311Packages.pika: fix build, refactor --- .../python-modules/pika/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ff3b9207182e..ead9239f5cde 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,11 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , gevent -, nose2 -, mock , twisted , tornado + +# tests +, nose2 +, mock + }: buildPythonPackage rec { @@ -20,9 +28,20 @@ buildPythonPackage rec { hash = "sha256-60Z+y3YXazUghfnOy4e7HzM18iju5m5OEt4I3Wg6ty4="; }; - propagatedBuildInputs = [ gevent tornado twisted ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ nose2 mock ]; + propagatedBuildInputs = [ + gevent + tornado + twisted + ]; + + nativeCheckInputs = [ + nose2 + mock + ]; postPatch = '' # don't stop at first test failure @@ -45,7 +64,9 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/pika/pika/releases/tag/${version}"; description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; + downloadPage = "https://github.com/pika/pika"; homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; From bafcdd43e815a3e48899ae35e487d2e8f3096198 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 17:36:13 +0200 Subject: [PATCH 728/752] home-assistant: pin dependencies to unbreak component tests --- pkgs/servers/home-assistant/default.nix | 131 ++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3d7ea12691b1..ae12b448fbc0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,16 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { + version = "0.2.4"; + src = fetchFromGitHub { + owner = "CorantGmbH"; + repo = "aioairq"; + rev = "refs/tags/v${version}"; + hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + }; + }); + aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -57,6 +67,16 @@ let ]; }); + blinkpy = super.blinkpy.overridePythonAttrs (oldAttrs: rec { + version = "0.21.0"; + src = fetchFromGitHub { + owner = "fronzbot"; + repo = "blinkpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; + }; + }); + dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { version = "0.33"; src = fetchFromGitHub { @@ -67,6 +87,16 @@ let }; }); + faadelays = super.faadelays.overridePythonAttrs (oldAttrs: rec { + version = "0.0.7"; + src = fetchFromGitHub { + owner = "ntilley905"; + repo = "faadelays"; + rev = "refs/tags/v${version}"; + hash = "sha256-NmBijDr/6pGATvzZhCrOjdDU7DKwLFAfwSgozvBYHMo="; + }; + }); + geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -87,6 +117,26 @@ let }; }); + google-nest-sdm = super.google-nest-sdm.overridePythonAttrs (oldAtrs: rec { + version = "2.2.5"; + src = fetchFromGitHub { + owner = "allenporter"; + repo = "python-google-nest-sdm"; + rev = "refs/tags/${version}"; + hash = "sha256-UMP4FMyS8nAZmN7oKBZhMbqTgi4bSR/JmIeyWaZRZis="; + }; + }); + + holidays = super.holidays.overridePythonAttrs (oldAttrs: rec { + version = "0.28"; + src = fetchFromGitHub { + owner = "dr-prodigy"; + repo = "python-holidays"; + rev = "refs/tags/v.${version}"; + hash = "sha256-JHj7fSE8p3TLViDSegl6gm35u53D9NvN7Oa2TBjN9t4="; + }; + }); + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { @@ -96,6 +146,16 @@ let }; }); + justnimbus = super.justnimbus.overridePythonAttrs (oldAttrs: rec { + version = "0.6.0"; + src = fetchFromGitHub { + owner = "kvanzuijlen"; + repo = "justnimbus"; + rev = "refs/tags/${version}"; + hash = "sha256-uQ5Nc5sxqHeAuavyfX4Q6Umsd54aileJjFwOOU6X7Yg="; + }; + }); + # moto tests are a nuissance moto = super.moto.overridePythonAttrs (_: { doCheck = false; @@ -193,6 +253,16 @@ let }; }); + pydexcom = super.pydexcom.overridePythonAttrs (oldAttrs: rec { + version = "0.2.3"; + src = fetchFromGitHub { + owner = "gagebenne"; + repo = "pydexcom"; + rev = "refs/tags/${version}"; + hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -202,6 +272,25 @@ let }; }); + pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec { + version = "1.0.33"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-A7IzAIV8dQVSmYTEp9yeySQ8eXnLFVkiuWFS3pe2YTA="; + }; + }); + + pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { + version = "0.8.6"; + src = fetchFromGitHub { + owner = "AustinBrunkhorst"; + repo = "pysnooz"; + rev = "refs/tags/v${version}"; + hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -211,6 +300,16 @@ let }; }); + python-tado = super.python-tado.overridePythonAttrs (oldAttrs: rec { + version = "0.15.0"; + src = fetchFromGitHub { + owner = "wmalgadey"; + repo = "PyTado"; + rev = "refs/tags/${version}"; + hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; + }; + }); + pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -250,6 +349,27 @@ let doCheck = false; }); + screenlogicpy = super.screenlogicpy.overridePythonAttrs (oldAttrs: rec { + version = "0.8.2"; + src = fetchFromGitHub { + owner = "dieselrabbit"; + repo = "screenlogicpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-7w2cg+LfL3w2Xxf8s7lFxE/HkqZ6RBYp8LkZTOwgK+I="; + }; + }); + + syrupy = super.syrupy.overridePythonAttrs (oldAttrs: rec { + version = "4.2.1"; + src = fetchFromGitHub { + owner = "tophat"; + repo = "syrupy"; + rev = "refs/tags/v${version}"; + hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM="; + }; + doCheck = false; + }); + # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -261,6 +381,17 @@ let }; }); + velbus-aio = super.velbus-aio.overridePythonAttrs (oldAttrs: rec { + version = "2023.2.0"; + src = fetchFromGitHub { + owner = "Cereal2nd"; + repo = "velbus-aio"; + rev = "refs/tags/${version}"; + hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g="; + fetchSubmodules = true; + }; + }); + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; From 977c1ea0b86cf93ebb324f5faee3d5af19132d5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Sep 2023 19:35:34 +0200 Subject: [PATCH 729/752] python311Packages.cvypy: disable racy test --- pkgs/development/python-modules/cvxpy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 3d15d8d7776c..0fb8be981e10 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -67,6 +67,8 @@ buildPythonPackage rec { "test_diffcp_sdp_example" "test_huber" "test_partial_problem" + # https://github.com/cvxpy/cvxpy/issues/2174 + "test_scipy_mi_time_limit_reached" ] ++ lib.optionals stdenv.isAarch64 [ "test_ecos_bb_mi_lp_2" # https://github.com/cvxpy/cvxpy/issues/1241#issuecomment-780912155 ]; From 4d742c40adfba4c23eae237843d14aea41f3fda5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Sep 2023 03:48:18 +0200 Subject: [PATCH 730/752] buildbot: fix build --- .../tools/continuous-integration/buildbot/master.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index a025de299ccd..b89f4e4d2883 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -66,7 +66,7 @@ let package = buildPythonApplication rec { pname = "buildbot"; version = "3.9.2"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; From 9bef51b78fb91c73c545b29fea80d7cbfcb47b7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Sep 2023 04:41:54 +0200 Subject: [PATCH 731/752] python311Packages.klein: 2022-06-26 -> 2023-09-05 Bumping past the latest release, because it is incompatible with our hypothesis version. --- .../python-modules/klein/default.nix | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 641388fbdd57..c19746970a71 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -1,35 +1,46 @@ { lib -, stdenv -, attrs , buildPythonPackage , fetchFromGitHub -, hyperlink -, hypothesis -, incremental -, python , pythonOlder -, treq + +# build-system +, setuptools +, wheel + +# dependencies +, attrs +, hyperlink +, incremental , tubes , twisted -, typing-extensions , werkzeug , zope_interface + +# tests +, idna +, python +, treq }: buildPythonPackage rec { pname = "klein"; - version = "unstable-2022-06-26"; - format = "setuptools"; + version = "unstable-2023-09-05"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "twisted"; repo = pname; - rev = "d8c2b92a3c77aa64c596696fb6f07172ecf94a74"; - hash = "sha256-RDZqavkteUbARV78OctZtLIrE4RoYDVAanjwE5i/ZeM="; + rev = "44b356ede27a667252ae5392014c802f0492c017"; + hash = "sha256-zHdyyx5IseFWr25BGLL0dDM8/5BDehsvbxIci+DEo9s="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ attrs hyperlink @@ -38,17 +49,17 @@ buildPythonPackage rec { tubes werkzeug zope_interface - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ - hypothesis + idna treq ]; checkPhase = '' + runHook preCheck ${python.interpreter} -m twisted.trial klein + runHook postCheck ''; pythonImportsCheck = [ @@ -56,6 +67,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/twisted/klein/releases/tag/${version}"; description = "Klein Web Micro-Framework"; homepage = "https://github.com/twisted/klein"; license = licenses.mit; From 81d4f41d62aaaa8c557a21fffc6c23209e6a06f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Sep 2023 06:18:44 +0200 Subject: [PATCH 732/752] python311Packages.pytest-base-url: disable failing test --- pkgs/development/python-modules/pytest-base-url/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix index 4110a0191f3c..a6aa15890b85 100644 --- a/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { "tests" ]; + disabledTests = [ + # should be xfail? or mocking doesn't work + "test_url_fails" + ]; + pythonImportsCheck = [ "pytest_base_url" ]; From 73fd4ebd2f59dd3beb7c04a249053b4fbdb02efd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Sep 2023 17:55:45 +0200 Subject: [PATCH 733/752] release-python.nix: add nixos-render-docs to tested set --- pkgs/top-level/release-python.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 75e0b2def622..33080d5620f0 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -35,7 +35,8 @@ let name = "python-tested"; meta.description = "Release-critical packages from the python package sets"; constituents = [ - jobs.remarshal.x86_64-linux # Used in pkgs.formats helper + jobs.nixos-render-docs.x86_64-linux # Used in nixos manual + jobs.remarshal.x86_64-linux # Used in pkgs.formats helper jobs.python311Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert jobs.python311Packages.colorama.x86_64-linux # Used in nixos test-driver jobs.python311Packages.ptpython.x86_64-linux # Used in nixos test-driver From 0706efa1bc11b97cd2ce8be36c91367144c6f308 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Sep 2023 18:13:10 +0200 Subject: [PATCH 734/752] python311Packages.astroquery: unbreak tests --- pkgs/development/python-modules/astroquery/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 7b5a24378dde..610238559a2c 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13 + "-W" "ignore::DeprecationWarning" + ]; + # Tests must be run in the build directory. The tests create files # in $HOME/.astropy so we need to set HOME to $TMPDIR. preCheck = '' @@ -66,8 +71,6 @@ buildPythonPackage rec { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; license = licenses.bsd3; - # Broken since a certain astropy update, due to API incompatibility - broken = true; maintainers = [ maintainers.smaret ]; }; } From e11cac622e7608327d17d2a140a580370476b0e4 Mon Sep 17 00:00:00 2001 From: pennae Date: Sun, 24 Sep 2023 20:11:16 +0200 Subject: [PATCH 735/752] nixos-render-docs: fix tests for markdown-it-py 3 parsing of escaped text has changed internally, but apart from Token field contents that we only inspect in tests the change is *mostly* invisible to us. some bits of documentation now parse differently and need to be adjusted, but those were slightly questionable to begin with. --- pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py index 8564297efdd3..26fdcea907dd 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py @@ -208,7 +208,7 @@ def test_attr_span_escaping() -> None: content='\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + content='[a]{#bar}', markup='\\[', info='escape', meta={}, block=False, hidden=False) ]), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=True, hidden=False) @@ -220,7 +220,7 @@ def test_attr_span_escaping() -> None: content='\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='\\', markup='', info='', meta={}, block=False, hidden=False), + content='\\', markup='\\\\', info='escape', meta={}, block=False, hidden=False), Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, @@ -237,7 +237,7 @@ def test_attr_span_escaping() -> None: Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='\\[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + content='\\[a]{#bar}', markup='\\\\', info='escape', meta={}, block=False, hidden=False) ], content='\\\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, From d793c3b8b04d27e420bdd8cd5d0267925668f0ad Mon Sep 17 00:00:00 2001 From: pennae Date: Sun, 24 Sep 2023 20:23:21 +0200 Subject: [PATCH 736/752] manual: fix parsing differences for markdown-it-py 3 version 3 now recognizes these replacements as escaped, but neither look like they should be. --- nixos/doc/manual/development/settings-options.section.md | 2 +- nixos/doc/manual/release-notes/rl-1509.section.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 5060dd98f58f..3a4800742b04 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -58,7 +58,7 @@ have a predefined type and string generator already declared under and returning a set with YAML-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). -`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \... } +`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. } : A function taking an attribute set with values diff --git a/nixos/doc/manual/release-notes/rl-1509.section.md b/nixos/doc/manual/release-notes/rl-1509.section.md index 1422ae4c299c..f47d13008185 100644 --- a/nixos/doc/manual/release-notes/rl-1509.section.md +++ b/nixos/doc/manual/release-notes/rl-1509.section.md @@ -2,7 +2,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: -- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) \-- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement ["Full Stackage Support in Nixpkgs"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. +- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement ["Full Stackage Support in Nixpkgs"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. - Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security. @@ -178,7 +178,7 @@ The new option `system.stateVersion` ensures that certain configuration changes - Nix now requires binary caches to be cryptographically signed. If you have unsigned binary caches that you want to continue to use, you should set `nix.requireSignedBinaryCaches = false`. -- Steam now doesn't need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package \-- to `steamOriginal`. +- Steam now doesn't need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package -- to `steamOriginal`. - CMPlayer has been renamed to bomi upstream. Package `cmplayer` was accordingly renamed to `bomi` From fc2a518a9c33d8c9d64816e6e98adcdd0fa8bb58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Sep 2023 04:21:24 +0200 Subject: [PATCH 737/752] python311Packages.sqlalchemy: 2.0.19 -> 2.0.21 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_20 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_21 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 2f5f5d1a8e2c..95e357cabda9 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.19"; + version = "2.0.21"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-97q04wQVtlV2b6VJHxvnQ9ep76T5umn1KI3hXh6a8kU="; + hash = "sha256-ldBn+pdZfqnBKdYkOcG47ScH/hBgeJBeIvn1hCIBw/A="; }; nativeBuildInputs =[ From 5be3e19aec48df8356b613046cae0db41c3dc839 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Sep 2023 04:31:35 +0200 Subject: [PATCH 738/752] python311Packages.pydantic: 1.10.9 -> 1.10.12 https://github.com/pydantic/pydantic/blob/v1.10.12/HISTORY.md --- .../development/python-modules/pydantic/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index ea4943a06506..4384e51db22b 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.9"; + version = "1.10.12"; format = "setuptools"; outputs = [ @@ -48,18 +48,9 @@ buildPythonPackage rec { owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4="; + hash = "sha256-3XnbPGU90wLCPEryFAOky6Iy73Dvgzzh+GbOKW8hZ4U="; }; - patches = [ - # Fixes racy doctests build failures on really fast machines - # FIXME: remove after next release - (fetchpatch { - url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff"; - hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs="; - }) - ]; - postPatch = '' sed -i '/flake8/ d' Makefile ''; From f38d4876e0c1f9e06679641e04ed880144f51485 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 26 Sep 2023 23:00:04 +0900 Subject: [PATCH 739/752] python311Packages.pydal: disable failing tests --- .../python-modules/pydal/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 2e84d0305da2..18fd4dc70b4a 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, python +, pytestCheckHook , pythonOlder , setuptools }: @@ -18,29 +18,29 @@ buildPythonPackage rec { hash = "sha256-EEeKYeYnxbjLdpH39+v3IQhFSFMWST0310DCl/ttGEU="; }; - postPatch = '' - # this test has issues with an import statement - # rm tests/tags.py - sed -i '/from .tags import/d' tests/__init__.py - - # this assertion errors without obvious reason - sed -i '/self.assertEqual(csv0, str(r4))/d' tests/caching.py - - # some sql tests fail against sqlite engine - sed -i '/from .sql import/d' tests/__init__.py - ''; - nativeBuildInputs = [ setuptools ]; - pythonImportsCheck = [ "pydal" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest tests - runHook postCheck - ''; + pytestFlagsArray = [ + "tests/*.py" + # these tests already seem to be broken on the upstream + "--deselect=tests/nosql.py::TestFields::testRun" + "--deselect=tests/nosql.py::TestSelect::testGroupByAndDistinct" + "--deselect=tests/nosql.py::TestExpressions::testOps" + "--deselect=tests/nosql.py::TestExpressions::testRun" + "--deselect=tests/nosql.py::TestImportExportUuidFields::testRun" + "--deselect=tests/nosql.py::TestConnection::testRun" + "--deselect=tests/validation.py::TestValidateAndInsert::testRun" + "--deselect=tests/validation.py::TestValidateUpdateInsert::testRun" + "--deselect=tests/validators.py::TestValidators::test_IS_IN_DB" + ]; + + pythonImportsCheck = ["pydal"]; meta = with lib; { description = "Python Database Abstraction Layer"; From 21aa8c0b7e254340afb5cae96c3ec66704bb780f Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 26 Sep 2023 23:20:46 +0900 Subject: [PATCH 740/752] python311Packages.python-ulid: init at 2.2.0 --- .../python-modules/python-ulid/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/python-ulid/default.nix diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix new file mode 100644 index 000000000000..db1456dc3186 --- /dev/null +++ b/pkgs/development/python-modules/python-ulid/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, freezegun +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-ulid"; + version = "2.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "mdomke"; + repo = "python-ulid"; + rev = "refs/tags/${version}"; + hash = "sha256-d5jCPxWUOfw/OCtbA9Db9+s1D5DAdL+vbPR8zavgbbo="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ "ulid" ]; + + meta = with lib; { + description = "ULID implementation for Python"; + homepage = "https://github.com/mdomke/python-ulid"; + changelog = "https://github.com/mdomke/python-ulid/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54114f0cd441..a7b69b82d470 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10738,6 +10738,8 @@ self: super: with self; { python-uinput = callPackage ../development/python-modules/python-uinput { }; + python-ulid = callPackage ../development/python-modules/python-ulid { }; + python-unshare = callPackage ../development/python-modules/python-unshare { }; python-utils = callPackage ../development/python-modules/python-utils { }; From 400ac889a863b1a81c140d88b9d92ba825ab535d Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 26 Sep 2023 23:44:52 +0900 Subject: [PATCH 741/752] python311Packages.redis-om: init at 0.2.1 --- .../python-modules/redis-om/default.nix | 85 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/python-modules/redis-om/default.nix diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix new file mode 100644 index 000000000000..af0170cbf322 --- /dev/null +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, unasync +, poetry-core +, python +, click +, hiredis +, more-itertools +, pydantic +, python-ulid +, redis +, types-redis +, typing-extensions +, pkgs +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "redis-om"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "redis"; + repo = "redis-om-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-jQS0VTYZeAj3+OVFy+JP4mUFBPo+a5D/kdJKagFraaA="; + }; + + nativeBuildInputs = [ + unasync + poetry-core + ]; + + propagatedBuildInputs = [ + click + hiredis + more-itertools + pydantic + python-ulid + redis + types-redis + typing-extensions + ]; + + preBuild = '' + ${python.pythonForBuild.interpreter} make_sync.py + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + preCheck = '' + ${pkgs.redis}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + # probably require redisearch + # https://github.com/redis/redis-om-python/issues/532 + doCheck = false; + + pythonImportsCheck = [ + "aredis_om" + "redis_om" + ]; + + meta = with lib; { + description = "Object mapping, and more, for Redis and Python"; + homepage = "https://github.com/redis/redis-om-python"; + changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7b69b82d470..fff715e1c48a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11221,6 +11221,8 @@ self: super: with self; { redis = callPackage ../development/python-modules/redis { }; + redis-om = callPackage ../development/python-modules/redis-om { }; + redshift-connector = callPackage ../development/python-modules/redshift-connector { }; reedsolo = callPackage ../development/python-modules/reedsolo { }; From df5a13303eb0e26154f1963cb879ae2fa6d58fac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Sep 2023 17:13:23 +0200 Subject: [PATCH 742/752] python311Packages.willow: configure heif extra --- .../python-modules/willow/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 0fc9b58fb704..1787faa38905 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -10,6 +10,9 @@ , filetype , defusedxml +# optional-dependencies +, pillow-heif + # tests , numpy , opencv4 @@ -43,7 +46,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { heif = [ - # TODO: pillow-heif + pillow-heif ]; }; @@ -53,18 +56,7 @@ buildPythonPackage rec { pytestCheckHook pillow wand - ]; - - disabledTests = [ - # pillow-heif missing - "test_avif" - "test_heic" - "test_heif" - "test_save_as_avif" - "test_save_as_heif" - "test_save_as_heic" - "test_detect_faces" - ]; + ] ++ passthru.optional-dependencies.heif; meta = with lib; { description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; From 34deb8dd6a857f36e50e3098c4d527b400f0b2a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Sep 2023 17:21:55 +0200 Subject: [PATCH 743/752] python311Packages.django-pattern-library: 1.0.0 -> 1.0.1 Unbreak the build, convert to pytest-django, propose upstream patch for poetry-core migration. https://github.com/torchbox/django-pattern-library/blob/v1.0.1/CHANGELOG.md --- .../django-pattern-library/default.nix | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 00b6fe9c978f..76d376d11c09 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -1,47 +1,59 @@ -{ beautifulsoup4 -, buildPythonPackage -, django +{ buildPythonPackage , fetchFromGitHub +, fetchpatch , lib -, markdown + +# build-system , poetry-core -, python + +# dependencies +, django +, markdown , pyyaml + +# tests +, beautifulsoup4 +, pytestCheckHook +, pytest-django }: buildPythonPackage rec { pname = "django-pattern-library"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { - repo = pname; owner = "torchbox"; + repo = "django-pattern-library"; rev = "v${version}"; - sha256 = "sha256-V299HpbfNLa9cpVhBfzD41oe95xqh+ktQVMMVvm5Xao="; + hash = "sha256-Q8rv7RDlstTSlwmbmHV0vrnCV/lwz6VJf27BUllA34Y="; }; + patches = [ + (fetchpatch { + # https://github.com/torchbox/django-pattern-library/pull/232 + url = "https://github.com/torchbox/django-pattern-library/commit/e7a9a8928a885941391fb584eba81578a292ee7d.patch"; + hash = "sha256-3uUoxdVYEiF+to88qZRhOkh1++RfmsqCzO9JNMDqz6g="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ django pyyaml markdown ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api - ''; - - nativeBuildInputs = [ poetry-core ]; - - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 + pytestCheckHook + pytest-django ]; - checkPhase = '' - export DJANGO_SETTINGS_MODULE=tests.settings.dev - ${python.interpreter} -m django test - ''; + env.DJANGO_SETTINGS_MODULE = "tests.settings.dev"; pythonImportsCheck = [ "pattern_library" ]; @@ -51,7 +63,5 @@ buildPythonPackage rec { changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ sephi ]; - # https://github.com/torchbox/django-pattern-library/issues/212 - broken = lib.versionAtLeast django.version "4.2"; }; } From 605ea5541a6010d9ab8851c886d22cf40c01274e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Sep 2023 17:46:08 +0200 Subject: [PATCH 744/752] python311Packages.wagtail: provide willow[heif] --- pkgs/development/python-modules/wagtail/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index c985cca8924d..cc5fa6c5a9a0 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { requests telepath willow - ]; + ] ++ willow.optional-dependencies.heif; # Tests are in separate derivation because they require a package that depends # on wagtail (wagtail-factories) From 1a7bfd884cda12728520da3a4c444defcd25fb8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Sep 2023 18:16:45 +0200 Subject: [PATCH 745/752] python311Packages.pillow-heif: fix pname, enable more tests, reformat --- .../python-modules/pillow-heif/default.nix | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index fe243c6a0324..6edc041ed481 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -1,18 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system , cmake -, pillow -, pytest , nasm + +# native dependencies , libheif , libaom , libde265 , x265 + +# dependencies +, pillow + +# tests +, opencv4 +, numpy +, pympler +, pytestCheckHook }: buildPythonPackage rec { - pname = "pillow_heif"; + pname = "pillow-heif"; version = "0.13.0"; format = "setuptools"; @@ -23,16 +34,37 @@ buildPythonPackage rec { hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; }; - nativeBuildInputs = [ cmake nasm ]; - buildInputs = [ libheif libaom libde265 x265 ]; - propagatedBuildInputs = [ pillow ]; - nativeCheckInputs = [ pytest ]; + nativeBuildInputs = [ + cmake + nasm + ]; dontUseCmakeConfigure = true; - pythonImportsCheck = [ "pillow_heif" ]; + buildInputs = [ + libaom + libde265 + libheif + x265 + ]; + + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ + "pillow_heif" + ]; + + nativeCheckInputs = [ + opencv4 + numpy + pympler + pytestCheckHook + ]; meta = { + changelog = "https://github.com/bigcat88/pillow_heif/releases/tag/v${version}"; description = "Python library for working with HEIF images and plugin for Pillow"; homepage = "https://github.com/bigcat88/pillow_heif"; license = with lib.licenses; [ bsd3 lgpl3 ]; From ecd208ad485531920a468b29c6358eca86ff2a83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Sep 2023 01:26:50 +0200 Subject: [PATCH 746/752] matrix-dl: fix build --- .../instant-messengers/matrix-dl/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix index caf6669e120b..0b2be12ad0b3 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -1,8 +1,12 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "matrix-dl"; version = "unstable-2020-07-14"; + format = "pyproject"; src = fetchFromGitHub { owner = "rubo77"; @@ -11,6 +15,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1l8nh8z7kz24v0wcy3ll3w6in2yxwa1yz8lyc3x0blz37d8ss4ql"; }; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ matrix-client ]; From bfaeb8bbc6a5553098bab7cb56ef3f1b1709c559 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 27 Sep 2023 11:12:10 +0900 Subject: [PATCH 747/752] python311Packages.tables: fix test for numexpr 2.8.5 --- pkgs/development/python-modules/tables/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 8705f64817e8..c1726ee97a85 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -36,6 +36,12 @@ buildPythonPackage rec { url = "https://github.com/PyTables/PyTables/commit/337792561e5924124efd20d6fea6bbbd2428b2aa.patch"; hash = "sha256-pz3A/jTPWXXlzr+Yl5PRUvdSAinebFsoExfek4RUHkc="; }) + (fetchpatch { + name = "numexpr-2.8.5-compatibility.patch"; + url = "https://github.com/PyTables/PyTables/commit/1a235490ebe1a138da1139cfa19829b5f0a2af37.patch"; + includes = [ "tables/tests/test_queries.py" ]; + hash = "sha256-uMS+Z2Zcz68ILMQaBdIDMnCyasozCaCGOiGIyw0+Evc="; + }) ]; nativeBuildInputs = [ From 650b953b72d4ca3013e81a5a5cfc0760f09ed1af Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 27 Sep 2023 11:32:49 +0900 Subject: [PATCH 748/752] python311Packages.keystoneauth1: disable failing test it is incompatible with urllib3 2.0.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 504cc8ee4c66..134f5af0632f 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -62,8 +62,11 @@ buildPythonPackage rec { testtools ]; + # test_keystoneauth_betamax_fixture is incompatible with urllib3 2.0.0 + # https://bugs.launchpad.net/keystoneauth/+bug/2020112 checkPhase = '' - stestr run + stestr run \ + -E "keystoneauth1.tests.unit.test_betamax_fixture.TestBetamaxFixture.test_keystoneauth_betamax_fixture" ''; pythonImportsCheck = [ "keystoneauth1" ]; From 585fb3d7f1e182f0f54e1d7254734d1ed4cac5d9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 27 Sep 2023 12:09:23 +0900 Subject: [PATCH 749/752] python311Packages.preshed: 3.0.8 -> 3.0.9 --- pkgs/development/python-modules/preshed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index b253525aacd1..e0d37c51a2b1 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "preshed"; - version = "3.0.8"; + version = "3.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bHTHAHiAm/3doXvpZIPEHQbXF5NLB8q3khAR2BdYs1c="; + hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA="; }; nativeBuildInputs = [ From 8f9e81dcda002345e1fd0689ad84709fa9c2216c Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 27 Sep 2023 17:03:25 +0900 Subject: [PATCH 750/752] python311Packages.seaborn: 0.12.2 -> 0.13.0rc0 Diff: https://github.com/mwaskom/seaborn/compare/v0.12.2...v0.13.0rc0 Changelog: https://github.com/mwaskom/seaborn/blob/master/doc/whatsnew/v0.13.0.rst Adopt pre-release versions instead of massive patches for compatibility. It will be officially released in a few days. --- .../python-modules/seaborn/default.nix | 37 ++++--------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 267b6065ed73..b9839793c8d4 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -1,8 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchpatch -, fetchPypi +, fetchFromGitHub , flit-core , matplotlib , pytest-xdist @@ -15,34 +14,18 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.12.2"; + version = "0.13.0rc0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-N0ZF82UJ0NyriVy6W0fa8Fhvd7/js2yXxgfbfaW+ATk="; + src = fetchFromGitHub { + owner = "mwaskom"; + repo = "seaborn"; + rev = "refs/tags/v${version}"; + hash = "sha256-bNuTDXUjdOwqJN1U20eaeSa4/Q3Fe2XMqulqVmDLFEU="; }; - patches = [ - (fetchpatch { - name = "fix-test-using-matplotlib-3.7.patch"; - url = "https://github.com/mwaskom/seaborn/commit/db7ae11750fc2dfb695457239708448d54e9b8cd.patch"; - hash = "sha256-LbieI0GeC/0NpFVxV/NRQweFjP/lj/TR2D/SLMPYqJg="; - }) - (fetchpatch { - name = "fix-pandas-deprecation.patch"; - url = "https://github.com/mwaskom/seaborn/commit/a48601d6bbf8381f9435be48624f1a77d6fbfced.patch"; - hash = "sha256-LuN8jn6Jo9Fvdl5iGZ2LgINYujSDvvs+hSclnadV1F4="; - }) - (fetchpatch { - name = "fix-tests-using-numpy-1.25.patch"; - url = "https://github.com/mwaskom/seaborn/commit/b6737d5aec9a91bb8840cdda896a7970e1830d56.patch"; - hash = "sha256-Xj82yyB5Vy2xKRl0ideDmJ5Zr4Xc+8cEHU/liVwMSvE="; - }) - ]; - nativeBuildInputs = [ flit-core ]; @@ -62,10 +45,6 @@ buildPythonPackage rec { disabledTests = [ # requires internet connection "test_load_dataset_string_error" - - # per https://github.com/mwaskom/seaborn/issues/3431, we can enable this - # once matplotlib releases version > 3.7.2 - "test_share_xy" ] ++ lib.optionals (!stdenv.hostPlatform.isx86) [ # overly strict float tolerances "TestDendrogram" From 82a7af66ba4b6bd39370958dcbacf38ed509e19b Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 27 Sep 2023 17:18:09 +0900 Subject: [PATCH 751/752] python311Packages.seaborn: refactor - add meta.changelog - add optional-dependencies --- pkgs/development/python-modules/seaborn/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index b9839793c8d4..de5bbed11998 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -10,6 +10,7 @@ , pandas , pythonOlder , scipy +, statsmodels }: buildPythonPackage rec { @@ -34,9 +35,15 @@ buildPythonPackage rec { matplotlib numpy pandas - scipy ]; + passthru.optional-dependencies = { + stats = [ + scipy + statsmodels + ]; + }; + nativeCheckInputs = [ pytest-xdist pytestCheckHook @@ -61,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Statistical data visualization"; homepage = "https://seaborn.pydata.org/"; + changelog = "https://github.com/mwaskom/seaborn/blob/master/doc/whatsnew/${src.rev}.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fridh ]; }; From ea1f9e3d19000f914e44c5f3aed9ffb5fc9e8db3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 27 Sep 2023 23:44:08 +0900 Subject: [PATCH 752/752] qt5.qtwebengine: fix compatibility with python3.11 --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 7326fa54fd38..777430af0217 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -57,6 +57,12 @@ qtModule { # TODO: be more precise patchShebangs . + + # Fix compatibility with python3.11 + substituteInPlace tools/metrics/ukm/ukm_model.py \ + --replace "r'^(?i)(|true|false)$'" "r'(?i)^(|true|false)$'" + substituteInPlace tools/grit/grit/util.py \ + --replace "mode = 'rU'" "mode = 'r'" ) '' # Prevent Chromium build script from making the path to `clang` relative to