From b4cf86d7e045730c716472b927798c9489c0509f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 01:04:21 +0100 Subject: [PATCH 001/673] python39Packages: Stop recursing into package set For NixOS 23.05 we are shifting support away from 3.9 and towards 3.10 and 3.11. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4141a3096e44..473493c722a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16313,7 +16313,7 @@ with pkgs; python27Packages = python27.pkgs; python37Packages = python37.pkgs; python38Packages = python38.pkgs; - python39Packages = recurseIntoAttrs python39.pkgs; + python39Packages = python39.pkgs; python310Packages = recurseIntoAttrs python310.pkgs; python311Packages = python311.pkgs; python312Packages = python312.pkgs; From 755532262d295682fe2adcd4aa8a19c8585da2c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 01:05:19 +0100 Subject: [PATCH 002/673] python311Packages: Recurse into package set Python 3.11 is the latest stable release that we are going to support, together with 3.10, in NixOS 23.05. The default python version will remain at 3.10, but 3.11 packages will be built on Hydra and provided from the binary cache. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 473493c722a4..b15f4a7b84a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16315,7 +16315,7 @@ with pkgs; python38Packages = python38.pkgs; python39Packages = python39.pkgs; python310Packages = recurseIntoAttrs python310.pkgs; - python311Packages = python311.pkgs; + python311Packages = recurseIntoAttrs python311.pkgs; python312Packages = python312.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; From bdc18031e57f663d2db63ef96ed013bf853e5a40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 01:37:38 +0100 Subject: [PATCH 003/673] python311Packages.tensorflow-bin: Disable The upstream does not support 3.11 yet and as such has not provided any compatible wheels. --- pkgs/development/python-modules/tensorflow/bin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 96f54632069e..7a2d29b75c7c 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -49,6 +49,9 @@ in buildPythonPackage { inherit (packages) version; format = "wheel"; + # Python 3.11 still unsupported + disabled = pythonAtLeast "3.11"; + src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; platform = if stdenv.isDarwin then "mac" else "linux"; From b511bf59bd6754ad49c637f390dbb6bc1acea000 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 02:02:06 +0100 Subject: [PATCH 004/673] python3Packages.setuptools: 65.3.0 -> 65.6.3 https://setuptools.pypa.io/en/stable/history.html#v65-6-3 --- 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 9fab8747b67f..993850922f5c 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,7 +10,7 @@ let pname = "setuptools"; - version = "65.3.0"; + version = "65.6.3"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ let owner = "pypa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LPguGVWvwEMZpJFuXWLVFzIlzw+/QSMjVi2oYh0cI0s="; + hash = "sha256-B/1MhH0RDW7/pUam2FHnIcUPN6NpvQYBjRyHIm+E9rI="; name = "${pname}-${version}-source"; }; From 272a94a6c578da23760a79b509cab0f60aeac731 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 02:08:55 +0100 Subject: [PATCH 005/673] python3Packages.pip: 22.2.2 -> 22.3.1 https://pip.pypa.io/en/stable/news/#v22-3-1 --- pkgs/development/python-modules/pip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 5c24679a9cb3..09787ab32b49 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "22.2.2"; + version = "22.3.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; - rev = version; - sha256 = "sha256-SLjmxFUFmvgy8E8kxfc6lxxCRo+GN4L77pqkWkRR8aE="; + rev = "refs/tags/${version}"; + hash = "sha256-mrfd3VWqb4SgSjBJAxBhYegABdJa7pVXL7wA5uZtF/A="; name = "${pname}-${version}-source"; }; From ea04a1f38a7e49e66606666738a82c53943661b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 12:15:06 +0100 Subject: [PATCH 006/673] python3Packages.hypothesis: 6.54.5 -> 6.61.0 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-61-0 --- 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 59c758b25aa6..dd6784335f29 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.54.5"; + version = "6.61.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-mr8ctmAzRgWNVpW+PZlOhaQ0l28P0U8PxvjoVjfHX78="; + hash = "sha256-gTcdJaOgP8Nc4fN8UH6+sLedivq5ZNxMRULajFOVnSo="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From de08f0ba6decb6387fc54304eb0ebd5d53c71371 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 12:40:34 +0100 Subject: [PATCH 007/673] python3Packages.flit-scm: Trim dependencies and refactor --- .../python-modules/flit-scm/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index 494df272445f..2a209f2b7cd8 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitLab , pythonOlder -, git , flit-core , setuptools-scm , tomli @@ -11,19 +10,37 @@ buildPythonPackage rec { pname = "flit-scm"; version = "1.7.0"; - format = "pyproject"; src = fetchFromGitLab { owner = "WillDaSilva"; repo = "flit_scm"; - rev = version; - sha256 = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; - leaveDotGit = true; + rev = "refs/tags/${version}"; + hash = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; }; - nativeBuildInputs = [ flit-core setuptools-scm tomli git ]; - propagatedBuildInputs = [ flit-core setuptools-scm ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + flit-core + setuptools-scm + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + propagatedBuildInputs = [ + flit-core + setuptools-scm + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + pythonImportsCheck = [ + "flit_scm" + ]; + + + doCheck = false; # no tests meta = with lib; { description = "A PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit to build the package."; From 39f4004b0ea3c750b264bbf4f183eb7c542e610e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 12:41:57 +0100 Subject: [PATCH 008/673] python3Packages.exceptiongroup: Disable tests on python310 Since pytest now requires exceptiongroup we can't use it to test the package, because it causes an infinite recursion. --- pkgs/development/python-modules/exceptiongroup/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 865e14f8e506..54139f48a669 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -4,6 +4,7 @@ , flit-scm , pytestCheckHook , pythonOlder +, pythonAtLeast }: buildPythonPackage rec { @@ -26,6 +27,8 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest + checkInputs = [ pytestCheckHook ]; From 6d9c72445899838d00828e85b2c5057b99ccc8b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 12:44:20 +0100 Subject: [PATCH 009/673] python3Packages.pytest: 7.1.3 -> 7.2.0 https://github.com/pytest-dev/pytest/releases/tag/7.2.0 --- pkgs/development/python-modules/pytest/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7690b84fd3fa..b329fee256ff 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -11,6 +11,7 @@ # propagates , attrs +, exceptiongroup , iniconfig , packaging , pluggy @@ -20,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.1.3"; + version = "7.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TzZf7C3/nBFi+DTZ8YrxuhMGLbDHCL97lG+KXHYYDDk="; + hash = "sha256-xAFOtA4Q8R81WtTjwvssbG0ZGcc/O1pDPeRwggLK3lk="; }; outputs = [ @@ -44,6 +45,8 @@ buildPythonPackage rec { pluggy py tomli + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; postInstall = '' @@ -69,7 +72,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.1.3/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.2.0/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" From 44f365a9310d4b38e5bd984e5c7a229e96472297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Nov 2022 12:05:18 -0800 Subject: [PATCH 010/673] python310Packages.pytest-xdist: 2.5.0 -> 3.1.0 https://github.com/pytest-dev/pytest-xdist/blob/v3.1.0/CHANGELOG.rst --- .../python-modules/pytest-xdist/default.nix | 31 ++++++++++++++----- .../python-modules/pytest-xdist/setup-hook.sh | 9 ------ 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b17b6f2f763a..9efbd95cff83 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -7,32 +7,47 @@ , filelock , execnet , pytest -, pytest-forked , psutil -, pexpect +, setproctitle }: buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.5.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-RYDeyj/wTdsqxT66Oddstd1e3qwFDLb7x2iw3XErTt8="; + hash = "sha256-QP2481RJIcXfzUhqwIDOIocOcdgs7W0uePqXwq3dSAw="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; + buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook filelock pexpect ]; - propagatedBuildInputs = [ execnet pytest-forked psutil ]; + + propagatedBuildInputs = [ + execnet + ]; + + checkInputs = [ + filelock + pytestCheckHook + ]; + + passthru.optional-dependencies = { + psutil = [ psutil ]; + setproctitle = [ setproctitle ]; + }; pytestFlagsArray = [ # pytest can already use xdist at this point "--numprocesses=$NIX_BUILD_CORES" - "--forked" ]; # access file system diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 61d0f64d1a4d..4c6473cea64d 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -1,16 +1,7 @@ pytestXdistHook() { pytestFlagsArray+=( "--numprocesses=$NIX_BUILD_CORES" - "--forked" ) - - # Using --forked on darwin leads to crashes when fork safety is - # enabled. This often happens when urllib tries to request proxy - # settings on MacOS through `urllib.request.getproxies()` - # - https://github.com/python/cpython/issues/77906 - if [[ "$OSTYPE" == "darwin"* ]]; then - export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - fi } # the flags should be added before pytestCheckHook runs so From f6bd32f9f87b060785c06b9326d1d985f65567fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Dec 2022 22:44:34 -0800 Subject: [PATCH 011/673] python310Packages.pytest-forked: add setup hook --- .../python-modules/pytest-forked/default.nix | 2 ++ .../pytest-forked/setup-hook.sh | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-forked/setup-hook.sh diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 594a5efaa894..b5aff78fa170 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + setupHook = ./setup-hook.sh; + meta = { description = "Run tests in isolated forked subprocesses"; homepage = "https://github.com/pytest-dev/pytest-forked"; diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh new file mode 100644 index 000000000000..e613feadf834 --- /dev/null +++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -0,0 +1,25 @@ +pytestForkedHook() { + pytestFlagsArray+=( + "--forked" + ) + + # Using --forked on darwin leads to crashes when fork safety is + # enabled. This often happens when urllib tries to request proxy + # settings on MacOS through `urllib.request.getproxies()` + # - https://github.com/python/cpython/issues/77906 + if [[ "$OSTYPE" == "darwin"* ]]; then + export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES + fi +} + +# the flags should be added before pytestCheckHook runs so +# until we have dependency mechanism in generic builder, we need to use this ugly hack. + +if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then + if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then + preDistPhases+=" " + preDistPhases="${preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" + else + preDistPhases+=" pytestForkedHook" + fi +fi From 621f845e8040f6ad8bf72b1c609746a74c308267 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sat, 19 Nov 2022 09:55:49 +0100 Subject: [PATCH 012/673] python3Packages.typing-extensions: 4.3.0 -> 4.4.0 --- pkgs/development/python-modules/typing-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 36464204e75d..01ef53e479ad 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.3.0"; + version = "4.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-5tJnejL0f8frJ5XbHdFcHzTv9ha8ryz7Xpl/hU+hxKY="; + hash = "sha256-FRFDS7kr+N0ZjBKxzIEugA1Bgc/LhnZ04PgnnMkwh6o="; }; nativeBuildInputs = [ From b9b53676235f78cce2939913bd16480173ed6479 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 14:43:17 +0100 Subject: [PATCH 013/673] python3Packages.pytest-mock: 3.8.2 -> 3.10.0 https://github.com/pytest-dev/pytest-mock/releases/tag/v3.10.0 https://github.com/pytest-dev/pytest-mock/releases/tag/v3.9.0 --- .../python-modules/pytest-mock/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index ed25a10d3a4e..3e35bcba1bb4 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , pytest , pytest-asyncio , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.8.2"; + version = "3.10.0"; disabled = pythonOlder "3.7"; @@ -18,9 +19,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-d/A/RVQ5JVhwApXgWu0LEJaiDUpgpPPdzeWLDDHI/KI="; + hash = "sha256-+72whe98JSoyb9jNysCqOxMz2IEfExvcxwEALhvn7U8="; }; + patches = [ + (fetchpatch { + # Remove unnecessary py.code import + url = "https://github.com/pytest-dev/pytest-mock/pull/328/commits/e2016928db1147a2a46de6ee9fa878ca0e9d8fc8.patch"; + hash = "sha256-5Gpzi7h7Io1CMykmBCZR/upM8E9isc3jEItYgwjEOWA="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ From af8b9c216bad5380ba0d912f5f8e9d3f99f8abd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 15:12:14 +0100 Subject: [PATCH 014/673] python3Packages.cffi: Apply patches for pytest 7.2.0 compat --- .../python-modules/cffi/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index fb08761a5284..266c3deb5642 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -32,6 +32,24 @@ if isPyPy then null else buildPythonPackage rec { # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff + (fetchpatch { + # Drop py.code usage from tests, no longer depend on the deprecated py package + url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; + }) + (fetchpatch { + # Replace py.test usage with pytest + url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; + }) ] ++ lib.optionals (pythonAtLeast "3.11") [ # Fix test that failed because python seems to have changed the exception format in the # final release. This patch should be included in the next version and can be removed when From a8a664f206ce7ac14b1fb830c3d38a6654cd655e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 15:15:26 +0100 Subject: [PATCH 015/673] python3Packages.pytest-xprocess: 0.20.0 -> 0.21.0 https://github.com/pytest-dev/pytest-xprocess/blob/0.21.0/CHANGELOG.rst --- .../pytest-xprocess/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index c6262b7f1e0e..bed564319450 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -1,30 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , psutil +, py , pytest , setuptools-scm }: buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.20.0"; + version = "0.21.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AhZ1IsTcdZ+RxKsZhUY5zR6fbgq/ynXhGWgrVB0b1j8="; + sha256 = "sha256-+UcL/PiE9ymetrgqQ9KYwxi45T7DFO5iTJh+DofBtEk="; }; - nativeBuildInputs = [ setuptools-scm ]; - - buildInputs = [ pytest ]; - - propagatedBuildInputs = [ psutil ]; - - # Remove test QoL package from install_requires postPatch = '' + # Remove test QoL package from install_requires substituteInPlace setup.py \ --replace "'pytest-cache', " "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + psutil + py + ]; + # There's no tests in repo doCheck = false; From 31aa25d9c910bd9d8fa1f3cb71bdf684b752d9e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 16:29:22 +0100 Subject: [PATCH 016/673] python3Packages.execnet: Fix compat with pytest 7.2.0 --- .../python-modules/execnet/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 0c75727e7445..db6e9489683e 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , isPyPy , fetchPypi +, fetchpatch , pytestCheckHook , setuptools-scm , apipkg +, py }: buildPythonPackage rec { pname = "execnet"; version = "1.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; }; - checkInputs = [ pytestCheckHook ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ apipkg ]; + patches = [ + (fetchpatch { + # Fix test compat with pytest 7.2.0 + url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch"; + hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0="; + }) + ]; # remove vbox tests postPatch = '' @@ -29,14 +36,30 @@ buildPythonPackage rec { ${lib.optionalString isPyPy "rm -v testing/test_multi.py"} ''; - pythonImportsCheck = [ "execnet" ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + apipkg + ]; + + checkInputs = [ + py + pytestCheckHook + ]; + + pythonImportsCheck = [ + "execnet" + ]; __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst"; description = "Distributed Python deployment and communication"; - license = licenses.mit; homepage = "https://execnet.readthedocs.io/"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; From cbe9daf4d52064c54d6a050a5a275147c88f7fca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 16:33:23 +0100 Subject: [PATCH 017/673] python3Packages.flit: 3.7.1 -> 3.8.0 https://flit.pypa.io/en/stable/history.html#version-3-8 --- pkgs/development/python-modules/flit/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 598905d97ffa..436b65c633c1 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -7,7 +7,6 @@ , testpath , responses , flit-core -, tomli , tomli-w }: @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.7.1"; + version = "3.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "sha256-zKgaeK3fskz2TuHvIWlxBrdZIWfIJHhaqopZ3+V36wY="; + hash = "sha256-iXf9K/xI4u+dDV0Zf6S08nbws4NqycrTEW0B8/qCjQc="; }; nativeBuildInputs = [ @@ -36,7 +35,6 @@ buildPythonPackage rec { docutils requests flit-core - tomli tomli-w ]; From f019f1ede8b33a359ddeb7389bef8de431216f3f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 21:34:52 +0100 Subject: [PATCH 018/673] python3Packages.pytest-forked: fix tests --- .../python-modules/pytest-forked/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index b5aff78fa170..2feb14f01248 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , setuptools-scm , py , pytest @@ -19,6 +20,18 @@ buildPythonPackage rec { sha256 = "sha256-i2dYfI+Yy7rf3YBFOe1UVbbtA4AiA0hd0vU8FCLXRA4="; }; + patches = [ + # pytest 7.2.0 compat, remove after 1.4.0 + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-forked/commit/c3c753e96916a4bc5a8a37699e75c6cbbd653fa2.patch"; + hash = "sha256-QPgxBeMQ0eKJyHXYZyBicVbE+JyKPV/Kbjsb8gNJBGA="; + }) + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-forked/commit/de584eda15df6db7912ab6197cfb9ff23024ef23.patch"; + hash = "sha256-VLE32xZRwFK0nEgCWuSoMW/yyFHEURtNFU9Aa9haLhk="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ @@ -29,7 +42,10 @@ buildPythonPackage rec { py ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + py + pytestCheckHook + ]; setupHook = ./setup-hook.sh; From 98e3547b3509a37bca2aba063e7145f721341ccd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 02:27:12 +0100 Subject: [PATCH 019/673] python3Packages.filelock: 3.8.0 -> 3.9.0 https://github.com/tox-dev/py-filelock/releases/tag/3.9.0 --- pkgs/development/python-modules/filelock/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 7afb72545147..5aee39a459bd 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -1,25 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling , pytestCheckHook , pythonOlder -, setuptools-scm }: buildPythonPackage rec { pname = "filelock"; - version = "3.8.0"; + version = "3.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VUR8qmZvIZjFtrE6JtIITSb6WxFcANBlZkshJGgMTtw="; + hash = "sha256-ezGfJDQLUfVaK/ehKsB1WpsD5xgxHaxWeg9Pf6vS9d4="; }; nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; checkInputs = [ @@ -27,6 +29,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/tox-dev/py-filelock/releases/tag/${version}"; description = "A platform independent file lock for Python"; homepage = "https://github.com/benediktschmitt/py-filelock"; license = licenses.unlicense; From 0b8bc5359dd9516b8d77ac64fac4e45c63554926 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:23:08 -0500 Subject: [PATCH 020/673] python310Packages.attrs: 22.1.0 -> 22.2.0 --- pkgs/development/python-modules/attrs/default.nix | 14 ++++++++++---- pkgs/development/python-modules/attrs/tests.nix | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 44b61fcba725..855b4bf86982 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -3,18 +3,24 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "attrs"; - version = "22.1.0"; - disabled = pythonOlder "3.5"; + version = "22.2.0"; + disabled = pythonOlder "3.6"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Ka3CZlRH5RkdDnxWj954sh+WctNEKB0MbhqwhUKbIrY="; + hash = "sha256-ySJ7/C8BmTwD9o2zfR0VyWkBiDI8BnxkHxo1ylgYX5k="; }; + nativeBuildInputs = [ + setuptools + ]; + outputs = [ "out" "testout" @@ -23,7 +29,7 @@ buildPythonPackage rec { postInstall = '' # Install tests as the tests output. mkdir $testout - cp -R tests $testout/tests + cp -R conftest.py tests $testout ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/attrs/tests.nix b/pkgs/development/python-modules/attrs/tests.nix index c9fae9e0228c..fddf467665c5 100644 --- a/pkgs/development/python-modules/attrs/tests.nix +++ b/pkgs/development/python-modules/attrs/tests.nix @@ -7,6 +7,7 @@ buildPythonPackage { pname = "attrs-tests"; inherit (attrs) version; + format = "other"; srcs = attrs.testout; From f2d8a76868a4ab4b8236ccc89ba6bfd1eb0e82ea Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 29 Dec 2022 11:28:09 -0800 Subject: [PATCH 021/673] python3Packages.packaging: 21.3 -> 22.0 --- pkgs/development/python-modules/packaging/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index c7587cb5c5dc..2673d42a6708 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -1,28 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pyparsing , pytestCheckHook , pythonOlder , pretend -, setuptools }: let packaging = buildPythonPackage rec { pname = "packaging"; - version = "21.3"; + version = "22.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s="; + sha256 = "sha256-IZjsIL1MAXuPlxfgDwyHFAdvwv2TgWdQq0jixB3iz9M="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ pyparsing ]; From c8ff23158ecd1b0bfafab7dc4a0daaf82fda06fb Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 29 Dec 2022 11:27:40 -0800 Subject: [PATCH 022/673] python3Packages.pyproject-api: init at 1.2.1 Co-Authored-By: Martin Weinelt --- .../python-modules/pyproject-api/default.nix | 89 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/development/python-modules/pyproject-api/default.nix diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix new file mode 100644 index 000000000000..6e719ea6f417 --- /dev/null +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build time +, hatchling +, hatch-vcs +, setuptools-scm + +# runtime +, packaging +, toml +, tomli + +# docs +, sphinxHook +, furo +, sphinx-autodoc-typehints + +# tests +, pytest-mock +, pytestCheckHook +, virtualenv +, wheel +}: + +buildPythonPackage rec { + pname = "pyproject-api"; + version = "1.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "tox-dev"; + repo = "pyproject-api"; + rev = "refs/tags/${version}"; + hash = "sha256-IRNg0/lTWoS8znsbipZNoeun+uOpZtCApL4HkF2lwhU="; + }; + + outputs = [ + "out" + "doc" + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + setuptools-scm + + # docs + sphinxHook + furo + sphinx-autodoc-typehints + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + virtualenv + wheel + ]; + + disabledTests = [ + # requires eol python2 interpreter + "test_can_build_on_python_2" + ]; + + pythonImportsCheck = [ + "pyproject_api" + ]; + + meta = with lib; { + changelog = "https://github.com/tox-dev/pyproject-api/releases/tag/${version}"; + description = "API to interact with the python pyproject.toml based projects"; + homepage = "https://github.com/tox-dev/pyproject-api"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9726609c6673..ae7c2d07a500 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6953,6 +6953,8 @@ self: super: with self; { pyprecice = callPackage ../development/python-modules/pyprecice { }; + pyproject-api = callPackage ../development/python-modules/pyproject-api { }; + pypsrp = callPackage ../development/python-modules/pypsrp { }; phpserialize = callPackage ../development/python-modules/phpserialize { }; From 7f5e062065bf568322f94ba8b6e7abc0f464cbed Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Fri, 30 Dec 2022 02:48:43 +0100 Subject: [PATCH 023/673] python3Packages.chardet: 5.0.0 -> 5.1.0 Co-Authored-By: Martin Weinelt --- pkgs/development/python-modules/chardet/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index b5cca5110e7c..07a0cbccf258 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -4,18 +4,24 @@ , hypothesis , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "chardet"; - version = "5.0.0"; + version = "5.1.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A2jfK/14tfwgVyu06bt/tT4sCU9grpmTM56GcdCvuKo="; + hash = "sha256-DWJxK5VrwVT4X7CiZuKjxZE8KWfgA0hwGzJBHW3vMeU="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ hypothesis pytestCheckHook @@ -29,6 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "chardet" ]; meta = with lib; { + changelog = "https://github.com/chardet/chardet/releases/tag/${version}"; description = "Universal encoding detector"; homepage = "https://github.com/chardet/chardet"; license = licenses.lgpl21Plus; From 66de0472ab71a4d8d8fee40fc11873a64748ae88 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 29 Dec 2022 11:28:52 -0800 Subject: [PATCH 024/673] python3Packages.virtualenv: 20.16.5 -> 20.17.1 --- pkgs/development/python-modules/virtualenv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index f0b365761f6c..e86ec5fa7da7 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,12 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.16.5"; + version = "20.17.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-In6huZlP3F6jGXe6M4PvKW10cuqFvp1nMuQqkcBOgNo="; + hash = "sha256-+LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg="; }; nativeBuildInputs = [ From bd4e0b28f937d8e44a98eee61237ac4856de2887 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 29 Dec 2022 11:29:20 -0800 Subject: [PATCH 025/673] python3Packages.tox: 3.27.1 -> 4.0.16 --- .../python-modules/tox/default.nix | 67 +++++++++++++++---- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 9c167a7614c8..c60691c0674b 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder , packaging , pluggy , py @@ -10,27 +11,69 @@ , toml , tomli , filelock -, pythonOlder +, hatchling +, hatch-vcs +, platformdirs +, pyproject-api +, colorama +, chardet +, cachetools +, testers +, tox }: buildPythonPackage rec { pname = "tox"; - version = "3.27.1"; + version = "4.0.16"; + format = "pyproject"; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ packaging pluggy py six virtualenv filelock ] - ++ lib.optional (pythonOlder "3.11") tomli; + src = fetchFromGitHub { + owner = "tox-dev"; + repo = "tox"; + rev = "refs/tags/${version}"; + hash = "sha256-D53koe8XJLhEmDqfFOs2quDNVsC0jvr3/VzNCH4h8DY="; + }; - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "packaging>=22" "packaging" + ''; - src = fetchPypi { - inherit pname version; - hash = "sha256-sqkg41pmjMBpQv/RzzpPsiGk2QnKchkftthLCxinvgQ="; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + cachetools + chardet + colorama + filelock + packaging + platformdirs + pluggy + py + pyproject-api + six + toml + virtualenv + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + doCheck = false; # infinite recursion via devpi-client + + passthru.tests = { + version = testers.testVersion { package = tox; }; }; meta = with lib; { - description = "Virtualenv-based automation of test activities"; - homepage = "https://tox.readthedocs.io/"; + changelog = "https://github.com/tox-dev/tox/releases/tag/${version}"; + description = "A generic virtualenv management and test command line tool"; + homepage = "https://github.com/tox-dev/tox"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From b5901055ef7d478257dab994ae5b69b24e42c7e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 14:43:43 +0100 Subject: [PATCH 026/673] Revert "python3Packages.packaging: 21.3 -> 22.0" This reverts commit 31bae8490a334b1a70abed1df042cbe00bbc9d3f. It is possibly too early to incur this breaking package. --- pkgs/development/python-modules/packaging/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 2673d42a6708..c7587cb5c5dc 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -1,28 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, flit-core , pyparsing , pytestCheckHook , pythonOlder , pretend +, setuptools }: let packaging = buildPythonPackage rec { pname = "packaging"; - version = "22.0"; + version = "21.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IZjsIL1MAXuPlxfgDwyHFAdvwv2TgWdQq0jixB3iz9M="; + sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s="; }; nativeBuildInputs = [ - flit-core + setuptools ]; propagatedBuildInputs = [ pyparsing ]; From cc00c2949b8196cdffa56b1cc3151e5b8eb5cb92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 17:23:48 +0100 Subject: [PATCH 027/673] python3Packages.cryptography: Pass py into checkInputs and set format. --- pkgs/development/python-modules/cryptography/default.nix | 3 +++ pkgs/development/python-modules/cryptography/vectors.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index d5e4af33f601..7f746655c766 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -18,6 +18,7 @@ , pretend , libiconv , iso8601 +, py , pytz , hypothesis }: @@ -28,6 +29,7 @@ in buildPythonPackage rec { pname = "cryptography"; version = "38.0.4"; # Also update the hash in vectors.nix + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { @@ -63,6 +65,7 @@ buildPythonPackage rec { hypothesis iso8601 pretend + py pytestCheckHook pytest-benchmark pytest-subtests diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 4de95b000263..31ace7c48ffd 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package inherit (cryptography) version; + format = "setuptools"; src = fetchPypi { pname = "cryptography_vectors"; From 86a151563d166cf0c2e99bb00e15730dcc808638 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 17:24:26 +0100 Subject: [PATCH 028/673] python3Packages.devpi: Pass py into checkInputs --- pkgs/development/python-modules/devpi-common/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 21bb275918dd..21beec5b440e 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook ]; From 57eb9f068120efc4a48eec5c4acc3deaf81f54fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 17:24:44 +0100 Subject: [PATCH 029/673] devpi-server: Pass py into checkInputs to fix tests and set format. --- pkgs/development/tools/devpi-server/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index e774b554dc06..c6852ddf1cb1 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -11,6 +11,7 @@ , passlib , platformdirs , pluggy +, py , pyramid , pytestCheckHook , repoze_lru @@ -24,6 +25,7 @@ buildPythonApplication rec { pname = "devpi-server"; version = "6.7.0"; + format = "setuptools"; disabled = isPy27; @@ -62,6 +64,7 @@ buildPythonApplication rec { checkInputs = [ beautifulsoup4 nginx + py pytestCheckHook webtest ]; From 04af8bfa8a5d56bb35ce367d75847dc9a51ca4f6 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 25 Dec 2022 16:10:47 -0500 Subject: [PATCH 030/673] python311Packages.jedi: disable some tests --- pkgs/development/python-modules/jedi/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 2235cb909c01..3c939195000d 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub , attrs @@ -37,14 +38,17 @@ buildPythonPackage rec { ''; disabledTests = [ - # Assertions mismatches with pytest>=6.0 - "test_completion" - # sensitive to platform, causes false negatives on darwin "test_import" ] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # disabled until 3.11 is added to _SUPPORTED_PYTHONS in jedi/api/environment.py + "test_find_system_environments" + + # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved + "test_interpreter" ]; meta = with lib; { From 8afcb44617eba8424b1e86d0ede855f108913ae4 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Sat, 19 Nov 2022 12:35:19 +0100 Subject: [PATCH 031/673] python3Packages.pandas: 1.4.4 -> 1.5.2 --- pkgs/development/python-modules/pandas/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 9125b96a014c..72e053c8a56a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.4.4"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q2wNc4YXtnUYPl8o2zK1FItpStm7oKQMPqJtlrQx22c="; + hash = "sha256-IguY0VzuCyzYOaY1i9Hyc9A1a/lkwaGusy1H2wIVSIs="; }; nativeBuildInputs = [ cython ]; @@ -96,6 +96,8 @@ buildPythonPackage rec { # than expected, e.g. on amd64 with FMA or on arm64 # https://github.com/pandas-dev/pandas/issues/38921 "test_rolling_var_numerical_issues" + # Requires mathplotlib + "test_subset_for_boolean_cols" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" From bf6d21b7d4fc2e171d600d49ce9a2246f0f0dbfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Nov 2022 20:04:50 -0800 Subject: [PATCH 032/673] python310Packages.pytest-asyncio: 0.19.0 -> 0.20.3 https://github.com/pytest-dev/pytest-asyncio/blob/v0.20.3/CHANGELOG.rst --- pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 855b5f618f81..e13f67ec83b5 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.19.0"; + version = "0.20.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A8ngASbSRwY4RjanalnWBGgskZMDO50ffOf6wMNqOvA="; + hash = "sha256-oq28wJ/Tq4yuQ/98tdzYKDyatpliS0Xcbc6T46ZTP7I="; }; outputs = [ From 88fc8c7b0d512e173007e8470bb00cbcaf3c1551 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:51 +0100 Subject: [PATCH 033/673] python3Packages.aardwolf: 0.0.8 -> 0.2.1 --- .../python-modules/aardwolf/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 58d07696de20..9e4cac5855e6 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -2,14 +2,17 @@ , arc4 , asn1crypto , asn1tools +, asyauth , asysocks , buildPythonPackage , colorama -, fetchPypi +, fetchFromGitHub , minikerberos , pillow , pyperclip , pythonOlder +, rustPlatform +, setuptools-rust , tqdm , unicrypto , winsspi @@ -17,20 +20,40 @@ buildPythonPackage rec { pname = "aardwolf"; - version = "0.0.8"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-plz1D+Lr5rV8iJo7IUmuXfjxLvVxX9lgyxyYXUlPH0k="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = "aardwolf"; + rev = "86c4b511e0dfeeb767081902af2244f6297a68eb"; + hash = "sha256-ULczCJWVLrj0is6UYZxJNyLV6opzoJAFStqsjEmjaIA="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/aardwolf/utils/rlers"; + name = "${pname}-${version}"; + hash = "sha256-F6NLWc5B577iH0uKAdj2y2TtQfo4eeXkMIK6he1tpvQ="; + }; + + cargoRoot = "aardwolf/utils/rlers"; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + setuptools-rust + ] ++ (with rustPlatform.rust; [ + cargo + rustc + ]); + propagatedBuildInputs = [ arc4 asn1crypto asn1tools + asyauth asysocks colorama minikerberos From ce24ef2a991594046d8f6ffdadfeac25ad5d9b79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:51 +0100 Subject: [PATCH 034/673] python3Packages.absl-py: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index e2facc919347..8ce782aedc98 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc="; + sha256 = "sha256-Rjw4oI0uTO9sSYt2ulvUhY5MbvUdoaWh8nE5oCLiAkg="; }; propagatedBuildInputs = [ From ed51b8f495ea096b63d7a5ec22b3bb22d6b75db5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:52 +0100 Subject: [PATCH 035/673] python3Packages.advantage-air: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/advantage-air/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/advantage-air/default.nix b/pkgs/development/python-modules/advantage-air/default.nix index 90c8645547fe..205ea0c0e7f8 100644 --- a/pkgs/development/python-modules/advantage-air/default.nix +++ b/pkgs/development/python-modules/advantage-air/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "advantage-air"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "advantage_air"; inherit version; - hash = "sha256-I9HMDLZX9xKDJuYSAweM2r4v3ZKevHTn5dHTYxN3EuE="; + hash = "sha256-3t6ujBmhDVghnDSmJWb/7CHKNsvr4QFsfIqd4p8BHlA="; }; propagatedBuildInputs = [ From 813f9c741bc81254da7478a48932e07420e4221a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:52 +0100 Subject: [PATCH 036/673] python3Packages.aeppl: 0.0.39 -> 0.0.50 --- pkgs/development/python-modules/aeppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 6d222dfe51cb..c8fe640760df 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.0.39"; + version = "0.0.50"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ILyE3tqoDHNmrKpHPBUJ02jrGevsU5864rjhgmgjwvo="; + hash = "sha256-cc41MspG2mXlNwLz7ViPPqXH/ayskVmms5SXqBo9g3Y="; }; propagatedBuildInputs = [ From 3342fd0c2bbc509cf3b2269803771990d0da7ed4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:52 +0100 Subject: [PATCH 037/673] python3Packages.aiojobs: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/aiojobs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 0ae7c3e8a06c..937ff406ed74 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "1.0.0"; + version = "1.1.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - sha256 = "EQwD0b2B9qFVd/8thKInaio0hpPzvVIjvCN0TcARu2w="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; }; nativeBuildInputs = [ From 24618632944a6eaac19971f6cd73a7236cf47465 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:52 +0100 Subject: [PATCH 038/673] python3Packages.aiolifx-themes: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 8263104c3915..8a987027a02b 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-U3hIKmgnafkuVLi1r42BBXDKVcSSvLaRnmOEANasEyY="; + hash = "sha256-ND+0jukCU3jB34Sf4qAZg/+pyXVCoIoMqOoBW7srCSQ="; }; prePatch = '' From 377a28a6a8f2876e1be9ffcb6a1d45c1e239207a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:52 +0100 Subject: [PATCH 039/673] python3Packages.aiomysensors: 0.3.3 -> 0.3.5 --- pkgs/development/python-modules/aiomysensors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 23f26ca72b25..3110707ad7fc 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MartinHjelmare"; repo = pname; - rev = "v${version}"; - hash = "sha256-VvGhFf9x257YdSmOxjztGZW9FLBNd028rH3+BvXAQ4o="; + rev = "refs/tags/v${version}"; + hash = "sha256-jVqOOQLu/vL0L5WWtfU2rL4gNhPX+9HvchBp29aw+qA="; }; nativeBuildInputs = [ From 7b54bcfc2c4766d73d4e9725bfb781a1ed83360e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:52 +0100 Subject: [PATCH 040/673] python3Packages.aioresponses: 0.7.3 -> 0.7.4 --- pkgs/development/python-modules/aioresponses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 3c2a0e48d329..282870398209 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LGTtVxDujLTpWMVpGE2tEvTJzVk5E1yzj4jGqCYczrM="; + sha256 = "sha256-m4wQizY1TARjO60Op1K1XZVqdgL+PjI0uTn8RK+W8dg="; }; nativeBuildInputs = [ From a6f2dd1e2ae1e03857fc51296b63cee8389a8ee2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:53 +0100 Subject: [PATCH 041/673] python3Packages.aiosmtpd: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/aiosmtpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 254f1bfa4fe3..b283267faee9 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "0hbpyns1j1fpvpj7gyb8cz359j7l4hzfqbig74xp4xih59sih0wj"; + rev = "refs/tags/${version}"; + sha256 = "sha256-QtLtw+2jEPLOxa45vDEbWEaSZ8RIyxf1zkZjR34Wu+8="; }; propagatedBuildInputs = [ From 94ae566e12dfb8d78acf20c48f3df9d2afa80da5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:53 +0100 Subject: [PATCH 042/673] python3Packages.aiosqlite: 0.17.0 -> 0.18.0 --- pkgs/development/python-modules/aiosqlite/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 022e34e23c1b..2ad77ee673f1 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -2,6 +2,7 @@ , aiounittest , buildPythonPackage , fetchPypi +, flit-core , isPy27 , pytestCheckHook , typing-extensions @@ -9,14 +10,19 @@ buildPythonPackage rec { pname = "aiosqlite"; - version = "0.17.0"; + version = "0.18.0"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-8OaswkvEhkFJJnrIL7Rt+zvkRV+Z/iHfgmCcxua67lE="; + hash = "sha256-+qhD71+wi6/pqbOFkBLT2db3fONjeJneIGBrf8OaohM="; }; + nativeBuildInputs = [ + flit-core + ]; + checkInputs = [ aiounittest pytestCheckHook From 46a29d49cbc55257e8fd3bf4979ab3dc8de29d06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:53 +0100 Subject: [PATCH 043/673] python3Packages.aiowatttime: 2021.10.0 -> 2022.10.0 --- pkgs/development/python-modules/aiowatttime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index 67d21b7ebfab..42ede58440e7 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2021.10.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-cWXhQMgRYBzOVgUQWONIwWFB5n/f0lqkSjUb9IoPwtI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; }; nativeBuildInputs = [ From 5fe2e97ab7510e11f2680cea3139cf97a436798d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:53 +0100 Subject: [PATCH 044/673] python3Packages.alembic: 1.8.1 -> 1.9.1 --- 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 aefe80a3b0b3..3b13476f31a7 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.8.1"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zQteRbFLcGQmuDPwY2m5ptXuA/gm7DI4cjzoyq9uX/o="; + sha256 = "sha256-+fduQQYfXr4n1P6SYA353WElIadoP5BNqzKLoCz/paI="; }; propagatedBuildInputs = [ From 41b94cb5e98744e314d6304490f58bac94772116 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:53 +0100 Subject: [PATCH 045/673] python3Packages.allure-behave: 2.10.0 -> 2.12.0 --- 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 000c51359f54..4463be9997b3 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.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BzDu/LJBstuchkvUAeCDSIDIiFLZmC4y0s3d+1paGxs="; + sha256 = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; }; nativeBuildInputs = [ From c995631e0d2b0c20194fe13571f72c19300f7b42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:53 +0100 Subject: [PATCH 046/673] python3Packages.allure-pytest: 2.10.0 -> 2.12.0 --- 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 273aa38b02a4..3df8d19dee15 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.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Oyq2din0y9hher2BfSsiKSxut+/VWE+ZLRr4FDrqbuc="; + sha256 = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; }; buildInputs = [ From e4d51fe165f00f58c7d99f2b0a7fd9b9a58d69ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:53 +0100 Subject: [PATCH 047/673] python3Packages.allure-python-commons: 2.10.0 -> 2.12.0 --- .../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 052ef498b4a6..414271358545 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.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1NMTRLDwA3pKEeFrkbKM8O6yP/oOUMJ/z8aqvnIhLTw="; + sha256 = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; }; nativeBuildInputs = [ From 108935657c2d6ad31805689b2e53aadc1359cc91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:54 +0100 Subject: [PATCH 048/673] python3Packages.allure-python-commons-test: 2.11.0 -> 2.12.0 --- .../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 fcdc76a0897a..a68cf5a90882 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.11.0"; + version = "2.12.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-69iSW5pUbYQpA/dgpCr088CUaa1BGIwlijltmFZnEa0="; + sha256 = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; }; nativeBuildInputs = [ From a22f0ea99167ba948492f201d0a7ebbd5fb41f31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:54 +0100 Subject: [PATCH 049/673] python3Packages.amarna: 0.1.3 -> 0.1.5 --- pkgs/development/python-modules/amarna/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix index aadf4d2665e5..fb6ef7873824 100644 --- a/pkgs/development/python-modules/amarna/default.nix +++ b/pkgs/development/python-modules/amarna/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amarna"; - version = "0.1.3"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "crytic"; repo = "amarna"; - rev = "v${version}"; - hash = "sha256-cE7OhACLpRmbJWzMsGTidbbw9FOKBbz47LEJwTW6wck="; + rev = "refs/tags/v${version}"; + hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I="; }; propagatedBuildInputs = [ From 1f6ff640b44ad1e5f3045ccdfb07d2919d8dbffc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:54 +0100 Subject: [PATCH 050/673] python3Packages.ansible: 6.6.0 -> 7.1.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 81839ecce007..74f24b2028eb 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.6.0"; + version = "7.1.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI="; + sha256 = "sha256-HkcjjEqp5owMU2ej/XB7psOUm0qvkSsGRArXjdK/AY0="; }; postPatch = '' From 72e14f23c3e8759cd3f3f26fb9cb94ca3c0f072a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:54 +0100 Subject: [PATCH 051/673] python3Packages.anybadge: 1.11.1 -> 1.14.0 --- pkgs/development/python-modules/anybadge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index 489e200afb04..3fc3ae316edb 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "anybadge"; - version = "1.11.1"; + version = "1.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jongracecox"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-6br4WUwE1ovAneYUeTHcUN3PH5Wm1rnLYCpXDUshk7Q="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; }; # setup.py reads its version from the TRAVIS_TAG environment variable From 3e1c8797cddcc16e8a3a1846b117de5274aabb60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:54 +0100 Subject: [PATCH 052/673] python3Packages.apache-airflow: 2.4.3 -> 2.5.0 --- pkgs/development/python-modules/apache-airflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index cbedbeb70dca..68b2cf396de8 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -77,7 +77,7 @@ , enabledProviders ? [] }: let - version = "2.4.3"; + version = "2.5.0"; airflow-src = fetchFromGitHub rec { owner = "apache"; @@ -86,7 +86,7 @@ let # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; - sha256 = "sha256-7E7Em6ZCWjxJiDKQ0j/vozUo58XsAxv8uW0dVVST4Ak="; + sha256 = "sha256-gE/kPFb5PyPOi6sqtA9YqMokbjVSKgclGNQ6fbiCdgQ="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. From b744a3cd49cba33c622e22549270a4027f289c43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:54 +0100 Subject: [PATCH 053/673] python3Packages.apache-beam: 2.40.0 -> 2.43.0 --- pkgs/development/python-modules/apache-beam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 2d4adb5ddc5e..f9da71979496 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -45,13 +45,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.40.0"; + version = "2.43.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; - rev = "v${version}"; - sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo="; }; patches = [ From 8b1f6ea6fd5d01f08de8d3b247cd23614420e197 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:54 +0100 Subject: [PATCH 054/673] python3Packages.apispec: 5.2.2 -> 6.0.2 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 9ad41715a231..b204e97af221 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "5.2.2"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bqZULh6//p/ZW6Ae8/UTUerGwgCpdFYsdHMFm5zSCqc="; + hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc="; }; propagatedBuildInputs = [ From 7dffb34a83a173aa3b8e8a16e4356ad5cac03662 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 055/673] python3Packages.apscheduler: 3.9.1 -> 3.9.1.post1 --- pkgs/development/python-modules/APScheduler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index b6f79b6c5fc6..d9a222182ae7 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.9.1"; + version = "3.9.1.post1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "APScheduler"; inherit version; - hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM="; + hash = "sha256-sr6gMJVp2lOnJhv6DOGcZ92/4VG9p3amqQdXn9vT6yo="; }; buildInputs = [ From b07a63d78c6fb65b3549c3778d128fc4dc64de31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 056/673] python3Packages.asf-search: 5.0.2 -> 6.0.2 --- 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 6e857499f651..d7b15f939bb1 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "5.0.2"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk="; + hash = "sha256-kbeIGIn8HMXROPiQSmwx3lo7wEX8SDuHYgxh4ws89Mo="; }; propagatedBuildInputs = [ From 58ba66ed8134a80267aa6c394674c5c73eb8c32a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 057/673] python3Packages.astral: 2.2 -> 3.2 https://github.com/sffjunkie/astral/blob/3.2/ChangeLog.md --- .../python-modules/astral/default.nix | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 8c97ef6750f7..62d3cc94cbfd 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,23 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build +, poetry-core + +# runtime +, backports-zoneinfo + +# tests +, pytestCheckHook +, freezegun +}: buildPythonPackage rec { pname = "astral"; - version = "2.2"; - disabled = isPy27; + version = "3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe"; + hash = "sha256-m3w7QS6eadFyz7JL4Oat3MnxvQGijbi+vmbXXMxTPYg="; }; - propagatedBuildInputs = [ pytz requests freezegun ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test -m "not webtest" - ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + checkInputs = [ + freezegun + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/sffjunkie/astral/releases/tag/${version}"; description = "Calculations for the position of the sun and the moon"; homepage = "https://github.com/sffjunkie/astral/"; license = licenses.asl20; From b1db877742169b3b95d3d6d0863c4c6528c10624 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 058/673] python3Packages.astroid: 2.12.12 -> 2.12.13 --- pkgs/development/python-modules/astroid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 9cacef4ac79a..313c3d5de94d 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.12.12"; # Check whether the version is compatible with pylint + version = "2.12.13"; # Check whether the version is compatible with pylint format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = "v${version}"; - hash = "sha256-FN/bBAxx9p1iAB3WXIZyyKv/zse7xtXzslclADMbouA="; + rev = "refs/tags/v${version}"; + hash = "sha256-C4A/JOFdIRgaZuV/YOLc4nC05XTtRCC1i0BcGBEG5ps="; }; nativeBuildInputs = [ From c7051552b9e5eaddfb63beb04a39434d55a37370 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 059/673] python3Packages.astropy: 5.1 -> 5.2 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index fbf40096daef..9b80f780b852 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.1"; + version = "5.2"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-HbGyx+3fx3PKZvozvQeyXVucO17uK5NODKJ3+lsbe34="; + sha256 = "sha256-0zVgQCX24W98m/gtW6KOXbR0WoLlgjqdF73Zub1GsqI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 45efd07b42950daa1f9f478cd20e545d9964bd2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 060/673] python3Packages.asttokens: 2.1.0 -> 2.2.1 --- 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 f45c5e7aff33..51e8805465f5 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.1.0"; + version = "2.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-SqdkAaFRyMxXLZBqrXrqKoQXgINKGdeA9DIcD+G1RjU="; + hash = "sha256-RiIRCypvMLd+FHOv+ql+cRvC8H0/EISEIP8YmO2+lPM="; }; nativeBuildInputs = [ From 048bf8acc5129974e8466212df6dc1802bd70f16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 061/673] python3Packages.asyncio-mqtt: 0.14.0 -> 0.16.1 --- pkgs/development/python-modules/asyncio_mqtt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 41f2f2864d18..05225ef6ec73 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.14.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ByVslOx/XsxVan2/xdRi+wOQR9oVpIGtHPcHlIcHMEk="; + hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -60,6 +60,7 @@ buildPythonPackage rec { "test_client_websockets" "test_client_pending_calls_threshold" "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" + "test_multiple_messages_generators" ]; meta = with lib; { From 3396b16c4ed4cda1a03ad469053b1a464671f596 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:55 +0100 Subject: [PATCH 062/673] python3Packages.async-modbus: 0.2.0 -> 0.2.1 --- .../python-modules/async-modbus/default.nix | 13 +++- .../async-modbus/fix-tests.patch | 73 +++++++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/async-modbus/fix-tests.patch diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index 84423c6afbbc..afeb78d413a7 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , connio , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "async-modbus"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +21,17 @@ buildPythonPackage rec { owner = "tiagocoutinho"; repo = "async_modbus"; rev = "refs/tags/v${version}"; - hash = "sha256-TB+ndUvLZ9G3XXEBpLb4ULHlYZC2CoqGnL2BjMQrhRg="; + hash = "sha256-OTt/rUa3KLVSFOIUyMNHnqHvPtISxTposNFAgoixRfk="; }; + patches = [ + (fetchpatch { + # Fix tests; https://github.com/tiagocoutinho/async_modbus/pull/13 + url = "https://github.com/tiagocoutinho/async_modbus/commit/d81d8ffe94870f0f505e0c8a0694768c98053ecc.patch"; + hash = "sha256-mG3XO2nAFYitatkswU7er29BJc/A0IL1rL2Zu4daZ7k="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace '"--cov=async_modbus",' "" \ diff --git a/pkgs/development/python-modules/async-modbus/fix-tests.patch b/pkgs/development/python-modules/async-modbus/fix-tests.patch new file mode 100644 index 000000000000..1c9dd605f5b8 --- /dev/null +++ b/pkgs/development/python-modules/async-modbus/fix-tests.patch @@ -0,0 +1,73 @@ +diff --git a/tests/test_async_modbus.py b/tests/test_async_modbus.py +index b0bd3fd..6b8df87 100644 +--- a/tests/test_async_modbus.py ++++ b/tests/test_async_modbus.py +@@ -194,7 +194,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply): + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -204,7 +204,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply): + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -273,7 +273,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -283,7 +283,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -306,7 +306,7 @@ async def test_read_holding_registers( + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -316,7 +316,7 @@ async def test_read_holding_registers( + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -383,7 +383,7 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -393,4 +393,4 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply From e04d194fc693f0fa5e92294e59df63d7d5f44f90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 063/673] python3Packages.atlassian-python-api: 3.28.1 -> 3.32.0 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index a0c006261629..fae7f6567037 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.28.1"; + version = "3.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-ZKRmjfH3s35DU1Mut63YuN6opKzg2gpyunWYjg/FbHA="; + sha256 = "sha256-Jh3JdrA/ahge/tJipeMGag2CUk4uuGzMXC9I7UWha9E="; }; propagatedBuildInputs = [ From 108d7e7a1104f2bb0ff2c4fd602b53c7835dae2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 064/673] python3Packages.automat: 20.2.0 -> 22.10.0 --- .../python-modules/automat/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 094015e56f5e..ba055025d698 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , attrs , pytest-benchmark , pytestCheckHook @@ -10,25 +9,15 @@ }: let automat = buildPythonPackage rec { - version = "20.2.0"; + version = "22.10.0"; pname = "automat"; src = fetchPypi { pname = "Automat"; inherit version; - sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; + hash = "sha256-5WvrhO2tGdzBHTDo2biV913ute9elrhKRnBms7hLsE4="; }; - patches = [ - # don't depend on m2r - (fetchpatch { - name = "dont-depend-on-m2r.patch"; - url = "https://github.com/glyph/automat/compare/v20.2.0..2562fa4ddeba5b5945d9482baa4c26a414f5e831.patch"; - includes = [ "setup.py" ]; - hash = "sha256-jlPLJMu1QbBpiVYHDiqPydrXjEoZgYZTVVGNxSA0NxY="; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; From 5bfc071b3c47fb637151ae327b87edf5ed672ea5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 065/673] python3Packages.autopep8: 2.0.0 -> 2.0.1 --- .../python-modules/autopep8/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index a5c7cccffb3e..cc0423397d21 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchpatch , buildPythonPackage +, pythonOlder , pycodestyle , glibcLocales , tomli @@ -10,25 +11,21 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "hhatto"; repo = "autopep8"; - rev = "v${version}"; - sha256 = "sha256-77ZVprACHUP8BmylTtvHvJMjb70E1YFKKdQDigAZG6s="; + rev = "refs/tags/v${version}"; + hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo="; }; - patches = [ - (fetchpatch { - name = "fix-pycodestyle-2.10.0.patch"; - url = "https://github.com/hhatto/autopep8/pull/659.patch"; - hash = "sha256-ulvQqJ3lUm8/9QZwH+whzrxbz8c11/ntc8zH2zfmXiE="; - }) + propagatedBuildInputs = [ + pycodestyle + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; - propagatedBuildInputs = [ pycodestyle tomli ]; - checkInputs = [ glibcLocales pytestCheckHook @@ -37,8 +34,9 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; meta = with lib; { + changelog = "https://github.com/hhatto/autopep8/releases/tag/v${version}"; description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = "https://pypi.org/project/autopep8/"; + homepage = "https://github.com/hhatto/autopep8"; license = licenses.mit; maintainers = with maintainers; [ bjornfor ]; }; From 5338c67cc030652b3a12b7eb0e18c5f349021d13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 066/673] python3Packages.awkward-cpp: 2 -> 5 --- 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 00c50e912016..05a5d4fd5d09 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "2"; + version = "5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XmP0PjE19224Hgkkp07PSHD1hcEan0MlaLN3wEAohow="; + hash = "sha256-5dapDZihTas2WYAV5pJDufg7iFFVYQTL53jKnHmSNlY="; }; nativeBuildInputs = [ From 834f4dc87af6f3cbfc8ef4f3dcf53ffbcfc7de38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 067/673] python3Packages.awkward: 2.0.0 -> 2.0.4 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index f15810ae8ab8..017144e42703 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.0.0"; + version = "2.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N4KzRkMIPW7nZE6f2z2ur8S2AwpmfyGf1hy3sjSXa2g="; + hash = "sha256-/DbvWTTO14ttikC8lNPqWWZ3JVFrNq/qXtHveUJjp8c="; }; nativeBuildInputs = [ From ce7ca24385a2d4b530fb7950b6bbf46a80b49c45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 068/673] python3Packages.aws-sam-translator: 1.47.0 -> 1.55.0 --- .../aws-sam-translator/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index edd0e9426506..215ce6152e90 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -5,16 +5,19 @@ , jsonschema , mock , parameterized +, pydantic , pytest-env +, pytest-rerunfailures +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml -, six +, typing-extensions }: buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.47.0"; + version = "1.55.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,13 +26,14 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - sha256 = "sha256-FYEJ+mMxb8+OXUVeyLbAqOnujNi/wNhvAl4Lh4ZeE0I="; + sha256 = "sha256-YDqdd4zKInttHDl04kvAgHKtc1vBryW12QfE0wiLU54="; }; propagatedBuildInputs = [ boto3 jsonschema - six + pydantic + typing-extensions ]; postPatch = '' @@ -43,6 +47,8 @@ buildPythonPackage rec { mock parameterized pytest-env + pytest-rerunfailures + pytest-xdist pytestCheckHook pyyaml ]; @@ -52,6 +58,16 @@ buildPythonPackage rec { "test_errors_13_error_definitionuri" ]; + pytestFlagsArray = [ + # samtranslator.translator.arn_generator.NoRegionFound: AWS Region cannot be found + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls" + "--deselect tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2" + ]; + pythonImportsCheck = [ "samtranslator" ]; From df6708218124861c04dd4139cd627e1b71cf8918 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 069/673] python3Packages.aws-xray-sdk: 2.10.0 -> 2.11.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 fd8ed21cd085..d851cd056066 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.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mxSST9BijPkpNgVYZGVTVAA/CxrMPhw//eZAPQeZ3Xo="; + sha256 = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; }; propagatedBuildInputs = [ From a65d9faad78c930be4f4402aa8e5f98e13613c62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:56 +0100 Subject: [PATCH 070/673] python3Packages.azure-core: 1.25.1 -> 1.26.1 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 4e9329f22603..f80ca9f17b8f 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -17,7 +17,7 @@ , typing-extensions }: buildPythonPackage rec { - version = "1.25.1"; + version = "1.26.1"; pname = "azure-core"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-PBzzaGUOduwAnAfNEXSpXNy0cbJHu3LRgkX31WwYCbI="; + sha256 = "sha256-IjsOkMvdHwPEGxlbAyOYmYQ/INAJZNu4XmQ4aHNBSi0="; }; propagatedBuildInputs = [ From 46dd1df9f6307c8306904e8326a701f86a46bcc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:57 +0100 Subject: [PATCH 071/673] python3Packages.azure-data-tables: 12.4.0 -> 12.4.1 --- pkgs/development/python-modules/azure-data-tables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index 7f2933e01a56..1d8ce8d5675a 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.4.0"; + version = "12.4.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw="; + sha256 = "sha256-FvEo6PZubKBcB/t4/MxxNJMjHfHYXjPE4lp5yURVhko="; }; propagatedBuildInputs = [ From 2a803d2ba5646d0f85ca328d74815a8b1741907d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:57 +0100 Subject: [PATCH 072/673] python3Packages.azure-mgmt-batch: 16.2.0 -> 17.0.0 --- pkgs/development/python-modules/azure-mgmt-batch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 796c65bcd077..9d89eae3e07b 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "16.2.0"; + version = "17.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI="; + hash = "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; }; propagatedBuildInputs = [ From 273ad9529ca3f5c3adc09b9237eabb0a3ba31c15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:57 +0100 Subject: [PATCH 073/673] python3Packages.azure-mgmt-cognitiveservices: 13.2.0 -> 13.3.0 --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 312b317d6f62..a2d260339aca 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.2.0"; + version = "13.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-XUsi5fNpirCTQ9Zz4AdYPvX8/WS7N5sQcT5t2q2YDkg="; + hash = "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; }; propagatedBuildInputs = [ From 84751ddb56554074a1ebbe4c5aaf1adfa36104b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:57 +0100 Subject: [PATCH 074/673] python3Packages.azure-mgmt-compute: 27.2.0 -> 29.0.0 --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 6c0f36d92eee..00245ed3ffc7 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "27.2.0"; + version = "29.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-5caVUxZvt+7L/1LDfcD/SiUwvFVF1KXdS6mDIVrSKJ0="; + hash = "sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI="; }; propagatedBuildInputs = [ From fd39cc5e1b0178cf2606e69b87cd03244ded40f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:57 +0100 Subject: [PATCH 075/673] python3Packages.azure-mgmt-datafactory: 2.8.1 -> 2.10.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index cadf74a5f653..3027d54531ac 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.8.1"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-HuCp9J7uukK9QK0w2aHPZXiAsp4Az+6hx60ItbJvfkQ="; + hash = "sha256-IT1LQfdNpvc1yNX4Z/qMK2sL2MkaOA4krRFWz1SAz3s="; }; propagatedBuildInputs = [ From 0a0d0ffadd7f09d21c4118edc48a4de39835f824 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:57 +0100 Subject: [PATCH 076/673] python3Packages.azure-multiapi-storage: 0.10.0 -> 1.0.0 --- .../python-modules/azure-multiapi-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 442315d0566b..331c0e1e2e95 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "1.0.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-QhC2s/onnlbFVxMmK6SJg2hatxp4WTrYWtMV0pXtAZ8="; + sha256 = "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; }; propagatedBuildInputs = [ From 4544f40a2315c0946ccd7074dcc6debed06b9770 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:57 +0100 Subject: [PATCH 077/673] python3Packages.azure-servicebus: 7.8.0 -> 7.8.1 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 47849c9c6f1a..9c7a57adc08d 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.8.0"; + version = "7.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-KTvJXOJ3o2KUL9iPcus6m0qS3hAAB3Wz0uPgCttFqlk="; + hash = "sha256-gI5eCyXGFkQgY0rhyGLioLXj1a4I6vV64Nm/EKyFEks="; }; propagatedBuildInputs = [ From cae4698b9d08af3b72c27cbbdac75d5183545642 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:58 +0100 Subject: [PATCH 078/673] python3Packages.azure-synapse-artifacts: 0.13.0 -> 0.14.0 --- .../python-modules/azure-synapse-artifacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index de0909fa0c02..6a84941a5e8f 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-WJZtE7efs1xwalyb0Sr2J+pmPIt9gn2o01/prncb2uM="; + sha256 = "sha256-Q1gGq7EZ/JvYjD7y0mp3kEy15QKZI84UQTdlIBoQLMs="; }; propagatedBuildInputs = [ From 031f92461919ac17adbd0a115757ef6f12621fab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:58 +0100 Subject: [PATCH 079/673] python3Packages.backoff: 2.1.2 -> 2.2.1 --- pkgs/development/python-modules/backoff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index e62533f491cb..fb71d65d5bb4 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "backoff"; - version = "2.1.2"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "litl"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI="; + sha256 = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; nativeBuildInputs = [ From c52f23e4df4248e46ae80b40762d4921541704d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:58 +0100 Subject: [PATCH 080/673] python3Packages.bids-validator: 1.9.8 -> 1.9.9 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 69c0d605c59a..c22c0c9657f1 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.9.8"; + version = "1.9.9"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zl5m7IF+S1vLDIvC47/DRwCiPQpGgsY/OYa+k39fz4="; + sha256 = "sha256-KdYZ5sOpSdUdi7AvnrEfDBnfml4P6thTLM0dUPC/toA="; }; # needs packages which are not available in nixpkgs From 4380cb7c55bd0356f81ec41b34d194a1330b5af6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:58 +0100 Subject: [PATCH 081/673] python3Packages.biliass: 1.3.5 -> 1.3.7 --- .../python-modules/biliass/default.nix | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 617b87bc12f1..a14f973fccce 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -1,23 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +, poetry-core , protobuf +, pytestCheckHook }: buildPythonPackage rec { pname = "biliass"; - version = "1.3.5"; - disabled = pythonOlder "3.6"; + version = "1.3.7"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yutto-dev"; + repo = "biliass"; + rev = "refs/tags/v${version}"; + hash = "sha256-Opb4rlGe+LDJZs3F7e/NZYfuMtHEWUZeMm8VZQfEzKI="; }; - propagatedBuildInputs = [ protobuf ]; + nativeBuildInputs = [ + poetry-core + ]; - pythonImportsCheck = [ "biliass" ]; + propagatedBuildInputs = [ + protobuf + ]; + + doCheck = false; # test artifacts missing + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "biliass" + ]; meta = with lib; { homepage = "https://github.com/yutto-dev/biliass"; From 39e8f6dc0d6ab82f1a82e2d0f89015237bf13c5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:58 +0100 Subject: [PATCH 082/673] python3Packages.billiard: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 303d334936c6..511fbc5318c2 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k="; + sha256 = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU="; }; checkInputs = [ From 03810781446d318598f2b05aaeb25a9c6c64acd3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:58 +0100 Subject: [PATCH 083/673] python3Packages.bimmer-connected: 0.10.4 -> 0.11.0 --- pkgs/development/python-modules/bimmer-connected/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 4af50c6fdb45..84e332974378 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.10.4"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-o4h84WM/p4gVrxv7YDNgwDpyBYu7Aileagwc8PXNwPs="; + hash = "sha256-2WT6+KYQ9wKS7al1qfEDfDcEFaOR/fC1tBi+t1Iyqbw="; }; nativeBuildInputs = [ From 725c51a670f223d1f0063bafcbed182874837c37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:58 +0100 Subject: [PATCH 084/673] python3Packages.biopython: 1.79 -> 1.80 --- pkgs/development/python-modules/biopython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 002b3ce2e292..e0b419da2926 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.79"; + version = "1.80"; src = fetchPypi { inherit pname version; - sha256 = "edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b"; + sha256 = "sha256-UoBemviHZ+RQ4t+BE7W8Welk4uinu4A6g1cL27UcDkM="; }; disabled = !isPy3k; From 7aa63d57e08672f6cd559b429f9cdfc398675610 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 085/673] python3Packages.bitarray: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index f49c4c9de47d..a9bbef0e4325 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.6.0"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0="; + hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA="; }; checkPhase = '' From d936589982002468f4cadd832f634163c11d153a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 086/673] python3Packages.bleak: 0.19.4 -> 0.19.5 --- pkgs/development/python-modules/bleak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index c93bc83b8a0f..f0184dcdb06f 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.19.4"; + version = "0.19.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Sdgsf1gFA0UcyFuaScwqmvHV2E6Crb6vSQgUbBox5hw="; + hash = "sha256-KKZrp5yNuslEPn/TS4eAOMT48C4A5Da5/NhklyFcy7M="; }; nativeBuildInputs = [ From eca61ccf9a31cca9c7a1034d5bf55c186a1ace9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 23:04:06 +0100 Subject: [PATCH 087/673] python3Packages.xyzservices: init at 2022.9.0 --- .../python-modules/xyzservices/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/xyzservices/default.nix diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix new file mode 100644 index 000000000000..fc74c7c374b2 --- /dev/null +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, mercantile +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "xyzservices"; + version = "2022.9.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VWUZYXCLmhSEmXizOd92AIyIbfeoMmMIpVSbrlUWJgw="; + }; + + pythonImportsCheck = [ + "xyzservices.providers" + ]; + + checkInputs = [ + mercantile + pytestCheckHook + requests + ]; + + meta = with lib; { + changelog = "https://github.com/geopandas/xyzservices/releases/tag/${version}"; + description = "Source of XYZ tiles providers"; + homepage = "https://github.com/geopandas/xyzservices"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae7c2d07a500..53e16c92e15f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12263,6 +12263,8 @@ self: super: with self; { xxhash = callPackage ../development/python-modules/xxhash { }; + xyzservices = callPackage ../development/python-modules/xyzservices { }; + yabadaba = callPackage ../development/python-modules/yabadaba { }; yahooweather = callPackage ../development/python-modules/yahooweather { }; From 1ac65c004e1954799f54900135a2d89557b77757 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 088/673] python3Packages.bokeh: 2.4.3 -> 3.0.3 --- pkgs/development/python-modules/bokeh/default.nix | 11 ++++++++--- .../bokeh/hardcode-nodejs-npmjs-paths.patch | 14 +++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 75ca944830f1..c323713c7dc5 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -28,16 +28,19 @@ , icalendar , pandas , pythonImportsCheckHook +, contourpy +, xyzservices }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.4.3"; + version = "3.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; + hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo="; }; patches = [ @@ -70,10 +73,10 @@ buildPythonPackage rec { requests nbconvert icalendar - pandas ]; propagatedBuildInputs = [ + contourpy pillow jinja2 python-dateutil @@ -81,8 +84,10 @@ buildPythonPackage rec { pyyaml tornado numpy + pandas packaging typing-extensions + xyzservices ] ++ lib.optionals ( isPy27 ) [ futures diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch index f8f33c0021f2..fffdea592b73 100644 --- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -1,9 +1,9 @@ -diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py -index a752aad7d..8af05ff63 100644 ---- a/bokeh/util/compiler.py -+++ b/bokeh/util/compiler.py -@@ -442,8 +442,8 @@ def _detect_nodejs(): - raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + +diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +index 9af8691..4b93543 100644 +--- a/src/bokeh/util/compiler.py ++++ b/src/bokeh/util/compiler.py +@@ -415,8 +415,8 @@ def _detect_nodejs() -> str: + raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None @@ -11,5 +11,5 @@ index a752aad7d..8af05ff63 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path(): + def _nodejs_path() -> str: global _nodejs From 664abe1d30f9fa80d386d9175233f20bbd152a3a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 089/673] python3Packages.botocore: 1.29.38 -> 1.29.40 --- 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 1d101b368f93..3a8d90de84c1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.29.38"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.29.40"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - hash = "sha256-K5jH2oZozcAitNila1BoZFTQoQwRUYcC/eQYgdIGGLY="; + hash = "sha256-5YKsBykBjaQVsLXeFOox/9CtBIOp/bgUeQJSbQY0f7c="; }; propagatedBuildInputs = [ From f8e87178be4da8aa22c59a67edf5b9f50bc88ac5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 090/673] python3Packages.branca: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/branca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index e82c5ce78379..bb5b59509801 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "branca"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5vL366fdNozu+PY4Irhn9eEdTTq90Jmnh9ue0rcGWuE="; + sha256 = "sha256-VZSYVSFFBMdYO3G5oDqE3OLpaoQCdhO7U7QtBIRM4k4="; }; checkInputs = [ pytest selenium ]; From 29bfdbc7af232b9bddaf9a01b0f51ff8546e6c8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 091/673] python3Packages.browser-cookie3: 0.16.2 -> 0.16.3 --- .../python-modules/browser-cookie3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index b072c5576d1f..b3abb49c01cc 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -6,20 +6,20 @@ , lz4 , keyring , pbkdf2 -, pycryptodome +, pycryptodomex , pyaes }: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.16.2"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IB0Ms+mCHh7lfG3XYfvE2h/2lec5Tq9AAjqANz7x0hE="; + hash = "sha256-LWqXml6ShNU7gHZChdETwkSmLhipnSCgnyCWnBs7MXw="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { keyring pbkdf2 pyaes - pycryptodome + pycryptodomex ]; # No tests implemented From 5d5c0abf058e4ed2b0fddb635cca0cdbd8281a88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 092/673] python3Packages.bthome-ble: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 5831ea18ee33..8e25f403a5e8 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.3.1"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4KsMYQQN/4A2sbk2Fj8CYOBf7/UAciJ4wTSFYZaCfdk="; + hash = "sha256-BLRXoKZkSWgzGIztwmO8El8pF25QBrTEX05FWXZrHxc="; }; nativeBuildInputs = [ From 791de49240f8bff95814de484138882f258a9c67 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: [PATCH 093/673] python3Packages.btrees: 4.11.0 -> 4.11.3 --- pkgs/development/python-modules/btrees/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 9f91541599c9..46adf39b502e 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "4.11.0"; + version = "4.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-AFwDtIAp1noojnYIeYw3rCSfLAabb1GDZAqUmdzY+qM="; + hash = "sha256-kIUAsCD/mJsAlG+Kb2Vz84qbGAjQd+UuPc8Ej7FwwTo="; }; propagatedBuildInputs = [ From 50c0b78421a5e5b5bfe5b4530f8a5786d1ea8e85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 094/673] python3Packages.bytecode: 0.13.0 -> 0.14.0 --- .../python-modules/bytecode/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 648ec29520bf..a9cf3049d72e 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -3,20 +3,28 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "bytecode"; - version = "0.13.0"; + version = "0.14.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vstinner"; repo = pname; - rev = version; - sha256 = "sha256-aY19qMYW7KziiXVY3lxdnHk7OCAJaNh+aTvlQyJWmDw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-nGZ4qcms27lYr1dYvVe4ebd/jc5qIb1EDhSpSZmKKIo="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + checkInputs = [ pytestCheckHook ]; From 72b7f21a1c9bba961954e8863f6881532ff2597a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 095/673] python3Packages.catboost: 1.0.5 -> 1.1.1 --- pkgs/development/python-modules/catboost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 2c4d3bb23516..0dfc302a49a5 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -5,15 +5,15 @@ buildPythonPackage rec { pname = "catboost"; - version = "1.0.5"; + version = "1.1.1"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "v${version}"; - sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; }; nativeBuildInputs = [ clang_12 ]; From 5632fa15f05d3f673697ff2f0d5293c21af21dac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 096/673] python3Packages.cbor2: 5.4.3 -> 5.4.6 --- pkgs/development/python-modules/cbor2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 7fd5baf57618..19bc40a1e42d 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.4.3"; + version = "5.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Yrhjxe5s7UAyr+lI88FITzdVUJldO4SYFFI3/ijlRsI="; + hash = "sha256-uJNQDbD+Az5XDDrclWr27vxX4oACa9LYb9U9qfHllNc="; }; nativeBuildInputs = [ From b23069550f4d30c45ae0221e34b0c59dbab339b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 097/673] python3Packages.cepa: 1.8.3 -> 1.8.4 --- pkgs/development/python-modules/cepa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index f198d8b058dd..a278d446fce9 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cepa"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "HcbwsyTTei7SyidGSOzo/SyWodL0QPWMDKF6/Ute3no="; + sha256 = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; }; postPatch = '' From d251aafb314fa14fa681a99eadb0c1c370a3e74c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 098/673] python3Packages.certbot: 1.31.0 -> 2.1.1 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index c2f3c1f7915f..e66435d8cc33 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.31.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-JDhesUU6SQBEf0CG3vo1AhlRfGpltTEUmSqrpGIpptg="; + sha256 = "sha256-fCKTDAJiulwL2SOw4bV3vu0VEsvXGF+1ry8esYori8o="; }; sourceRoot = "source/${pname}"; From 68eff1c4d2de0a806027ce22e76cde5dc1020012 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 099/673] python3Packages.cfn-lint: 0.61.2 -> 0.72.5 --- 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 238f5e83630e..e9aafacec9e9 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.61.2"; + version = "0.72.5"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - sha256 = "sha256-282h1fBWhAfwqCuP+dU3ajn0gQtmOcPNTMKZ0a2+vHU="; + sha256 = "sha256-UDjCTl4AAOrwiXbKYIFsZCaSDjIFXYwNnp8/hIfXbM0="; }; postPatch = '' From 9f368220da6066db35480efba0b3c3a9cd92e847 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 100/673] python3Packages.charset-normalizer: 2.1.0 -> 3.0.1 --- .../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 9661700a2858..67d6b713c192 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.1.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = "refs/tags/${version}"; - hash = "sha256-ntNMHjkQJqzSElEeyFmPIjUh6ZxQkTktPipfPHiJ/Vc="; + hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk="; }; checkInputs = [ From 36bd7d20af4df905333ccf20d8e49b87e289d74c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 101/673] python3Packages.chart-studio: 5.10.0 -> 5.11.0 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 3ddcf9599659..a191435331bc 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.10.0"; + version = "5.11.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-j1MiLUSIun0xnUFCcyZ5p8eGF5Q34jCwoVuQG5xSlkU="; + sha256 = "sha256-Reti8tvBpBxpfNjnZs8wWuS76oEWIKPCxzSdTEO+ykA="; }; sourceRoot = "source/packages/python/chart-studio"; From 52f00b87dcea78f6b912957b3de0e81539f3ed6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:00 +0100 Subject: [PATCH 102/673] python3Packages.cheroot: 8.6.0 -> 9.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 da5870f7d500..3e80423c4255 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 = "8.6.0"; + version = "9.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU="; + hash = "sha256-PUetnuGey+wUS0dYOZA2aS/b9npAuW7vH7FFQ2ez0zg="; }; nativeBuildInputs = [ From 9ad4234dea6a6c36483c7ba80176d48a6677f25c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 103/673] python3Packages.chiapos: 1.0.10 -> 1.0.11 --- pkgs/development/python-modules/chiapos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 11452dee2ea5..f8f19e142fbd 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.10"; + version = "1.0.11"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2SqWdGzSXs53PafXnCvTGQXNJqD+5gdJnaYi2O2ABLg="; + sha256 = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo="; }; patches = [ From 1ff8ddb86222cf377433384460a1d91ce8455d50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 104/673] python3Packages.chia-rs: 0.1.5 -> 0.1.16 --- 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 2df9c16f2a30..0e52842dce9e 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.1.5"; + version = "0.1.16"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = version; - sha256 = "sha256-4TIRj7FMIArI/EvDARReC4MqDG44zjn/MKoUHAVqq5s="; + rev = "refs/tags/${version}"; + sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8="; }; cargoDeps = rustPlatform.importCargoLock { From ddce16c924b2ed0a6924af17403fdd35ea18b181 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 105/673] python3Packages.chiavdf: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/chiavdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 525bd1748846..4f6c43a9235a 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.7"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-956517eGqRSLg+Y4ybmASiZoypgpYn/D9lbPA4Rcfts="; + hash = "sha256-ilT7tCdX8ak3qmpXJ0LITf0ZGAdFSN4tm6GKw06A/m8="; }; patches = [ From 6efba12c3a0a9aaf418e6bc2e02d1e6be7529681 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 106/673] python3Packages.cinemagoer: 2022.2.11 -> 2022.12.27 --- pkgs/development/python-modules/cinemagoer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix index 8b62a57b306f..b33725d54594 100644 --- a/pkgs/development/python-modules/cinemagoer/default.nix +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cinemagoer"; - version = "2022.2.11"; + version = "2022.12.27"; src = fetchPypi { inherit pname version; - sha256 = "8efe29dab44a7d275702f3160746015bd55c87b2eed85991dd57dda42594e6c6"; + sha256 = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo="; }; propagatedBuildInputs = [ From 6fbffa480f976977ad3bd2b803cf3ba97cc040e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 107/673] python3Packages.ciso8601: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/ciso8601/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix index 0c9a08d33a4f..315fe69b69ad 100644 --- a/pkgs/development/python-modules/ciso8601/default.nix +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ciso8601"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "closeio"; repo = "ciso8601"; - rev = "v${version}"; - sha256 = "sha256-TqB1tQDgCkXu+QuzP6yBEH/xHxhhD/kGR2S0I8Osc5E="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qTpt91Wf3L6Jl7FU8sn9PvGMRd/cjhQ1mQvUaQeLFQU="; }; nativeBuildInputs = [ From c2ea958f132bd9791e7437d904641ea730fed4b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 108/673] python3Packages.clickgen: 1.2.0 -> 2.1.3 --- pkgs/development/python-modules/clickgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index d0f81a20c6d3..5b8d7728c84f 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "clickgen"; - version = "1.2.0"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ful1e5"; repo = "clickgen"; - rev = "v${version}"; - sha256 = "sha256-01c8SVy+J004dq5KCUe62w7i/xUTxTfl/IpvUtGQgw0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; }; buildInputs = [ libXcursor libX11 libpng ]; From f11dcdc933ad0c50897c201d0175218376d28f31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 109/673] python3Packages.cliff: 4.0.0 -> 4.1.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 d8ff545c848e..34c02b3da389 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.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ow0w56z1DjwhSjnuPmaqLytZV+Kh3jc+F7uo6Yx1AaU="; + sha256 = "sha256-u+6CEnMIRyoxI+0QtSiWFsssQ1B0ZW3QcuVTYwU9CRw="; }; postPatch = '' From e44d56c9570110ee8183ed879c4a5a07fa1b2686 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:01 +0100 Subject: [PATCH 110/673] python3Packages.cloudflare: 2.10.1 -> 2.11.1 --- pkgs/development/python-modules/cloudflare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 8e62a08ebf94..5e52ab7c1769 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.10.1"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wLgb7HnDSX3OVCVNlBd97iIg+g0ngaDWk7Jcs5fKc7k="; + hash = "sha256-VAEgrM9F9M/HjL726RzofJT/Sc8R6WIF/D/gZH5ncBs="; }; propagatedBuildInputs = [ From 9e84f53110148a8351e85a3c4b0c945bf2ea9d97 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 111/673] python3Packages.cloudsmith-api: 1.142.3 -> 2.0.0 --- pkgs/development/python-modules/cloudsmith-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index ffb9d35d2308..e83e3464ad5d 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.142.3"; + version = "2.0.0"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Cdnsath9p+LPKKzV4cmoOtl4doahi86l1NIgUwliZRU="; + sha256 = "sha256-Mcdpmrjg5hX4BTlBgt2+jQaoCqWjNIqkBykl1iT7McA="; }; propagatedBuildInputs = [ From 5f58c9f641f355257d1c6851ba75c2dbb404f5c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 112/673] python3Packages.cloup: 1.0.1 -> 2.0.0.post1 --- pkgs/development/python-modules/cloup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 1ccae736bddb..702a9906868c 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cloup"; - version = "1.0.1"; + version = "2.0.0.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iQfpz2rl7Y3PJIG2aO+Cu1khx2g68XfOwhkRoENqsTg="; + sha256 = "sha256-FDDJB1Bi4Jy2TNhKt6/l1azSit9WHWqzEJ6xl1u9e2s="; }; nativeBuildInputs = [ From befddc3068337fbca7cff4634263e624bc2b5c43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 113/673] python3Packages.ClusterShell: 1.8.4 -> 1.9 --- pkgs/development/python-modules/clustershell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 890c20b0d25a..760971957ed7 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.8.4"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081"; + sha256 = "sha256-A0arNKF9jPRj3GnnOBHG8xDD2YEPpMrPRbZEaKg8FHQ="; }; postPatch = '' From 709107879cd8728ee4aca5bb1c063356a5226f27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 114/673] python3Packages.cmarkgfm: 0.8.0 -> 2022.10.27 --- pkgs/development/python-modules/cmarkgfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index d609508822e4..3d88048ebdc5 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.8.0"; + version = "2022.10.27"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s="; + sha256 = "sha256-k9msdxbqkBygv9GK47aPH2v1HeCDDD8jPvc0/NUqB5k="; }; propagatedNativeBuildInputs = [ From 4bb78a9ef55540a1165377428088efdcc9b73e20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 115/673] python3Packages.cmsis-pack-manager: 0.4.0 -> 0.5.1 --- .../python-modules/cmsis-pack-manager/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 8c5c8c7afed1..76d7249ca880 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -16,11 +16,12 @@ }: let pname = "cmsis-pack-manager"; - version = "0.4.0"; + version = "0.5.1"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-NeUG6PFI2eTwq5SNtAB6ZMA1M3z1JmMND29V9/O5sgw="; + pname = "cmsis_pack_manager"; + inherit version; + sha256 = "sha256-2pKGJlPubR+C4UhdCuMDR9GG2wQOaP6YkMXxeAcaRkk="; }; native = rustPlatform.buildRustPackage { From 3528b5f5f763635978d463035a983f1239263a54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 116/673] python3Packages.coconut: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/coconut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 848fb80ff093..2628c19cb46a 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; - rev = "v${version}"; - sha256 = "sha256-TkMwOE/Jug1zKjR1048o/Jmn8o9/oQPNqzwXYakwpgs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zDMcQPAYlxid3fcMT8kRzE+LN1dxUVWjkg8pdVtmwZg="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; From 2cee609768c8e36619c5ee664a44248ac3c7c432 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 117/673] python3Packages.cocotb: 1.7.1 -> 1.7.2 --- pkgs/development/python-modules/cocotb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 688fc7c367bc..9c06cd2f8b7f 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.7.1"; + version = "1.7.2"; # pypi source doesn't include tests src = fetchFromGitHub { owner = "cocotb"; repo = "cocotb"; - rev = "v${version}"; - sha256 = "sha256-wACgT5r0YmSYvLhTsuFhTcJqeCtGGLifOmr7/Lz2Vug="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg="; }; nativeBuildInputs = [ setuptools-scm ]; From 44925be96f6918c24f9d93f7473254df1e5010e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 118/673] python3Packages.coincurve: 17.0.0 -> 18.0.0 --- pkgs/development/python-modules/coincurve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 5d259f250b5f..9ffe55d15fd0 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coincurve"; - version = "17.0.0"; + version = "18.0.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ofek"; repo = "coincurve"; - rev = "v${version}"; - sha256 = "sha256-7H4/TDxteuMTrj1PdfpA5rc7CegJAOjqn1PteImfGiQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Z5g6ten8wNICoFu7+aZc6r8ET+RDmFeb93ONjsTzcbw="; }; postPatch = '' From 0696f995ae509848a45922c9ee782157093f8d5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:02 +0100 Subject: [PATCH 119/673] python3Packages.colorcet: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/colorcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 33e7942dfc89..dd675373efa6 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "colorcet"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db"; + sha256 = "sha256-UUVaIDU9EvrJH5U3cthAnyR05qDbGvP6T3AF9AWiSAs="; }; propagatedBuildInputs = [ From 7f80647bb138299c143f152f700a2fc5c6b4c558 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 120/673] python3Packages.coverage: 6.4.4 -> 7.0.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 b96929640806..7c4b4525c8a1 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 = "6.4.4"; + version = "7.0.1"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4WxFtyast4Dh5viLKG08ELORSrA0OPMhF8SqUtfzDVg="; + sha256 = "sha256-pKV0oZ7rZ1daUyildgu7tzf6poVhZYap+dpCgflAEJw="; }; # No tests in archive From 504f11676d85b1db74b4d4beed9ea4e349f4ca22 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 121/673] python3Packages.crate: 0.28.0 -> 0.29.0 --- pkgs/development/python-modules/crate/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 228f3bfd63cd..c81f2c733a9f 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -6,17 +6,18 @@ , isPy3k , sqlalchemy , pytestCheckHook +, pytz , stdenv }: buildPythonPackage rec { pname = "crate"; - version = "0.28.0"; + version = "0.29.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-lEELJKIjm4509x9d6n9ee4k81gGmLhy7vliAbZykIpA="; + sha256 = "sha256-SywW/b4DnVeSzzRiHbDaKTjcuwDnkwrK6vFfaQVIZhQ="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + pytz ]; disabledTests = [ From 0aeb39115ff074c013947acd1433be4eb5f4fb99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 122/673] python3Packages.crccheck: 1.1 -> 1.3.0 --- .../python-modules/crccheck/default.nix | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index a75a0c9611b4..0b2f51c551af 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -1,25 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, unittestCheckHook +}: let pname = "crccheck"; - version = "1.1"; + version = "1.3.0"; in buildPythonPackage { inherit pname version; - - checkInputs = [ nose ]; - - src = fetchPypi { - inherit pname version; - sha256 = "45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96"; - }; + format = "setuptools"; disabled = !isPy3k; + src = fetchFromGitHub { + owner = "MartinScharrer"; + repo = "crccheck"; + rev = "refs/tags/v${version}"; + hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k="; + }; + + checkInputs = [ + unittestCheckHook + ]; + meta = with lib; { description = "Python library for CRCs and checksums"; - homepage = "https://sourceforge.net/projects/crccheck/"; - license = licenses.gpl3Plus; + homepage = "https://github.com/MartinScharrer/crccheck"; + license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; From 3f4351acca24301016a72f73a4349abb91ed4fd3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 123/673] python3Packages.croniter: 1.3.7 -> 1.3.8 --- pkgs/development/python-modules/croniter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 559af64fe83e..6b38e0c02dc7 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.3.7"; + version = "1.3.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-cu940PgzfrNTk7iJPr+/vrNA8tKuR+DS14Ew40sN2Lk="; + hash = "sha256-MqXsBOl+wIN7zfATdnq9LnHM7u/TwuFMgECYzlGtbNk="; }; propagatedBuildInputs = [ From bc31c7fd049af3c9c38e86101864cb258135b33c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 124/673] python3Packages.cssselect2: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 5904f80ac2a2..bb9c16ae744d 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W11t6oGl6wyco58RbIV43UE3eAYMlMH1EZY3FhiQkyU="; + sha256 = "sha256-HM2YTauJ/GiVUEOspOGwPgzynK2YgPbijjunp0sUqlo="; }; postPatch = '' From 889618204d89c690906b82e105278323512da345 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 125/673] python3Packages.cupy: 11.2.0 -> 11.4.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 9bc7efafff54..5af0f0813043 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "11.2.0"; + version = "11.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-wzNh8RejR6Y/aZbql0RtF/HAOPGh9TPlAkZCNQdpI+I="; + sha256 = "sha256-A9UrJibgKjorRtcUwc0D5wLI/jORX8ym7Y3lxTmWT0k="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both From ebbaab656c96aad2f8358655ef1e6fd236949395 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 126/673] python3Packages.cvxpy: 1.2.1 -> 1.2.3 --- pkgs/development/python-modules/cvxpy/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index da5f16d7f32d..89b66127636d 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -17,16 +17,21 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.2.1"; + version = "1.2.3"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bWdkJkPR3bLyr1m0Zrh9QsSi42eDGte0PDO1nu+ltQ4="; + hash = "sha256-IaeUtv0vdgqddm1o++SUZTT2Xom3Pom4icVQOYVVi4Y="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools <= 64.0.2" "setuptools" + ''; + propagatedBuildInputs = [ cvxopt ecos From 5c1ebe5499391cdaca9b4d8f326decc734cc8a8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 127/673] python3Packages.cwcwidth: 0.1.7 -> 0.1.8 --- pkgs/development/python-modules/cwcwidth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index fc57df26230a..99be1ee674c1 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.7"; + version = "0.1.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wNZH4S46SxWogeHYT3lpN1FmSEieARJXI33CF51rGVE="; + sha256 = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y="; }; nativeBuildInputs = [ cython setuptools ]; From 611dd9d7e90b013ac42f4db4668fd2b617df8167 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:03 +0100 Subject: [PATCH 128/673] python3Packages.cx-freeze: 6.11.1 -> 6.13.1 --- 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 cb4f7e074ffa..c039222925e4 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.11.1"; + version = "6.13.1"; src = fetchPypi { pname = "cx_Freeze"; inherit version; - sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw="; + sha256 = "sha256-9pT1Ta8pLpc9krFN8KLp3b10IGyvMjiaU3Cn4eVAiaQ="; }; disabled = pythonOlder "3.5"; From 11d47b76c237d5dc6a44bd295d421f889557912e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 129/673] python3Packages.cymem: 2.0.6 -> 2.0.7 --- .../python-modules/cymem/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index f01011156273..6292bf259ef4 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -7,25 +7,34 @@ buildPythonPackage rec { pname = "cymem"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; - rev = "v${version}"; - sha256 = "sha256-o+44v6wvE9HxeQaDDQ0+gi7z1V7jtkZvWglY8UyVHLg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck="; }; propagatedBuildInputs = [ cython ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; preCheck = '' - cd cymem + TEMPDIR=$(mktemp -d) + cp -R cymem/tests $TEMPDIR/ + pushd $TEMPDIR ''; + postCheck = '' + popd + ''; + + meta = with lib; { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; From 14d2b144facda75ea7275d295ba618ed8707eefa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 130/673] python3Packages.cytoolz: 0.12.0 -> 0.12.1 --- 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 42305b455799..85b8c7a11e07 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.0"; + version = "0.12.1"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-wQWwX4XgP7zWAkQ3WWjmLkT+eYwVo1Mcki1TEBjSJBI="; + sha256 = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4="; }; nativeBuildInputs = [ cython ]; From 6ad9cb0b5f4645a45eee094721de30b547021218 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 131/673] python3Packages.dasbus: 1.6 -> 1.7 --- pkgs/development/python-modules/dasbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index 96a4eccbc582..14c2ef9223ec 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dasbus"; - version = "1.6"; + version = "1.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0="; + hash = "sha256-qIUNhBrf6O5fe7n4LPRJq5tJUNwGM4lwcXGODQA2tvY="; }; propagatedBuildInputs = [ pygobject3 ]; From bd9eec19bb49959263bb414f3a1c3699a0e8095b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 132/673] python3Packages.dash: 2.6.2 -> 2.7.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 232cfb0b7f7d..6933af850a54 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.6.2"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d2p3ahOqBA4n8XhMR6juluEGNM5EyT+GQFlDcuHZMqs="; + hash = "sha256-kxat6CjX4xPEtlhRiYJF5wN2Luds7DduZyiUA9/kKWY="; }; propagatedBuildInputs = [ From 26fe500203e3c99fc54a4153bfa8d51ff6beada3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 133/673] python3Packages.databricks-connect: 10.4.12 -> 10.4.18 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 92bbb9f54db2..fa90f3d72fa1 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "10.4.12"; + version = "10.4.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T5KGJQryiE2+x9u+AcvTm6dLpU3kh20sCu0CTwpeJao="; + sha256 = "sha256-7lP9pn05EaGLZpaAp+oeed4yLhIjo6/wQg+lDpt1Hwg="; }; sourceRoot = "."; From 549c3904afc16ca351c0a721ff6f83e0d380a610 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 134/673] python3Packages.databricks-sql-connector: 2.0.5 -> 2.2.1 --- .../python-modules/databricks-sql-connector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index b9f5561ebe60..d5a765da18bc 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.0.5"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; - rev = "v${version}"; - sha256 = "sha256-Qpdyn6z1mbO4bzyUZ2eYdd9pfIkIP/Aj4YgNXaYwxpE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EMLUXGeVGIXFeaMvaJ+crivRZtOt7W/LCycIO2gwqXA="; }; postPatch = '' From a3f4dea6fab5e76bdfafa66c68ba37ea6ecef31e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 135/673] python3Packages.dateparser: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/dateparser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 950afaabb8dc..e43e8806d655 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.4"; + version = "1.1.5"; disabled = pythonOlder "3.7"; @@ -30,8 +30,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scrapinghub"; repo = "dateparser"; - rev = "v${version}"; - sha256 = "sha256-r13WNI+T2NtTwjnGOqX3ZOqPhvr8fBdXGULW7IXszlo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-uA49pRlmSWWIOjXa1QDjjuTGMKi25GfokQo4VQsBMlc="; }; propagatedBuildInputs = [ From a8c2c310749dfb00f23aad94c2993619b01724cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:04 +0100 Subject: [PATCH 136/673] python3Packages.dbf: 0.99.2 -> 0.99.3 --- pkgs/development/python-modules/dbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 6c85d0def6e8..10cf43f4f648 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.2"; + version = "0.99.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; + hash = "sha256-lAJypyrCfRah22mq/vggaEASzDVT/+mHXVzS46nLadw="; }; propagatedBuildInputs = [ From c99d4562c87c80231aeabcb7a604a578208a2bcc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 137/673] python3Packages.dbus-fast: 1.82.0 -> 1.83.1 --- pkgs/development/python-modules/dbus-fast/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index f53a895141e1..5bb53995c0ff 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.82.0"; + version = "1.83.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-mJJElYWTN09zVkx36GqPoILdALAo+fO2JlX4n0dmQ5M="; + rev = "refs/tags/v${version}"; + hash = "sha256-hfO4dbMA6efQPwP0Bp/5IDb7mLHf1NuTuiJjhHivG6I="; }; nativeBuildInputs = [ From 3f02987f098b132bcecadfd07afab29d0def2401 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 138/673] python3Packages.deepmerge: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/deepmerge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index 148599fe1666..2c685abf8066 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "deepmerge"; - version = "1.0.1"; + version = "1.1.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S0R3ntPS+3kbsYH8JoNCNJb+pCirt683/rIyht5/Cho="; + sha256 = "sha256-TCeg213iheGnzqx9vBUx3qpVa2J96kkAyCRFgezf6i0="; }; nativeBuildInputs = [ From c6842afc66569e04fe55b51fb285662b9cfc9349 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 139/673] python3Packages.devpi-common: 3.7.0 -> 3.7.1 --- pkgs/development/python-modules/devpi-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 21beec5b440e..4f3cc587fdc5 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM="; + sha256 = "sha256-Y4LSWo6sbHn239qSdQjwfZO4cyNyoGFQVVGvZbRgYfQ="; }; postPatch = '' From 8eebf3de300c22f65c54760e917580fdf85677cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 140/673] python3Packages.diagrams: 0.22.0 -> 0.23.1 --- pkgs/development/python-modules/diagrams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index 49fd55545178..46c4a8928a54 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.22.0"; + version = "0.23.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mingrammer"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-LUuClvBJeOxtrg+S+lYLpP7T1RXCy5dNjFYQO3H54QE="; + sha256 = "sha256-gVUlP3offTgHUBTTIzTBf7b2NpBjGlAHYQQxe6ks0v8="; }; postPatch = '' From 2173e845d1702b0a04fdbcd72d043c39a365ebc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 141/673] python3Packages.dictpath: 0.1.3 -> 0.4.3 --- pkgs/development/python-modules/dictpath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix index 5a648f7898f5..d6effb6291d6 100644 --- a/pkgs/development/python-modules/dictpath/default.nix +++ b/pkgs/development/python-modules/dictpath/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "dictpath"; - version = "0.1.3"; + version = "0.4.3"; src = fetchFromGitHub { owner = "p1c2u"; repo = "dictpath"; - rev = version; - sha256 = "0314i8wky2z83a66zggc53m8qa1rjgkrznrl2ixsgiq0prcn6v16"; + rev = "refs/tags/${version}"; + sha256 = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew="; }; postPatch = '' From b481c6cd13d4d677321d08de8149465bd0d7b056 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 142/673] python3Packages.dicttoxml: 1.7.4 -> 1.7.16 --- pkgs/development/python-modules/dicttoxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix index 9e24784731cf..c4fd5880526a 100644 --- a/pkgs/development/python-modules/dicttoxml/default.nix +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dicttoxml"; - version = "1.7.4"; + version = "1.7.16"; src = fetchPypi { inherit pname version; - sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45"; + sha256 = "sha256-bzbOZEiB21zYlAvum3yz8/a3sye6imfYPT4sqgU4v50="; }; # No tests in archive From ff6f18ab0ced8d2d03e920d28cff790ed034a9e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 143/673] python3Packages.dirty-equals: 0.4 -> 0.5.0 --- .../python-modules/dirty-equals/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index 0a448b8de7f8..b33591e8d0f9 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , pytestCheckHook , pythonOlder , pytz @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dirty-equals"; - version = "0.4"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,17 +18,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; - rev = "v${version}"; - hash = "sha256-rh7N/VRx4sv/MhhGPkaYCn2d19Sv5er2CkG6/fJuXX4="; + rev = "refs/tags/v${version}"; + hash = "sha256-yYptO6NPhQRlF0T2eXliw2WBms9uqTZVzdYzGj9pCug="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ pytz - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; From b3f3622d95b38144e682f4eeb554c2f0459ac32d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 144/673] python3Packages.distributed: 2022.10.2 -> 2022.12.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 6b7f535e5152..ad069f589271 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.10.2"; + version = "2022.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-U/Clv276uaWrM0XNkT9tPz1OpETuLtvqMxx/75b9Z9A="; + hash = "sha256-h/7c+/ISbRTDhlyORFxB7Mq9Kwfq/4dSivKv2eIM7Ww="; }; postPatch = '' From bd4551da8a0c937a3d63c5bab543fd8b63be026a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:05 +0100 Subject: [PATCH 145/673] python3Packages.distro: 1.7.0 -> 1.8.0 --- .../development/python-modules/distro/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index deee452ae1b4..73ded7625dca 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,14 +1,23 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +}: buildPythonPackage rec { pname = "distro"; - version = "1.7.0"; + version = "1.8.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk="; + hash = "sha256-AuER0dxqUKu47ta/McPkjtiwgw0eoqG3jGF2XCUT/dg="; }; + nativeBuildInputs = [ + setuptools + ]; + # tests are very targeted at individual linux distributions doCheck = false; From 94a430b4ab8e27862aaf10368dcc4ac18e3e44ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 146/673] python3Packages.django-anymail: 8.6 -> 9.0 --- 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 7936df01bd01..aca3c6735c07 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 = "8.6"; + version = "9.0"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hLNILUV7qzqHfh7l3SJAoFveUIRSCHTjEQ3ZC3PhZUY="; + sha256 = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; }; propagatedBuildInputs = [ From 9e55d2e1d6e7951cd97fefb64951626f6402c044 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 147/673] python3Packages.django-debug-toolbar: 3.7 -> 3.8.1 --- .../python-modules/django-debug-toolbar/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index bc54eadde8f7..22b7c8caf752 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -3,6 +3,7 @@ , pythonOlder , buildPythonPackage , python +, hatchling , django , jinja2 , sqlparse @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.7"; - format = "setuptools"; + version = "3.8.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LGEx21m5TNotbwKHf5in+EDkYqqNOoF7mBstnfLYe9s="; + hash = "sha256-GlEw25wem8iwwm3rYLk6TFEAIzC1pYjpSHdAkHwtFcE="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ django jinja2 From 93bc4d366a238eae1d4f60cf154651d5dd9ade55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 148/673] python3Packages.django-health-check: 3.16.5 -> 3.17.0 --- .../python-modules/django-health-check/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 6f38ae77e16a..65fea1786943 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-health-check"; - version = "3.16.5"; + version = "3.17.0"; src = fetchFromGitHub { owner = "KristianOellegaard"; repo = pname; - rev = version; - hash = "sha256-Jfzi+o4ja2sNCSPfX9eRq3WGid1gcfehhayAD1L4f2U="; + rev = "refs/tags/${version}"; + hash = "sha256-f87dgB2pDc+A0h41FX13qTj6Zzw5I4QwsDoC6yPkvAE="; leaveDotGit = true; }; From 7fe3c211e8eb6177fbc0582c1ea077fb71f1d199 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 149/673] python3Packages.django-mailman3: 1.3.7 -> 1.3.8 --- pkgs/development/python-modules/django-mailman3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 9486764e2783..081b6bbbcb7e 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.7"; + version = "1.3.8"; src = fetchPypi { inherit pname version; - sha256 = "6ea8c24c13e7afe744f18e18e4d19d0e74223e0d9bd5d782deea85dcb865feb7"; + sha256 = "sha256-C3ZyiQZ50JFg2e+HS0oIJFK+dV8TcDYehVh875zBRFU="; }; propagatedBuildInputs = [ From 1104c3bda53e8753a6a6d9db5679d95e51233d2d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 150/673] python3Packages.django-maintenance-mode: 0.17.1 -> 0.18.0 --- .../python-modules/django-maintenance-mode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index d22ae9025f8b..558f0c103388 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-maintenance-mode"; - version = "0.17.1"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/JMdElJsl7f6THUIvp28XcsoP/5Sa31XzGl3PZFPAH8="; + hash = "sha256-Mcj8O20hCINGf5T3PCG9jq0onSrm4R+Ke5CLMqMDmuU="; }; propagatedBuildInputs = [ From 2d7acf7ea7c6b2f54a551b9137163d3767d01ab0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 151/673] python3Packages.djangorestframework-dataclasses: 1.1.1 -> 1.2.0 --- .../djangorestframework-dataclasses/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index c6b56651f927..4242c24c90bf 100644 --- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -2,19 +2,25 @@ , buildPythonPackage , fetchFromGitHub , djangorestframework +, setuptools }: buildPythonPackage rec { pname = "djangorestframework-dataclasses"; - version = "1.1.1"; + version = "1.2.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; - rev = "v${version}"; - sha256 = "sha256-wXgA/4Dik6yG0nKl9GbrHgb2lhrPsgS23+cEyaD9MRY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; }; + nativeBuildInputs = [ + setuptools + ]; + postPatch = '' patchShebangs manage.py ''; From 23d19c155db102daae6b3586150739d1ecd220fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 152/673] python3Packages.django-rq: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/django-rq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index ebdbd916ef1d..d0894177c3f9 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4oc3zco/j4lnAiooW87rU6xkzGSGCj3fIyikjiKQNZk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Na/GeQc74LCoi7Dp3HcSnmUaLi1EjyYYgZTcFyzqOQM="; }; propagatedBuildInputs = [ From 7dc7b648b9dc22c3809e1f47d45ffd2c090a9856 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:06 +0100 Subject: [PATCH 153/673] python3Packages.django-stubs: 1.12.0 -> 1.13.1 --- 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 a03ed9aae01a..0ecb78f47546 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "1.12.0"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6os10NpJ97LumaeRJfGUPgM0Md0RRybWZDzDXeYZIw4="; + sha256 = "sha256-vMYYujU9q8VA2YK52sHVoZIWUvj8KhNlPVRaV9XjzA8="; }; propagatedBuildInputs = [ From 739f9ec459f46847096fbd9b9e437b325ac3d231 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 154/673] python3Packages.django-webpack-loader: 1.7.0 -> 1.8.0 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 67d6035696ed..7b5b6c67cff4 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; + hash = "sha256-puZ5gF6WB7Bz7lJwLZtCa6waVGCdlmExqkNMeGAqwFA="; }; propagatedBuildInputs = [ From 7dfcfa450083b8df50309b79ac7aaadc1b7456bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 155/673] python3Packages.dm-env: 1.5 -> 1.6 --- pkgs/development/python-modules/dm-env/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dm-env/default.nix b/pkgs/development/python-modules/dm-env/default.nix index 92c234c215c3..37e645c1ec35 100644 --- a/pkgs/development/python-modules/dm-env/default.nix +++ b/pkgs/development/python-modules/dm-env/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "dm-env"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pv2ZsGUlY1mVB8QV1ItRiWyIvi8BwrYlCvi6tRVx41M="; + sha256 = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94="; }; buildInputs = [ From ecf75d8102b0235a4b66ec40e0b900fc1ea0936a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 156/673] python3Packages.dm-haiku: 0.0.7 -> 0.0.9 --- pkgs/development/python-modules/dm-haiku/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 87de983330c2..c756ff67a138 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "v${version}"; - hash = "sha256-Qa3g3vOPZJt/wBjjuZHAcFUz/gwN/yvirV/8V9CnIko="; + rev = "refs/tags/v${version}"; + hash = "sha256-d5THbfMRrbBL/2sQ99l2yeaTI9gT+bSkcxmVdRJT5bA="; }; outputs = [ From 47842ee610638751854dabf2267809e8a383951a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 157/673] python3Packages.dm-tree: 0.1.7 -> 0.1.8 --- pkgs/development/python-modules/dm-tree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 1b9437096648..837895dcd8ca 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "dm-tree"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "deepmind"; repo = "tree"; - rev = version; - hash = "sha256-rg6dcGcbTGfK3h4WAyhwCjgM3o64Jj2SImxNsZXJHHM="; + rev = "refs/tags/${version}"; + hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc="; }; patches = [ From 0d884bf03f18c05c0f7e9eb01cd7b2b1fc1cbe31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 158/673] python3Packages.docplex: 2.23.222 -> 2.24.232 --- pkgs/development/python-modules/docplex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 5f64ee3a6fe7..3a7c5f74a439 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.23.222"; + version = "2.24.232"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4="; + sha256 = "sha256-Mo4Ih/2ltIonP37BDyCi0fY2bkPt2ij1F0A1Ws1sF1g="; }; propagatedBuildInputs = [ From be4701a19789dfb2eb47f08cb85c2a2078c0f7d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 159/673] python3Packages.dpath: 2.0.6 -> 2.1.3 --- pkgs/development/python-modules/dpath/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index b6f0176dd737..acc8d75e000e 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -4,26 +4,26 @@ , hypothesis , isPy27 , mock -, nose +, nose2 , pytestCheckHook }: buildPythonPackage rec { pname = "dpath"; - version = "2.0.6"; + version = "2.1.3"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-Wh3a5SIz+8jvgbFfuFBzqBEmu0NpjT86G2qvVhpGzcA="; + sha256 = "sha256-0aeg5kJ9CkFWx5LILK8fAQlgP2is55LjbKRZb9LLjZ0="; }; # use pytest as nosetests hangs checkInputs = [ hypothesis mock - nose + nose2 pytestCheckHook ]; From 700bba8df45012024bb8dcd4ff1cdaa53204623a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 160/673] python3Packages.drf-writable-nested: 0.6.4 -> 0.7.0 --- .../python-modules/drf-writable-nested/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix index 77ce7d37ff8d..eaf5aa1b9e1f 100644 --- a/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "drf-writable-nested"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "beda-software"; repo = "drf-writable-nested"; - rev = "v${version}"; - sha256 = "sha256-RybtXZ5HipQHaA2RV6TOKIpl6aI9V49mqXDhCH6lg58="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk="; }; propagatedBuildInputs = [ From a05f69498ff324feffb2b1b15999383113205f2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 161/673] python3Packages.drms: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/drms/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index a081a7445c4a..8595c8c1cadd 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drms"; - version = "0.6.2"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; + sha256 = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw="; }; nativeBuildInputs = [ @@ -38,6 +38,14 @@ buildPythonPackage rec { pytest-doctestplus ]; + disabledTests = [ + "test_query_hexadecimal_strings" + ]; + + disabledTestPaths = [ + "docs/tutorial.rst" + ]; + pythonImportsCheck = [ "drms" ]; meta = with lib; { From 2b1ff45e540b178c6b3e6c9972ab6f0b1cb38e5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:07 +0100 Subject: [PATCH 162/673] python3Packages.dropbox: 11.35.0 -> 11.36.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 125e61a89d28..6355ed16b9bd 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.35.0"; + version = "11.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vrOqsRe2sBsL5CIfGCmoO3geE9G0FJl88HRcP6FzZe0="; + hash = "sha256-J2AaGkD4TMDcVzTtdcNH0bgy6de+BRjYdtTaRL3lYrs="; }; propagatedBuildInputs = [ From 646aab034012c2d9c0d19afb58fde3eeadc669da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 163/673] python3Packages.dsmr-parser: 0.34 -> 1.0.0 --- pkgs/development/python-modules/dsmr-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 883ea432cd22..16d85a93b0cb 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.34"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ndokter"; repo = "dsmr_parser"; - rev = "v${version}"; - sha256 = "sha256-GO+lSgTmFgi/ljt99mteoot+p5BJnGb6ZFky5I3I6Io="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UjwrlNPnv/iBFiX65tcOZjkdC7gZsJzxxCtPdYTdl6Q="; }; propagatedBuildInputs = [ From b5a492ed580aca15ef529cd57c3d5f238763e8ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 164/673] python3Packages.dunamai: 1.13.1 -> 1.15.0 --- pkgs/development/python-modules/dunamai/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 65a9f4b0dcb0..e8866b7a1d73 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -7,11 +7,12 @@ , packaging , pytestCheckHook , setuptools +, git }: buildPythonPackage rec { pname = "dunamai"; - version = "1.13.1"; + version = "1.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UoqVfRdwOgxNLY17+dPgYO1GIPw3ZUwE/tiVzHjBxcY="; + sha256 = "sha256-dqMI51UHbkyfkxAPojRlS6qew2Ob4LbUkYua6zmcQgc="; }; nativeBuildInputs = [ @@ -36,9 +37,14 @@ buildPythonPackage rec { # needs to be able to run dunami from PATH preCheck = '' export PATH=$PATH:$out/bin + export HOME=$(mktemp -d) + + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" ''; checkInputs = [ + git pytestCheckHook setuptools ]; From 5fe30da12b520ff7aa3390b1816a94823961475e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 165/673] python3Packages.dvc-data: 0.1.13 -> 0.28.4 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index f5fc366c5f58..db7a8fe62fc1 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.1.13"; + version = "0.28.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA="; + hash = "sha256-ocwOIhguH460+HJ0sE5Wj+KOiyG4NprJ+QaO+YtfTGU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 777d2dd69b557b78a7411eb44b0b42429a4bd7c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 166/673] python3Packages.dvclive: 0.10.0 -> 1.3.0 --- pkgs/development/python-modules/dvclive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 1507156112d1..ffa8d68e0bdd 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "0.10.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8="; + hash = "sha256-FAupTvaOLPp5EQ0vvE8tQCa8WnKW/qrQTc7i+6F7F1A="; }; nativeBuildInputs = [ From 38b979a0feebf54b33ac8141e1a7ccd15c5ac5d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 167/673] python3Packages.dvc-objects: 0.1.7 -> 0.14.0 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 7e6a37a12d90..ec02d79b3ab8 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.1.7"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE="; + hash = "sha256-Refpekyr114mIGvbaAynxldA+s83EtALeLoTQO73b/M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1a160a5bf815eef58fd71cc3124a0aad462ef071 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 168/673] python3Packages.dvc-render: 0.0.9 -> 0.0.17 --- pkgs/development/python-modules/dvc-render/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 3b85d63e8bba..d8996ef8a4cb 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.9"; + version = "0.0.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZUIyNg+PTj5CWC65RqB1whnB+pUp1yNJQj43iSBcyvU="; + hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 6d524287e8300a769b9aaf76f1e90fe0b7d5804f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 169/673] python3Packages.dvc-task: 0.1.2 -> 0.1.9 --- pkgs/development/python-modules/dvc-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 6c9eb60c6c54..18cf6e572f8c 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.1.2"; + version = "0.1.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = pname; - rev = version; - hash = "sha256-LXjfFuLifgzU+3/EevycVCR7LhYBOoN6xg4YeNo5R4M="; + rev = "refs/tags/${version}"; + hash = "sha256-+v1M8bKcHWUTz4DJ85tB1qdFYKI0k8TS/Dvf166o920="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 8fd0f69906aa586f315cb2992b337172219d38e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 170/673] python3Packages.edalize: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/edalize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 4e220ba64667..796213693286 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "olofk"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-fpUNCxW7+uymodJ/yGME9VNcCEZdBROIdT1+blpgkzA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-h6b0mdAUR4NsN2SpnLu5OgS9Fy9ZRitG+5Sbon1jlUM="; }; postPatch = '' From 19db939222513d55edd10e7572e5e8f356e71461 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:08 +0100 Subject: [PATCH 171/673] python3Packages.editdistance: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/editdistance/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index 41d4a5003424..a01a505dde83 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "editdistance"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "roy-ht"; repo = pname; - rev = "v${version}"; - hash = "sha256-c0TdH1nJAKrepatCSCTLaKsDv9NKruMQadCjclKGxBw="; + rev = "refs/tags/v${version}"; + hash = "sha256-42PEK2KhR7rZLfNX9T45V6on+5CoINfKvntz/YQBJco="; }; nativeBuildInputs = [ From cd3221b60d38beb5cabdb786a7ecfa1dc883ea73 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 172/673] python3Packages.einops: 0.4.1 -> 0.6.0 --- pkgs/development/python-modules/einops/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 44b380e10328..0e7f83f92ead 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "einops"; - version = "0.4.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arogozhnikov"; repo = pname; - rev = "v${version}"; - hash = "sha256-n4R4lcRimuOncisCTs2zJWPlqZ+W2yPkvkWAnx4R91s="; + rev = "refs/tags/v${version}"; + hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw="; }; checkInputs = [ From a5b9c971c9ed2b3824a165fc9427204ffc027d88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 173/673] python3Packages.elementpath: 2.5.3 -> 3.0.2 --- pkgs/development/python-modules/elementpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 95c201afc4cd..0aa5c6583784 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "2.5.3"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-+NCsWPt5yMXe+GR9nEBU7byYhKrH/6xghQioj9AOGm4="; + hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc="; }; # avoid circular dependency with xmlschema which directly depends on this From a5d76185996358cf2c67c7aa94e0d2d095e3e15d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 174/673] python3Packages.email-validator: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/email-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index cb553c4fd5f6..d94c9c7496bc 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "email-validator"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Avsqaev3LMoymU06y+u8MMv38ZI2cWk5tc/MkO+9oyA="; + sha256 = "sha256-mflUF2ZKYhCiQEoG+fKI+K266dukuSzG9cyg6gwBcTo="; }; propagatedBuildInputs = [ From 556c1666d5edd37d26f11b559d9a4bc36e2f3f1b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 175/673] python3Packages.ephem: 4.1.3 -> 4.1.4 --- pkgs/development/python-modules/ephem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index a5a87f908d4f..d5eac46926ca 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1.3"; + version = "4.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-f6GGhZgbpSjt1QQFKp1SEqCapb8VwRpzTtxqhuiotWo="; + sha256 = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A="; }; checkInputs = [ From 63d6b667e13fa2f5477015d9b8a720f06a14d9a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 176/673] python3Packages.etils: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/etils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index d40bf842fdb5..10f9b3517215 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0dWve9nHhKJzxOHsz6qP6speBIGghxe1MT+iMdoiqQM="; + hash = "sha256-SJED6eSZpWZ2XGBFjuFdGFzwBl8gYKTRamj49Gli7Q0="; }; nativeBuildInputs = [ From 5ccd2a636eadc0ad193264111c5f2a4a7e6a3952 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 177/673] python3Packages.etuples: 0.3.5 -> 0.3.8 --- pkgs/development/python-modules/etuples/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix index 5ad7696ae1cf..31a3c9198c7d 100644 --- a/pkgs/development/python-modules/etuples/default.nix +++ b/pkgs/development/python-modules/etuples/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "etuples"; - version = "0.3.5"; + version = "0.3.8"; src = fetchFromGitHub { owner = "pythological"; repo = "etuples"; - rev = "v${version}"; - sha256 = "sha256-gJNxrO2d/eF4t3bBlz/BwF+9eT1nKrVrTP3F6/dEN00="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wEgam2IoI3z75bN45/R9o+0JmL3g0YmtsuJ4TnZjhi8="; }; propagatedBuildInputs = [ From 48e55693481f59d5f6bdca6409c4b0b87d13f49b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 178/673] python3Packages.faker: 14.2.0 -> 15.3.4 --- 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 9b8e6f7574a1..16ce62cde8b9 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 = "14.2.0"; + version = "15.3.4"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-bbVuLEOit0JQ0cMy7yX+99wH3LbF+rUynde0RnuO17k="; + hash = "sha256-LVRDck9kDOB2WMqMqLvUDSa1iRTmPuxlSXJ4aapn4sw="; }; propagatedBuildInputs = [ From 1ef490720f127cb2569ccd3884ca551c2a328d74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 179/673] python3Packages.fake-useragent: 0.1.11 -> 1.1.1 --- .../python-modules/fake-useragent/default.nix | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 9b207a81c3c7..5c3db0e4d1ba 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -1,17 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, six, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, importlib-metadata +, importlib-resources +, setuptools +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "fake-useragent"; - version = "0.1.11"; + version = "1.1.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; + src = fetchFromGitHub { + owner = "fake-useragent"; + repo = "fake-useragent"; + rev = "refs/tags/${version}"; + hash = "sha256-MKVJM8bduvA03xzL954huoCge7enG2BJtxZEAvo6HIY="; }; - propagatedBuildInputs = [ six ]; + postPatch = '' + sed -i '/addopts/d' pytest.ini + ''; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Up to date simple useragent faker with real world database"; From a2b05741e7df90ebc82ba31ce56a81b1f602c6d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:09 +0100 Subject: [PATCH 180/673] python3Packages.falcon: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/falcon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 89d047e968aa..0ade6a2718ca 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -28,15 +28,15 @@ buildPythonPackage rec { pname = "falcon"; - version = "3.1.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "falconry"; repo = pname; - rev = version; - hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; + rev = "refs/tags/${version}"; + hash = "sha256-5Lhz4qI/x7yK9tqQg4CvYNug+fp9l6ErNGH1pVybZ6c="; }; nativeBuildInputs = [ From 2544c1dd6a8edc3ca07a667b0dd65a5750f83a9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:10 +0100 Subject: [PATCH 181/673] python3Packages.fastapi: 0.85.2 -> 0.88.0 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index f42188fb13ee..5cfdeb6f4e9a 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.85.2"; + version = "0.88.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j3Set+xWNcRqbn90DJOJQhMrJYI3msvWHlFvN1habP0="; + hash = "sha256-2rjKmQcehqkL5OnmtLRTvsyUSpK2aUgyE9VLvz+oWNw="; }; nativeBuildInputs = [ From f62358c7469d28c4b41ae2035bee759d853bd024 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:10 +0100 Subject: [PATCH 182/673] python3Packages.ffmpeg-progress-yield: 0.3.0 -> 0.6.1 --- .../ffmpeg-progress-yield/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index b5880a21b70e..13e2055cd70d 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -5,20 +5,27 @@ , tqdm , pytestCheckHook , ffmpeg +, procps }: buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.3.0"; + version = "0.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/FkVzssJZYafn3MlN8bODd7kA917x9oW0JivIOWxl+8="; + hash = "sha256-JLwvJcYcSe5Z7In34pQqHptd8TCrXJeJ6zPiGGv4T14="; }; propagatedBuildInputs = [ colorama tqdm ]; - checkInputs = [ pytestCheckHook ffmpeg ]; + checkInputs = [ pytestCheckHook ffmpeg procps ]; + + disabledTests = [ + "test_quit" + "test_quit_gracefully" + ]; pytestFlagsArray = [ "test/test.py" ]; From bb90ae6dad80fcc9f9d93acee6df86c332c31857 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:10 +0100 Subject: [PATCH 183/673] python3Packages.flake8-future-import: 0.4.6 -> 0.4.7 --- .../python-modules/flake8-future-import/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 699d37770a36..91bab299743e 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "flake8-future-import"; - version = "0.4.6"; + version = "0.4.7"; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { owner = "xZise"; repo = "flake8-future-import"; - rev = version; - sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; + rev = "refs/tags/${version}"; + sha256 = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0="; }; patches = lib.optionals (pythonAtLeast "3.10") [ From 84aa32858fd8e4f3dfd1831df99bcb6f1000d8ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:10 +0100 Subject: [PATCH 184/673] python3Packages.flake8-length: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/flake8-length/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index 6f82b8dd50be..ab8b5e77fa39 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "flake8-length"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6e3c068005b0b3b5c8345923fe3e9a107c980baa1354dd19d820018f87409427"; + sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; propagatedBuildInputs = [ From 46a2dfc094052eaec32f82b2eeea9bfc3f2fc2aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:10 +0100 Subject: [PATCH 185/673] python3Packages.Flask-SQLAlchemy: 2.5.1 -> 3.0.2 --- .../python-modules/flask-sqlalchemy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index c7cc7351e66e..fac30ca41558 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pdm-pep517 , flask , mock , sqlalchemy @@ -9,13 +10,18 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.5.1"; + version = "3.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; + hash = "sha256-FhmfWz3ftp4N8vUq5Mdq7b/sgjRiNJ2rshobLgorZek="; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = [ flask sqlalchemy From fe0048c7f8d869993b486b243dec94204bcf0c08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:10 +0100 Subject: [PATCH 186/673] python3Packages.flax: 0.6.1 -> 0.6.3 --- 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 d9171d14e41d..450f8066789e 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A="; + sha256 = "sha256-4BYfrwEddA2LCMyDO6PBBYdMVTqqDxhzMCZ5JIIml3g="; }; buildInputs = [ jaxlib ]; From b8e97ee5dbb2d9749abdf2a29024f05ecbcd3c00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:10 +0100 Subject: [PATCH 187/673] python3Packages.folium: 0.12.1.post1 -> 0.14.0 --- pkgs/development/python-modules/folium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 9b8f3c080bae..5ad86c3ef8b5 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "folium"; - version = "0.12.1.post1"; + version = "0.14.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "python-visualization"; repo = "folium"; - rev = "v${version}"; - sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; }; patches = [ From 0fd824805b521896b07fa80f30c37625c5a3aea1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:11 +0100 Subject: [PATCH 188/673] python3Packages.fontmake: 3.4.0 -> 3.5.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 87fc01f83df9..1d9c08a81c12 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.4.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/JTmYE078qAFcTVCumVvGj65LbnDsCIUsFfqVlihTk="; + sha256 = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; extension = "zip"; }; From 123abe7e207ed4535b2ebe43ad2d4f4738726ab5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:11 +0100 Subject: [PATCH 189/673] python3Packages.fontParts: 0.10.8 -> 0.11.0 --- pkgs/development/python-modules/fontparts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 6a595e29079e..403039b5f63d 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.8"; + version = "0.11.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LwEhvLqx3Vu1omc/QrGCptQD25Tbv9Ok5eTURL3hvEQ="; + sha256 = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg="; extension = "zip"; }; From a80621064228f8a822b5bf7bea41054b9dee68dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:11 +0100 Subject: [PATCH 190/673] python3Packages.fonttools: 4.34.4 -> 4.38.0 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index cfcabbddc289..f67f7e2f3280 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.34.4"; + version = "4.38.0"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-GwbcrDsfxs5qRQJozhK/+n3W3NlO39g7pzxL9iIiDfU="; + sha256 = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; }; nativeBuildInputs = [ setuptools-scm ]; From d0dbfc1c42891f5e7f007443ba658a445f52456c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:11 +0100 Subject: [PATCH 191/673] python3Packages.galois: 0.1.1 -> 0.3.2 --- pkgs/development/python-modules/galois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 3c0ba94d3ab4..f617078833c5 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.1.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ekbebwsdGkINdOFI+LLdwTRBN6d8mlNmftkj5SNRKNI="; + sha256 = "sha256-8YxC0QYZqgUIKlYLXnm5+tfojQOmOX63dD7cxBO+0Gg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 64fc420d491c006756b1ec0df7a07cc3ee9f016c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:11 +0100 Subject: [PATCH 192/673] python3Packages.gdown: 4.5.4 -> 4.6.0 --- pkgs/development/python-modules/gdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 09f7ca4c8560..c7ddc590d97d 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.5.4"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-av9n0esi+zpa7StFY3lKo1Bsct8IP4ax7EkyUnCcpo8="; + hash = "sha256-XOPbCu2lT0bKrLLfhvMcPj7NF8NVaJ5kVthftSi6l0k="; }; propagatedBuildInputs = [ From e1a63cb4ff5b9b4112387547375bc3485cefd9ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:11 +0100 Subject: [PATCH 193/673] python3Packages.gensim: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3a6fc0d254a9..ca594e747fc7 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; + hash = "sha256-ZL1+ximQIVh4gi6LJWnRg1BU9WzfU2AN3+mSfjHztI0="; }; nativeBuildInputs = [ From 5b203e9d1eb88b9c975a5b451a67263dc1580846 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:11 +0100 Subject: [PATCH 194/673] python3Packages.gevent: 21.12.0 -> 22.10.2 --- pkgs/development/python-modules/gevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 28a089296481..690c0b73e6ea 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gevent"; - version = "21.12.0"; + version = "22.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; + hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY="; }; nativeBuildInputs = [ From 355d70c1f7e40bf7ae7808970619d4e41c14d179 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:12 +0100 Subject: [PATCH 195/673] python3Packages.gitdb: 4.0.9 -> 4.0.10 --- pkgs/development/python-modules/gitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 0895270d6c9c..3528bb2bcab6 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.9"; + version = "4.0.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"; + sha256 = "sha256-brmQtp304VutiZ6oaNxGVyw/dTOXNWY7gd55sG8X65o="; }; propagatedBuildInputs = [ smmap ]; From 5c8fa3c9b82599b4854394c4f0662116148cade7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:12 +0100 Subject: [PATCH 196/673] python3Packages.glean-parser: 6.2.0 -> 6.4.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 8164d6099a45..706ce1523fe5 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 = "6.2.0"; + version = "6.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-PKUc1PYfM4MxDFErV4zYyHl/mkPQNvIcjNaDekenHc8="; + hash = "sha256-9+U9kRMkcQY0tjao6Pmi0STqh0xw0pFU0/xZXlawkKM="; }; postPatch = '' From c6819028898dff46016c7d40b2d86a6855598779 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:12 +0100 Subject: [PATCH 197/673] python3Packages.google-api-python-client: 2.61.0 -> 2.70.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 73f8310cc0d8..ba4388c25699 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.61.0"; + version = "2.70.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3goMt7sY6/9c99x4K0ikiKFL12hLU4eZ8xvtq33iuD8="; + sha256 = "sha256-Ji3glNWjDTN/WeZlgQGf7UW2mMB4OXrEjdMjwJaCNuc="; }; propagatedBuildInputs = [ From 1b9ee1965bcbc966efbc1acec74828864374a576 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:12 +0100 Subject: [PATCH 198/673] python3Packages.googleapis-common-protos: 1.56.4 -> 1.57.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 2c35387b124d..7ac264a649c6 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.56.4"; + version = "1.57.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wlhzxHJ5OHz9y9r6NhSYh5AdNiAstkWg5PKWhr9uRBc="; + sha256 = "sha256-J6hJ1iBYOPtsw8HCHLmABwemYbshxs5/sT6Z6x+KDEY="; }; propagatedBuildInputs = [ grpc protobuf ]; From 2ee57e76fddb3246380a8d6b2f65c41a11524101 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:12 +0100 Subject: [PATCH 199/673] python3Packages.google-auth-oauthlib: 0.7.0 -> 0.8.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 9f70702883a0..7fff0ba5b225 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 = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2xG85LPv/Jm1GOwiopA0cOCFPAySvldpTjaE5zjSJRM="; + sha256 = "sha256-gQVqMQ+xxKPlp+GkQ+Hrllk8a7xVsmwCYeTTKV0+ZZM="; }; propagatedBuildInputs = [ From 578ac814ce9893fafed73db9908d209dc5e030d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:13 +0100 Subject: [PATCH 200/673] python3Packages.google-cloud-automl: 2.8.3 -> 2.9.0 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index c9f5c994aae4..51fb6d04dcf6 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.8.3"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aMkYgmx4TDGSW2/0KB7FTNUHUxtTaVpmeDiIWq7Z5lc="; + hash = "sha256-8E+RvHHs4IK1RrbTtY8wwuBLNQKcDnb058vN6hKfy6Q="; }; propagatedBuildInputs = [ From 53068b18bb1ef6e2203bdc67fbcc5d80556e27c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:13 +0100 Subject: [PATCH 201/673] python3Packages.google-cloud-datastore: 2.9.0 -> 2.11.0 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 72b9d4efb80e..af1f15ffd076 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.9.0"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8/gmeLpdheW7M9nhM0uTlxrpeRcODSgLVOVKPj9O870="; + hash = "sha256-PSk6IYBfGL7g0FBCqUgT4T8k1IYprtLGQQQEybEO99o="; }; propagatedBuildInputs = [ From 60134e8c01ad178a9653748763ad638a0903f133 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:16 +0100 Subject: [PATCH 202/673] python3Packages.govee-ble: 0.19.3 -> 0.21.0 --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 7cee9b5713e7..abbac7610982 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.19.3"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HoEWFwpEzlTVlCD1sPOSKhvZleErxJdaqxKPv+1PcGo="; + hash = "sha256-BObJQTt1l+fFh02/zhcKRNRs0LQl+oJelMQq9EW2XuY="; }; nativeBuildInputs = [ From 7015a5c503b34ac36f6e9779b07cec5b2ed9fc35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:16 +0100 Subject: [PATCH 203/673] python3Packages.graspologic: 1.0.0 -> 2.0.1 --- pkgs/development/python-modules/graspologic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index f16ba5fc4c77..c1dde12b3e0b 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "graspologic"; - version = "1.0.0"; + version = "2.0.1"; disabled = isPy27; src = fetchFromGitHub { owner = "microsoft"; repo = "graspologic"; - rev = "v${version}"; - sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; }; propagatedBuildInputs = [ From f275e309904c9d8081195c3c5783ccc4c1666f4a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:16 +0100 Subject: [PATCH 204/673] python3Packages.greenlet: 1.1.3 -> 2.0.1 --- .../python-modules/greenlet/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 12f3044f0680..129243b79186 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , fetchPypi , isPyPy -, unittestCheckHook +, objgraph +, psutil +, pytestCheckHook }: buildPythonPackage rec { pname = "greenlet"; - version = "1.1.3"; + version = "2.0.1"; + format = "setuptools"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "sha256-vLbG3R1r5tONbbKDdH0H/aCJ/4xVmoNSNlYKRBA0BFU="; + hash = "sha256-QuYCVkRg2g6O5ny21yNjY+5eExqhWUO2Zw5E5cLtD2c="; }; - checkInputs = [ unittestCheckHook ]; + checkInputs = [ + objgraph + psutil + pytestCheckHook + ]; - unittestFlagsArray = [ "-v" "greenlet.tests" ]; + doCheck = false; # installed tests need to be executed, not sure how to accomplish that meta = with lib; { homepage = "https://github.com/python-greenlet/greenlet"; From 0b03cdb848f5ded8d5fc2d790ff7fb58b5dfb125 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:16 +0100 Subject: [PATCH 205/673] python3Packages.gssapi: 1.7.3 -> 1.8.2 --- pkgs/development/python-modules/gssapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 16c6eb513c6d..eab119f39ade 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.7.3"; + version = "1.8.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; }; # It's used to locate headers From 4d2b2dbe0c439fb2cca256c48c78029edf63cc25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:16 +0100 Subject: [PATCH 206/673] python3Packages.gtts: 2.2.4 -> 2.3.0 --- pkgs/development/python-modules/gtts/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 3e3fabddf319..3314b6114d71 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.2.4"; + version = "2.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; - rev = "v${version}"; - sha256 = "sha256-hQnFHi85Rifco0afLF8kKNOy9oPxKoupfmdm+fht6Cg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-dFNphsgf+0t3EPXO938TVncYcxL4EMOlznrfPR8SYhM="; }; propagatedBuildInputs = [ From 8ebc38328d466874e45b5bbbd5a4843dcee99a03 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:17 +0100 Subject: [PATCH 207/673] python3Packages.guessit: 3.4.3 -> 3.5.0 --- pkgs/development/python-modules/guessit/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 8b85a488512a..eff3d54d7210 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -6,6 +6,7 @@ , rebulk , pythonOlder , importlib-resources +, py , pytestCheckHook , pytest-mock , pytest-benchmark @@ -14,11 +15,12 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.4.3"; + version = "3.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "731e96e6a1f3b065d05accc8c19f35d4485d880b77ab8dc4b262cc353df294f7"; + hash = "sha256-eiaeOlfMBz5htWJZiT6rPFwC0a2Ky8iuLnjF6DnxELw="; }; propagatedBuildInputs = [ @@ -27,7 +29,7 @@ buildPythonPackage rec { python-dateutil ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkInputs = [ pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; + checkInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; pytestFlagsArray = [ "--benchmark-disable" ]; From 31914b44a24e23fa92757b9b9f5997eccf165339 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:17 +0100 Subject: [PATCH 208/673] python3Packages.hacking: 4.1.0 -> 5.0.0 --- pkgs/development/python-modules/hacking/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index faa967d0ce4f..050795185cfd 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -10,16 +10,15 @@ buildPythonPackage rec { pname = "hacking"; - version = "4.1.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m"; + sha256 = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "flake8<3.9.0,>=3.8.0" "flake8" + sed -i 's/flake8.*/flake8/' requirements.txt substituteInPlace hacking/checks/python23.py \ --replace 'H236: class Foo(object):\n __metaclass__ = \' 'Okay: class Foo(object):\n __metaclass__ = \' substituteInPlace hacking/checks/except_checks.py \ From 56281892c7a67ba5952242d1bfcfc1916ead915c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:17 +0100 Subject: [PATCH 209/673] python3Packages.hatch-nodejs-version: 0.3.0 -> 0.3.1 --- .../python-modules/hatch-nodejs-version/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix index 6095b696ad78..5c471111ab7e 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.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agoose77"; repo = "hatch-nodejs-version"; - rev = "v${version}"; - sha256 = "sha256-TBvqXjka8poQ8xxQ/H1hFYRLqnP1024uan1d9b95ags="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; }; propagatedBuildInputs = [ From cc5ec329ff861ae86f361ccf1d81f30ce7f60449 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:17 +0100 Subject: [PATCH 210/673] python3Packages.hatch-vcs: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/hatch-vcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index 4f5c1f9bf3e6..a8aaa70d63e4 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hatch-vcs"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_vcs"; inherit version; - sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8="; + sha256 = "sha256-zsUQfPzkgsZ/i8lvGLvDIMmqDQaBgOFK0xe77loVP+4="; }; nativeBuildInputs = [ From 4ef8de9675adda62c238ff75450d4e698bd9aa1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:17 +0100 Subject: [PATCH 211/673] python3Packages.hepunits: 2.2.1 -> 2.3.0 --- pkgs/development/python-modules/hepunits/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index c1af541def94..5224c84ab5ce 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -1,20 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm +, hatch-vcs +, hatchling , pytestCheckHook }: buildPythonPackage rec { pname = "hepunits"; - version = "2.2.1"; + version = "2.3.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YJfmlUekg73Az+TRBuRHteuofFUBBg0xLNnWGqniJBQ="; + hash = "sha256-M7mumot7OvNVFBp0kBy1qlV9zi5MmZKgow7wRDobIgY="; }; + nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; checkInputs = [ From 2bd9c1e736a4459f251b8da4d308cf978fa20ac2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:17 +0100 Subject: [PATCH 212/673] python3Packages.holoviews: 1.15.2 -> 1.15.3 --- pkgs/development/python-modules/holoviews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 6c5132027c5e..4f94ff771318 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.15.2"; + version = "1.15.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3sJBf2VACLHXtkWzHs9iHIvvkBaU5MTnJy7/0Yr6Nts="; + hash = "sha256-pFiRzSuPzUCHQs//81HJKPv0zx730fBEQsfYeG7o6ZQ="; }; propagatedBuildInputs = [ From 72de3806733b3ca349592c330be8085d2751c6d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 213/673] python3Packages.httpcore: 0.16.2 -> 0.16.3 --- pkgs/development/python-modules/httpcore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 61a3b8d73235..408bb8376559 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.16.2"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-bwGZ/B0jlvc1BmXVTo7gMP6PJIQuCHclkHjKQCgMsyU="; + rev = "refs/tags/${version}"; + hash = "sha256-3bC97CTZi6An+owjoJF7Irtr7ONbP8RtNdTIGJRy0Ng="; }; propagatedBuildInputs = [ From 66abd792712a5938053cb416d34eec57d9ba8732 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 214/673] python3Packages.huggingface-hub: 0.11.0 -> 0.11.1 --- 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 2e68555dc738..4d8f02020018 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-d+X4hGt4K6xmRFw8mevKpZ6RDv+U1PJ8WbmdKGDbVNs="; + hash = "sha256-sUo8B4IbFiIvqWx2UxT3TpHzi2Q2YNW1zrx1Squ2psQ="; }; propagatedBuildInputs = [ From 7c337d6d8c2a7b01bae9f6f8f406183e5a166a00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 215/673] python3Packages.hypothesmith: 0.2.0 -> 0.2.3 --- .../python-modules/hypothesmith/default.nix | 9 ++++++-- .../hypothesmith/remove-black.patch | 21 +++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 4bac9c0bb022..76977b770027 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.2.0"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; + sha256 = "sha256-vc6EXsmE5uP+0h5l0ugrjrxt5cpeuTZJ39dgNMWQakY="; }; patches = [ @@ -46,6 +46,11 @@ buildPythonPackage rec { "test_source_code_from_libcst_node_type" ]; + disabledTestPaths = [ + # missing blib2to3 + "tests/test_syntactic.py" + ]; + pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesmith/remove-black.patch b/pkgs/development/python-modules/hypothesmith/remove-black.patch index 565f350b06b4..d37222ef4b2c 100644 --- a/pkgs/development/python-modules/hypothesmith/remove-black.patch +++ b/pkgs/development/python-modules/hypothesmith/remove-black.patch @@ -1,5 +1,5 @@ diff --git a/tests/test_cst.py b/tests/test_cst.py -index c436183..bdba2d7 100644 +index 8532240..bdba2d7 100644 --- a/tests/test_cst.py +++ b/tests/test_cst.py @@ -3,7 +3,6 @@ import ast @@ -15,11 +15,11 @@ index c436183..bdba2d7 100644 -@pytest.mark.xfail --@example("A\u2592", black.FileMode()) +-@example("A\u2592", black.Mode()) -@given( - source_code=hypothesmith.from_node(), - mode=st.builds( -- black.FileMode, +- black.Mode, - line_length=st.just(88) | st.integers(0, 200), - string_normalization=st.booleans(), - is_pyi=st.booleans(), @@ -39,28 +39,27 @@ index c436183..bdba2d7 100644 def test_from_node_always_compilable(source_code): compile(source_code, "", "exec") diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py -index 7ea42e9..a77ac39 100644 +index 7fe9835..17c4f7c 100644 --- a/tests/test_syntactic.py +++ b/tests/test_syntactic.py -@@ -3,8 +3,6 @@ import ast +@@ -3,7 +3,6 @@ import ast import io import tokenize -import black --import blib2to3 + import blib2to3 import parso import pytest - from hypothesis import example, given, reject, strategies as st -@@ -58,34 +56,6 @@ def test_ast_unparse_from_grammar(source_code): +@@ -58,34 +57,6 @@ def test_ast_unparse_from_grammar(source_code): assert ast.dump(first) == ast.dump(second) --@example("\\", black.FileMode()) --@example("A#\r#", black.FileMode()) +-@example("\\", black.Mode()) +-@example("A#\r#", black.Mode()) -@given( - source_code=hypothesmith.from_grammar(), - mode=st.builds( -- black.FileMode, +- black.Mode, - line_length=st.just(88) | st.integers(0, 200), - string_normalization=st.booleans(), - is_pyi=st.booleans(), From d26402c2d9d623941cc6d294077de11d70ef21ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 216/673] python3Packages.icalendar: 4.1.0 -> 5.0.4 --- .../python-modules/icalendar/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 5ef8864417d4..cbf3b09a8cdc 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub +, pythonOlder +, backports-zoneinfo , python-dateutil , pytz +, hypothesis +, pytest }: buildPythonPackage rec { - version = "4.1.0"; + version = "5.0.4"; pname = "icalendar"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U="; + src = fetchFromGitHub { + owner = "collective"; + repo = "icalendar"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ch0i6hxEnHV/Xu4PqpRVt30KLOHHgtCAI2W9UyXo15E="; }; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ python-dateutil pytz ]; + propagatedBuildInputs = [ + python-dateutil + pytz + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + checkInputs = [ + hypothesis + pytest + ]; meta = with lib; { + changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst"; description = "A parser/generator of iCalendar files"; - homepage = "https://icalendar.readthedocs.org/"; + homepage = "https://github.com/collective/icalendar"; license = licenses.bsd2; maintainers = with maintainers; [ olcai ]; }; From 6e67852e21c8a86cd61be7fbe23c00aecce8ee43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 217/673] python3Packages.imbalanced-learn: 0.9.1 -> 0.10.1 --- pkgs/development/python-modules/imbalanced-learn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 8a53e856b330..f43908a61e0b 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.9.1"; + version = "0.10.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "sha256-ThT3rmB4tauEO3PDebKsULIHRGQV2cJDjIhdbLWv2WI="; + sha256 = "sha256-vHYJYZ7Dw4xEIpKSgjmtPRC13rCviinIOCK3tXsxn4s="; }; propagatedBuildInputs = [ scikit-learn ]; From 8a2703f13ad40c3e78155cceee1e5f2faa98bf0f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 218/673] python3Packages.iminuit: 2.17.0 -> 2.18.0 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 19c38ac3fbc8..5817b38ca0de 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.17.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dfSoorrSH9p7a9Qt98oEEg+yRjbr+bVm0lmybyBEsdA="; + hash = "sha256-fuLGoLzaxYGzj66NDzQ/3uVfkfH2psyWQ/z7zGwtw+Y="; }; nativeBuildInputs = [ From fcc12cfc8703ad53f7d95d8789c01ecfc3e5fe5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 219/673] python3Packages.importlib-metadata: 4.12.0 -> 5.2.0 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 9e4176a5b1ba..d9f03c521aca 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.12.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-Y3JFuLqytlAvy8dSzEt6b2JDuwKzHFwmFWrRA9PUVnA="; + hash = "sha256-QE1I1iu6C3p3/51AXv2RUBvvLmf/Ss4L7UCgzyjDx80="; }; nativeBuildInputs = [ From b3ab6bce236e6ba5f83588df7c1a0d7ea645a5da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 220/673] python3Packages.importlib-resources: 5.9.0 -> 5.10.2 --- .../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 124733568723..e8b6e0857e4c 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.9.0"; + version = "5.10.2"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-VIHpf7Ra+Nzy95iVJiVZHFj+WZ0HNdhrEPVN4IamFoE="; + sha256 = "sha256-5KlsjMAzlkf/ml4FUNnydvxaAf+idgErWOwQjP17hIQ="; }; nativeBuildInputs = [ From d7eb51ce3735d578fa23d4de23bcb2ca8e50e728 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:18 +0100 Subject: [PATCH 221/673] python3Packages.inflect: 6.0.0 -> 6.0.2 --- 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 6e64c946b980..ec8179ae6ae4 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.0"; + version = "6.0.2"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C8FRbsJyXi2CIXB6YSJFCTy28c6iCc/Yy9T8Xpb6Y2U="; + sha256 = "sha256-8aa8sBBQRviWGf3hp9BExhLGFMLYXvGCWC2dybhtMJo="; }; nativeBuildInputs = [ setuptools-scm ]; From 72dd0655e0d223ec80628d99456afd16a0f59e16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 222/673] python3Packages.influxdb-client: 1.34.0 -> 1.35.0 --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 079edcd121ff..b707887bc392 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.34.0"; + version = "1.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Bswlrfh9lBobZDA4Rt/02jMER5IrZ6b3ykpbklCFhUE="; + hash = "sha256-kewhNnbCmciywTkk/NTBqO02jN8IAW/MriH/DkhQkFU="; }; propagatedBuildInputs = [ From 00af8382784f9b3546cb9b0bce6a88a5fdb21df1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 223/673] python3Packages.inform: 1.26 -> 1.27 --- .../python-modules/inform/default.nix | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index aff0d77e7022..e9d6c3f1a930 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core , arrow , six , hypothesis @@ -7,28 +10,33 @@ buildPythonPackage rec { pname = "inform"; - version = "1.26"; + version = "1.27"; + format = "pyproject"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; - rev = "v${version}"; - sha256 = "0snrmvmc3rnz90cql5ayzs878rrkadk46rhvf2sn78nb0x57wa20"; + rev = "refs/tags/v${version}"; + hash = "sha256-SvE+UAGpUomUBHlH4aYZ1BYmLp3BherRjosKsIaOA/s="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner>=2.0" "" - ''; + nativeBuildInputs = [ + flit-core + ]; - propagatedBuildInputs = [ arrow six ]; + propagatedBuildInputs = [ + arrow + six + ]; - checkInputs = [ pytestCheckHook hypothesis ]; - preCheck = '' - patchShebangs test.doctests.py test.inform.py - ./test.doctests.py - ./test.inform.py - ''; + checkInputs = [ + pytestCheckHook + hypothesis + ]; + + disabledTests = [ + "test_prostrate" + ]; meta = with lib; { description = "Print and logging utilities"; From ea3cdcf04b5b2465ffb75971d1345883b4e989f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 224/673] python3Packages.inquirer: 2.9.2 -> 3.1.1 --- pkgs/development/python-modules/inquirer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 0fb7a2451210..8efdb1ab03b8 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "inquirer"; - version = "2.9.2"; + version = "3.1.1"; format = "pyproject"; src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; - rev = "v${version}"; - sha256 = "sha256-TQEZeZDl4N78dE7CXy5OwquUoHuxxjmDAC3wdxqydaQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gDJqD0IHshyGw9MmMtYjkkpvYklRLgPd6EtLVqi2I/o="; }; nativeBuildInputs = [ From aa9dc3af912bc49eb8db51bf0830df1f6dc90ae6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 225/673] python3Packages.inscriptis: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/inscriptis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index 2fa224b3f210..b22a402c9e93 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "inscriptis"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "weblyzard"; repo = "inscriptis"; - rev = version; - sha256 = "sha256-an/FTbujN2VnTYa0wngM8ugV1LNHJWM32RVqIbaW0KY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU="; }; propagatedBuildInputs = [ From 3698e05c69d198552f6fe71ea3519667ebdf4619 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 226/673] python3Packages.ipdb: 0.13.9 -> 0.13.11 --- .../python-modules/ipdb/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 363c8a4f5768..a3ec10d4b2b5 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -1,24 +1,41 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, decorator , ipython , isPyPy -, mock -, toml +, tomli +, setuptools +, unittestCheckHook }: buildPythonPackage rec { pname = "ipdb"; - version = "0.13.9"; + version = "0.13.11"; + format = "pyproject"; + disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5"; + hash = "sha256-wjtnNvAf1Fhswuy+vfeaXrRUeWhT4c2PLtO3uR1KPpM="; }; - propagatedBuildInputs = [ ipython toml ]; - checkInputs = [ mock ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ipython + decorator + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + checkInputs = [ + unittestCheckHook + ]; preCheck = '' export HOME=$(mktemp -d) From a94a4cb0e27f966749890e7d42e04917e1fb2824 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:06:38 +0100 Subject: [PATCH 227/673] python3Packages.comm: init at 0.1.2 --- .../python-modules/comm/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/comm/default.nix diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix new file mode 100644 index 000000000000..e047717c8d69 --- /dev/null +++ b/pkgs/development/python-modules/comm/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, traitlets +, pytestCheckHook +}: + +let + pname = "comm"; + version = "0.1.2"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ipython"; + repo = "comm"; + rev = "refs/tags/${version}"; + hash = "sha256-Ve6tCvu89P5wUOj+vlzXItRR5RjJNKxItKnWP2fVk9U="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + traitlets + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc"; + homepage = "https://github.com/ipython/comm"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53e16c92e15f..b8464e2994da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1917,6 +1917,8 @@ self: super: with self; { cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; + comm = callPackage ../development/python-modules/comm { }; + commandparse = callPackage ../development/python-modules/commandparse { }; commentjson = callPackage ../development/python-modules/commentjson { }; From 1682c4d69687b5cf0ad8cc1e47ba4c786285805a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 228/673] python3Packages.ipykernel: 6.15.3 -> 6.20.0 --- pkgs/development/python-modules/ipykernel/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 36bd9961903c..384391138daf 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -4,6 +4,7 @@ , fetchPypi , hatchling , pythonOlder +, comm , ipython , jupyter-client , packaging @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.15.3"; + version = "6.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uB1XsOFxZwhEvynNwRVisQENPahxFcRRPg7mYKg2h2U="; + sha256 = "sha256-ffr67GRTAHEMQUecCwvcE6nqZjm+5uOtBCdXZ06amik="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -34,6 +35,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + comm ipython jupyter-client packaging From f027a06ee5ebf1d68f476134620334e45b5fc7b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 229/673] python3Packages.ipyvue: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/ipyvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 6c0b15c41b37..77ed45ce4ccd 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.7.0"; + version = "1.8.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72"; + sha256 = "sha256-0qjvArC8xEr9MSecuAKMBr49fA60FYRyicAADy93N7c="; }; propagatedBuildInputs = [ ipywidgets ]; From b9d4c84c11265a0c0c0446ed816b6458f8a17f8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 230/673] python3Packages.ipywidgets: 8.0.2 -> 8.0.4 --- 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 b4689b207756..c3fc01390377 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.2"; + version = "8.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-CMt1xuCpaDYUfL/cVVgK4E0T4F0m/7w3e04caLqiix8="; + hash = "sha256-wABad6R9d4icr+2JK1jjO0oqlnEhVEBMZUjsIicoEeo="; }; propagatedBuildInputs = [ From e00e144141c8e37af0bd23e1bab53d563d0e84ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:19 +0100 Subject: [PATCH 231/673] python3Packages.isort: 5.11.2 -> 5.11.4 --- pkgs/development/python-modules/isort/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 799f21bbebe7..b4f1606a027d 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.11.2"; + version = "5.11.4"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; - rev = version; - sha256 = "sha256-4Du9vYI1srStWCTfZr4Rq3uH5c9cRtR8ZqihI36G6hA="; + rev = "refs/tags/${version}"; + sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I="; }; nativeBuildInputs = [ From 38fbc6460d56ed2b4dce0b5a5cef867d42700675 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 232/673] python3Packages.iterm2: 2.6 -> 2.7 --- pkgs/development/python-modules/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 96c8fcfb3c14..eff730e0ad8e 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "2.6"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rKvnr0C48mTkjbGyHhvNzgJ97p5mJ7F4wU8ZMPYV/rM="; + sha256 = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA="; }; propagatedBuildInputs = [ protobuf websockets ]; From c5c9d91ebec9a101fea316132146049c4c684508 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 233/673] python3Packages.jaraco.collections: 3.5.2 -> 3.8.0 --- .../development/python-modules/jaraco_collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 686095d3b1c0..e42499b70999 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.5.2"; + version = "3.8.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ByuT6zX55IUISFdVU05mo07xzISvKR/Sfzm0TUwN0sM="; + sha256 = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; }; postPatch = '' From 46bd54391d2b9dfb59339bb99325e2de4ce19eab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 234/673] python3Packages.jaraco-context: 4.1.2 -> 4.2.0 --- pkgs/development/python-modules/jaraco-context/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index 4b097fd5b096..6a8c0fd1ea4a 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "4.1.2"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.context"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gfrDZW4d3X/QjUBN8DFSvKRLZge3pnZ6KkI7S7Nz3W0="; + sha256 = "sha256-J7vL+pvwXcKEkqZn44/U01HmP1CI5kIGsJ1aJevp0I4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 41851bcf20c91611a253aa87ba28e4f1b52f53c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 235/673] python3Packages.jaraco.functools: 3.5.1 -> 3.5.2 --- 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 de4b8c5ce489..afd7e113189e 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0K3PkXEKCFPv6fI6ePrVhr9n31cvDW2OD6NtKJrhwdk="; + sha256 = "sha256-RbBcFY860ocxB1VW/9R0m9JU7Gf5Hh6zZ9z+v/EVHbQ="; }; nativeBuildInputs = [ setuptools-scm ]; From cac38406c9fdb718517b7e90fce0e36388cbc095 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 236/673] python3Packages.jaraco-test: 5.1.0 -> 5.2.0 --- pkgs/development/python-modules/jaraco-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index 3f3f9d54f87f..86aca734e114 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "jaraco-test"; - version = "5.1.0"; + version = "5.2.0"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco.test"; inherit version; - sha256 = "04a7503c0c78cd057bd6b5f16ad1e3379b911b619df6694480a564ebc214c0a8"; + sha256 = "sha256-K1OYx58TriCKoGfdLlEw3ArC699DR5w9r7bxLz2bdIs="; }; nativeBuildInputs = [ From 933661396ef40c0756392c0d9264e3ae3acdbda2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 237/673] python3Packages.jaraco.text: 3.9.1 -> 3.11.0 --- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 4891b2ea38c5..91183d4f4082 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.9.1"; + version = "3.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1XzURIpYgCAxhCXgQZTol/lvwjuSuC/5MIok1cvys/s="; + sha256 = "sha256-DdtYlZX+F26oF5yAHKTs4r4Kpx83e5HzymW010GUg1E="; }; pythonNamespaces = [ From 0d6a07172dacc46df0a72487a8931c9d4ba2c0dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 238/673] python3Packages.jax: 0.3.23 -> 0.4.1 --- pkgs/development/python-modules/jax/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 07f4f5efedbd..cb963a0d6e6a 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.23"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "jax-v${version}"; - hash = "sha256-ruXOwpBwpi1G8jgH9nhbWbs14JupwWkjh+Wzrj8HVU4="; + rev = "refs/tags/jaxlib-v${version}"; + hash = "sha256-ajLI0iD0YZRK3/uKSbhlIZGc98MdW174vA34vhoy7Iw="; }; # jaxlib is _not_ included in propagatedBuildInputs because there are From 246b3cd378de888c5acbed50deb690cfd44699fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 239/673] python3Packages.jedi-language-server: 0.39.0 -> 0.40.0 --- .../python-modules/jedi-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index b6d0019407ca..c32b84b75f4c 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.39.0"; + version = "0.40.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-nra2Xvfo1cfMoZkY7sem7NIEDwDmODWbGVNCeefSuQY="; + sha256 = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; }; pythonRelaxDeps = [ From e9b931770dd14016dfe2b5e81926ef2bd4cb9807 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:20 +0100 Subject: [PATCH 240/673] python3Packages.jira: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/jira/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 264bef920ea2..f823cb9c03c6 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { pname = "jira"; - version = "3.4.0"; - format = "setuptools"; + version = "3.4.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XyMywnuJOGSXWsMNbwNbMaOeAa9bosBg6rvfNKw77Ik="; + hash = "sha256-EZCvYpcQ1dSsXDhipUalrHEG5SYOochktYrBdIoNDRo="; }; nativeBuildInputs = [ From b89d7fd26e8feb3bb2673f7ff6efed4b0a764fb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 241/673] python3Packages.JPype1: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/JPype1/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 698a4165455d..3664d83bfbe0 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, packaging , pythonOlder , typing-extensions , pytest @@ -9,15 +10,17 @@ buildPythonPackage rec { pname = "JPype1"; - version = "1.4.0"; + version = "1.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-DF9mXuPm4xwn6dLUjdEr9OtP5oWII+ahEgGgNSdMz+E="; + sha256 = "sha256-3I7oVAc0dK15rhaNkML2iThU9Yk2z6GPNYfK2uDTaW0="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; From 3b51ffbc1f2074447b2bcb8af0c8434a1f583a76 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 242/673] python3Packages.jsonpickle: 2.2.0 -> 3.0.1 --- 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 969869f86b52..75ee64dc4623 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 = "2.2.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eycpGLBVQYLlPcNA3dYtm3+QL+x+ewViDATzzO9Hmg4="; + sha256 = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; }; checkInputs = [ pytest ]; From e5d300891495245692664395acb4ee0073820ce4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 243/673] python3Packages.jsonref: 0.2 -> 1.0.1 --- .../python-modules/jsonref/default.nix | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 2ab8ec45a701..12de6527c866 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -1,20 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "jsonref"; - version = "0.2"; + version = "1.0.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "15v69rg2lkcykb2spnq6vbbirv9sfq480fnwmfppw9gn3h95pi7k"; + src = fetchFromGitHub { + owner = "gazpachoking"; + repo = "jsonref"; + rev = "refs/tags/v${version}"; + hash = "sha256-8p0BmDZGpQ6Dl9rkqRKZKc0doG5pyXpfcVpemmetLhs="; }; - checkInputs = [ pytest mock ]; + nativeBuildInputs = [ + poetry-core + ]; - checkPhase = '' - py.test tests.py - ''; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; meta = with lib; { description = "An implementation of JSON Reference for Python"; From d0b49281a2acd6cb60b04be296b1770ee0b90b99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 244/673] python3Packages.junos-eznc: 2.6.5 -> 2.6.6 --- pkgs/development/python-modules/junos-eznc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 2cd29ba4da4b..157184fec1ee 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.5"; + version = "2.6.6"; format = "setuptools"; src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; - rev = version; - hash = "sha256-BoHT6ejccInfREbYtW6psm3fvsQxLS1vpj/aPDqqpnY="; + rev = "refs/tags/${version}"; + hash = "sha256-0JF9/lSIquXp25bM3GESqLC//aorSVT0hHccaOmQuM8="; }; propagatedBuildInputs = [ From 9f307e8e7c21fcee3e4bd4da826e3f65b6091da5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 245/673] python3Packages.jupyter_client: 7.3.5 -> 7.4.8 --- 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 598cef9a8e58..11c41677b5ac 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 = "7.3.5"; + version = "7.4.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PFhGahuNVdugvzzgg05PW3dguvmNHXPbCt1vGd6ezR0="; + sha256 = "sha256-EJo8M7YqnPZaqDJYUKCZmnlfrBVdneT3VVrvXzEO41o="; }; nativeBuildInputs = [ From 1f460fadad238c0f9942094e845ac19fc4fb83cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 246/673] python3Packages.jupyter_core: 4.11.2 -> 5.1.1 --- pkgs/development/python-modules/jupyter_core/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 56dc157a69d2..1e540ff6a584 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -3,13 +3,14 @@ , pythonOlder , fetchFromGitHub , hatchling +, platformdirs , traitlets , pytestCheckHook }: buildPythonPackage rec { pname = "jupyter_core"; - version = "4.11.2"; + version = "5.1.1"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -17,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_core"; - rev = version; - hash = "sha256-lDhwvhsOxLHBC6CQjCW/rmtHSuMRPC2yaurBd5K3FLc="; + rev = "refs/tags/v${version}"; + hash = "sha256-54zbo+RXgT9AJabmJYHCznyoinTQqrTORzlM48WpnQQ="; }; patches = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + platformdirs traitlets ]; From eb1e7d87f6fa8794fab3de98a18e9d9962b93a37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 247/673] python3Packages.jupyterlab-git: 0.39.2 -> 0.41.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 b8914a2a45a0..666de2d89395 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.39.2"; + version = "0.41.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-+wzKAK5jdrlPjtVDgp7QqOyXaBDzzkRJI+6hcbOcnpo="; + sha256 = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; }; nativeBuildInputs = [ From 3e0539fbc70b3ecf496b7985e58a7cbc8f3f41f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:21 +0100 Subject: [PATCH 248/673] python3Packages.jupyterlab_server: 2.16.3 -> 2.17.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 cc709c4f47a3..b891d9e0e7ea 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.16.3"; + version = "2.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y1oLF2qQHxk1HAIiGhJOWTF8R29REgBAm32GfospBcM="; + hash = "sha256-pbaSPiqeopn5jeW1DN6Qci10748HE6dcvL+/0/Qa0Fg="; }; nativeBuildInputs = [ From 6ecd9f95de8231a4cbf019e5e19651ea6dcd77d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 249/673] python3Packages.jupyterlab-widgets: 3.0.3 -> 3.0.5 --- .../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 7077d39cb742..1634e986d025 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.3"; + version = "3.0.5"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "sha256-x2cYE5m0yotke+/i2ROxJg9Rv52O+behRjLUwae1Nr0="; + sha256 = "sha256-7q7N6vbAOvyWDdriAc7YjVl5tMqcOJG8uPZjGvcF9e8="; }; nativeBuildInputs = [ From 3285aa4a499fe7d4207a0a384df815a5d233b988 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 250/673] python3Packages.jupyter_server: 1.19.1 -> 2.0.6 --- .../python-modules/jupyter_server/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 791e238f3874..7d948f7b52f1 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -3,9 +3,12 @@ , buildPythonPackage , fetchPypi , pythonOlder +, hatch-jupyter-builder +, hatchling , pandoc , pytestCheckHook , pytest-console-scripts +, pytest-jupyter , pytest-timeout , pytest-tornasync , argon2-cffi @@ -15,8 +18,10 @@ , ipykernel , ipython_genutils , traitlets -, jupyter_core +, jupyter-core , jupyter-client +, jupyter-events +, jupyter-server-terminals , nbformat , nbconvert , send2trash @@ -30,14 +35,20 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.19.1"; + version = "2.0.6"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0cw1lpRYSXQrw+7fBpn+61CtbGBF6+8CqSmLfxPCfp8="; + hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8="; }; + nativeBuildInputs = [ + hatch-jupyter-builder + hatchling + ]; + propagatedBuildInputs = [ argon2-cffi jinja2 @@ -45,8 +56,10 @@ buildPythonPackage rec { pyzmq ipython_genutils traitlets - jupyter_core + jupyter-core jupyter-client + jupyter-events + jupyter-server-terminals nbformat nbconvert send2trash @@ -62,6 +75,7 @@ buildPythonPackage rec { pandoc pytestCheckHook pytest-console-scripts + pytest-jupyter pytest-timeout pytest-tornasync requests From c4aeefaf3feda63a118cfcddde63700b278d4ea8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 251/673] python3Packages.k5test: 0.10.1 -> 0.10.3 --- pkgs/development/python-modules/k5test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 6c2e8466a1de..b3f56a8e0d62 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "k5test"; - version = "0.10.1"; + version = "0.10.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2c9181133f3d52c8e29a5ba970b668273c08f855e5da834aaee2ea9efeb6b069"; + sha256 = "sha256-nJ3uvK1joxXoGDPUXp/RK/IBZmQ7iry5/29NaxhMVx8="; }; patches = [ From c2b055eee7bea76a91991599b8b18a17ff4bff44 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 252/673] python3Packages.keras: 2.10.0 -> 2.11.0 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 32f4ad3a5995..788308c92d38 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "sha256-JqbiwlIudGjd6iJxCpmzKQSTdo/AijnnXRFzoONFL98="; + sha256 = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; }; checkInputs = [ From c3b365a7cde734a213b09ec641307fa88185a68e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 253/673] python3Packages.keystoneauth1: 5.0.0 -> 5.1.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 cc10ec96686c..5f2a3323baa8 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.0.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-brtfBEyd/SYwh6Mo1R1HmUfR3ckMCdr0GR333HEzQyM="; + sha256 = "sha256-nve0txmnmkoEOHpqpVintspK3xi4Ex8YasrwZD/5e74="; }; postPatch = '' From e8b3c12e03e7c610e96fd0bf68c0245f7c27a912 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 254/673] python3Packages.lark: 1.1.2 -> 1.1.5 --- pkgs/development/python-modules/lark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 62123032a5d4..ebf8aea20305 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "lark"; - version = "1.1.2"; + version = "1.1.5"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; - rev = version; - sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs="; + rev = "refs/tags/${version}"; + sha256 = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; }; # Optional import, but fixes some re known bugs & allows advanced regex features From 0d002ed6a54049598a83fad918f7069ed2d34b52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 255/673] python3Packages.lazy-object-proxy: 1.7.1 -> 1.8.0 --- pkgs/development/python-modules/lazy-object-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 0619a62fa32d..aec83e4bce49 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4"; + sha256 = "sha256-whmgAkWvD2+k6VkB7SgERUT1AVKEDFtqPnslaNs00VY="; }; nativeBuildInputs = [ From 2a1d1f3788bb3b23cd301aee6efd7c917d446deb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 256/673] python3Packages.libcst: 0.4.7 -> 0.4.9 --- pkgs/development/python-modules/libcst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index d763c52d8191..d24093c12c4c 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.4.7"; + version = "0.4.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,14 +26,14 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-YrGajxs8t8PU4XRkFlhwtxoa9pzpKPXq8ZvN/uqftlE="; + hash = "sha256-ikddvKsvXMNHMfA9jUhvyiDXII0tTs/rE97IGI/azgA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "source/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-V/WHZVvh8HtD8IUNk3V4e8/E2A8DebqY5i/lS1X6x3o="; + hash = "sha256-FWQGv3E5X+VEnTYD0uKN6W4USth8EQlEGbYgUAWZ5EQ="; }; cargoRoot = "native"; From 6c8245718a9212c56c738a644c6058e6cbbd05bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:22 +0100 Subject: [PATCH 257/673] python3Packages.libtmux: 0.13.0 -> 0.18.1 --- .../python-modules/libtmux/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 199f467fbbca..804f4bce0e3c 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , buildPythonPackage , poetry-core +, pytest-rerunfailures , pytestCheckHook , procps , tmux @@ -10,16 +11,20 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.13.0"; + version = "0.18.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u08lxVMuyO5CwFbmxn69QqdSWcvGaSMZgizRJlsHa0k="; + hash = "sha256-OhNyJcnxjbyP/Kpt70qLv3ZtZvXXVTWEMcjv/pa50/4="; }; + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + nativeBuildInputs = [ poetry-core ]; @@ -27,11 +32,15 @@ buildPythonPackage rec { checkInputs = [ procps tmux - + pytest-rerunfailures pytestCheckHook ]; - pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_test.py" ]; + pytestFlagsArray = [ + "tests" + ] ++ lib.optionals stdenv.isDarwin [ + "--ignore=tests/test_test.py" + ]; pythonImportsCheck = [ "libtmux" ]; From 4452e4774fdac4f266d05d2260ce0bd7deab0654 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 258/673] python3Packages.lightgbm: 3.3.2 -> 3.3.3 --- pkgs/development/python-modules/lightgbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index ad54268c8cf5..c59f28d6939d 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.2"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "5d25d16e77c844c297ece2044df57651139bc3c8ad8c4108916374267ac68b64"; + sha256 = "sha256-hX5VmuhKIpY84rYhaCkpadIa3TC8kkaoTU5+7a5nlm0="; }; nativeBuildInputs = [ From 874d89537ac9561c0637fa06f96093a0ffada8ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 259/673] python3Packages.limits: 2.7.2 -> 2.8.0 --- pkgs/development/python-modules/limits/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index f298bef4892f..31b4aa02ae36 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "limits"; - version = "2.7.2"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,14 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alisaifee"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; # Upstream uses versioneer, which relies on git attributes substitution. # This leads to non-reproducible archives on github. Remove the substituted # file here, and recreate it later based on our version info. postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-sL4/BE1qNfR33rZwBcwHo3UeVMfkNz7rwBNF4LBtSIw="; + hash = "sha256-XGYwSe9KWw6PdxDjyqZ5kw5jlBxQR0VYacquwZ2z8rA="; }; propagatedBuildInputs = [ From 33f8242100dd64c2263f81f2072c69f8064acb4a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 260/673] python3Packages.limnoria: 2022.9.20 -> 2022.11.10 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 2acb735052bd..496f55b4000c 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.9.20"; + version = "2022.11.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-db+JKQXDffMm5dcyMVtYNj1YFKHSlvYAoyZi86tqoiA="; + hash = "sha256-IvnA9y/pkRrkEabUX05wcAg+8To0OLbt55olQfRUAQc="; }; propagatedBuildInputs = [ From a3740a89b42851e1df0cb3ce91ae20616ba19322 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 261/673] python3Packages.localstack: 1.2.0 -> 1.3.1 --- pkgs/development/python-modules/localstack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index c9856889de1f..bb9c100890af 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "localstack"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; - rev = "v${version}"; - sha256 = "sha256-en/9kxhiW4aesc2SOpg/jRXiRa222iBQuq1O3cHeBJs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cxkEP/fsIGTcFLAM8tn/esCMmAvsIYb46X+EzV2VHDc="; }; postPatch = '' From 605f04625f9ec501eee935d264aa5338a98be715 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 262/673] python3Packages.localstack-ext: 1.2.0 -> 1.3.1 --- 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 a3d323edf983..1947467c0ec8 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.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F+FQJwvB1WH7qcfOG6IGY+ZlfKwz39UE5rwoQKnxaac="; + sha256 = "sha256-zMGKGTKomduydhOAxfif/Caf1QJiG2mxig4a+789SJc="; }; postPatch = '' From 32a0bda9e978831d8b37422118646547a93975fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 263/673] python3Packages.lxml: 4.9.1 -> 4.9.2 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index f0a9d6ff523a..65cb5afab187 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/lxml-${version}"; - sha256 = "sha256-5MJw3ciXYnfctSNcemJ/QJGKAaYpadvdbFhkc8+pmPM="; + sha256 = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs From 6298f678b9e2fcc53ca405d4094b905e91371372 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 264/673] python3Packages.python-lz4: 4.0.1 -> 4.3.1 --- pkgs/development/python-modules/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index aaf4e0aa69bc..c7efc7af57c9 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "4.0.1"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hQuZkstsB37pFDWmA0W6qGd7rAer1mun7Z6MxMp0ZmE="; + sha256 = "sha256-XWkCZhBapjtzH3g3t+xXiB2f54p3Xw0+UBKVNH+gGHQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From ac620f0467647a49c4f0731d2620be77f0162e4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:23 +0100 Subject: [PATCH 265/673] python3Packages.mac_alias: 2.2.0 -> 2.2.2 --- .../python-modules/mac_alias/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mac_alias/default.nix b/pkgs/development/python-modules/mac_alias/default.nix index ac750b13e390..159dfa1d89ad 100644 --- a/pkgs/development/python-modules/mac_alias/default.nix +++ b/pkgs/development/python-modules/mac_alias/default.nix @@ -1,15 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi +, setuptools }: buildPythonPackage rec { - version = "2.2.0"; - pname = "mac_alias"; + pname = "mac-alias"; + version = "2.2.2"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "0eb84a63f98bf54c2f9fbdc4de956a63e64eb8a4a124143a1c1f5a78326442f0"; + pname = "mac_alias"; + inherit version; + hash = "sha256-yZxyjrUS6VXBHxpiA6D/qIg7JlSeiv5ogEAxql2oVrc="; }; + nativeBuildInputs = [ + setuptools + ]; + # pypi package does not include tests; # tests anyway require admin privileges to succeed doCheck = false; From 851fa51b30f0920f675ea91ead7c1760fe44a05d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 266/673] python3Packages.mailsuite: 1.9.7 -> 1.9.14 --- pkgs/development/python-modules/mailsuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index ff44629de9f1..6767e86feb22 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mailsuite"; - version = "1.9.7"; + version = "1.9.14"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d96r712suiL4dSzT5vG/rD+4PInlvpuoAo3cedqVe+w="; + hash = "sha256-8vybabJPQyR0XMXaNp8lQFyuPajrhucgdfazt2ci8Gs="; }; nativeBuildInputs = [ From 1b9e217854c841c5b55025d046fbe4a10c5d0eb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 267/673] python3Packages.Mako: 1.2.2 -> 1.2.4 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 9118f5a6fcf3..eeae0d7f33d1 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.2.2"; + version = "1.2.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NySGmzY7pjCicqX4n2jAcDUhN7j9F1dlABe34G/aFj8="; + sha256 = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ="; }; propagatedBuildInputs = [ From f183ff944aef7b836115cc7726c06da7b6e3b7b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 268/673] python3Packages.markdown-include: 0.7.0 -> 0.8.0 --- .../python-modules/markdown-include/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix index 091809d8314b..3d32b507579e 100644 --- a/pkgs/development/python-modules/markdown-include/default.nix +++ b/pkgs/development/python-modules/markdown-include/default.nix @@ -2,21 +2,28 @@ , buildPythonPackage , fetchFromGitHub , markdown +, setuptools-scm }: buildPythonPackage rec { pname = "markdown-include"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; # only wheel on pypi src = fetchFromGitHub { owner = "cmacmackin"; repo = pname; - rev = "v${version}"; - hash = "sha256-2pC0K/Z5l7q6sx4FSM4Pi1/5bt1wLZsqOmcbnE47rVs="; + rev = "refs/tags/v${version}"; + hash = "sha256-wTGgxvM3/h+6plUcheeMSkpk1we7pwuWHurkDkmbnPY="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ markdown ]; From f8c9fd20a982fc9aafe65f91fad47a253617053f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 14:51:47 +0100 Subject: [PATCH 269/673] python3Packages.contourpy: init at 1.0.6 --- .../python-modules/contourpy/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/contourpy/default.nix diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix new file mode 100644 index 000000000000..f80f16c51979 --- /dev/null +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build +, pybind11 +, setuptools + +# propagates +, numpy + +# optionals +, bokeh +, chromedriver +, selenium + +# tests +, matplotlib +, pillow +, pytestCheckHook +}: + +let countourpy = buildPythonPackage rec { + pname = "contourpy"; + version = "1.0.6"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "contourpy"; + repo = "contourpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-JbLaQ2NomJlgDmEATa7OmZ749Bezt3tvnt1nOA1aOVw="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + propagatedBuildInputs = [ + numpy + ]; + + passthru.optional-depdendencies = { + bokeh = [ bokeh chromedriver selenium ]; + }; + + doCheck = false; # infinite recursion with matplotlib, tests in passthru + + checkInputs = [ + matplotlib + pillow + pytestCheckHook + ]; + + passthru.tests = { + check = countourpy.overridePythonAttrs (_: { doCheck = true; }); + }; + + pythonImportsCheck = [ + "contourpy" + ]; + + meta = with lib; { + changelog = "https://github.com/contourpy/contourpy/releases/tag/v${version}"; + description = "Python library for calculating contours in 2D quadrilateral grids"; + homepage = "https://github.com/contourpy/contourpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in countourpy diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8464e2994da..f96120165e0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1977,6 +1977,8 @@ self: super: with self; { contexttimer = callPackage ../development/python-modules/contexttimer { }; + contourpy = callPackage ../development/python-modules/contourpy { }; + convertdate = callPackage ../development/python-modules/convertdate { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; From 09116080bca0c6836c08b4718783185383b8a13d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 270/673] python3Packages.matplotlib: 3.5.3 -> 3.6.2 --- pkgs/development/python-modules/matplotlib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 6a507d01ef3b..79c842f6d3e8 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo , which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection -, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging +, certifi, contourpy, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging , enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -17,7 +17,7 @@ let in buildPythonPackage rec { - version = "3.5.3"; + version = "3.6.2"; pname = "matplotlib"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M5ysSLgN28i/0F2q4KOnNBRlGoWWkEwqiBz9Httl8mw="; + sha256 = "sha256-sD/RChcJ0BAcBUiDtVD3xMXpdPdR4mgDGHWa8AWWSZA="; }; XDG_RUNTIME_DIR = "/tmp"; @@ -47,6 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi + contourpy cycler fonttools freetype From 7a701a617f65ffebc6a47656c79904ea943eb344 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 271/673] python3Packages.mayavi: 4.8.0 -> 4.8.1 --- pkgs/development/python-modules/mayavi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 55f8fca0c35e..a4960ae41127 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.8.0"; + version = "4.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TGBDYdn1+juBvhjVvxTzBlCw7jju1buhbMikQ5QXj2M="; + sha256 = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; postPatch = '' From f8c83ec55e596ef9d3b91f890960a48f784d09d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 272/673] python3Packages.mcstatus: 9.3.0 -> 10.0.1 --- pkgs/development/python-modules/mcstatus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index f8001dbdd568..6ba2b4874a38 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.3.0"; + version = "10.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "py-mine"; repo = pname; - rev = "v${version}"; - hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0="; + rev = "refs/tags/v${version}"; + hash = "sha256-rwEZhN/CbIw5lZ1AGorsagr4RlvCMlCK/M0XzQBCvh8="; }; nativeBuildInputs = [ From 3157d6a8b458567970fcc9397f6a52666b87f107 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 273/673] python3Packages.mdit-py-plugins: 0.3.0 -> 0.3.3 --- .../python-modules/mdit-py-plugins/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 4174c18d10bf..4b780c40df85 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, setuptools +, flit-core , markdown-it-py , pytest-regressions , pytestCheckHook @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.0"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; + rev = "refs/tags/v${version}"; + hash = "sha256-9eaVM5KxrMY5q0c2KWmctCHyPGmEGGNa9B3LoRL/mcI="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ From afc23a5a3b42ce7498743edfb7ffc32d74a78023 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:24 +0100 Subject: [PATCH 274/673] python3Packages.mediapy: 1.1.0 -> 1.1.2 --- 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 9b188f9c2a59..44190b11e599 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.0"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E="; + hash = "sha256-uz+Pv3DvmhDajIqNpCj+2HsRT7Dh7Ks5yryhiEa8KOI="; }; propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; From b0a91bfaf8fca33e4bba99d8272b67238ab9c3d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:25 +0100 Subject: [PATCH 275/673] python3Packages.mesa: 0.8.7 -> 1.1.1 --- .../python-modules/mesa/default.nix | 47 +++++++++++++------ 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index aaf13a76530d..2398551b0daa 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -1,29 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, cookiecutter, networkx , pandas, tornado, tqdm -, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, cookiecutter +, networkx +, pandas +, tornado +, tqdm +, pytestCheckHook +}: buildPythonPackage rec { pname = "mesa"; - version = "0.8.7"; + version = "1.1.1"; + format = "setuptools"; # According to their docs, this library is for Python 3+. disabled = isPy27; - src = fetchFromGitHub { - owner = "projectmesa"; - repo = "mesa"; - rev = "v${version}"; - sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19"; + src = fetchPypi { + pname = "Mesa"; + inherit version; + hash = "sha256-FPQLPClI8CKVsacZs4DLFnaikVSwrevU5TfUMevXgSY="; }; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + cookiecutter + networkx + pandas + tornado + tqdm + ]; - # Ignore test which tries to mkdir in unreachable location. - checkPhase = '' - pytest tests -k "not scaffold" - ''; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ]; + disabledTests = [ + "test_examples" + "test_run" + "test_scaffold_creates_project_dir" + ]; meta = with lib; { homepage = "https://github.com/projectmesa/mesa"; From 1628b6620cb87d047c3539f6eba876b8cf50836f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:25 +0100 Subject: [PATCH 276/673] python3Packages.meson-python: 0.10.0 -> 0.12.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 a4d650c27f59..69cfa50f8fd4 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.10.0"; + version = "0.12.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-CN0SLBB029XFW1OZOnGcynPdghY3LJEhf3pVAmD55+E="; + hash = "sha256-jLFZqAk6LnPPqJf4CS7JO3TjhC+U3/f944HG/g4LBk0="; }; nativeBuildInputs = [ From 5d043b25c706e5b940976440a878e17049fd7f6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:25 +0100 Subject: [PATCH 277/673] python3Packages.mip: 1.14.1 -> 1.14.2 --- pkgs/development/python-modules/mip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix index 6b1c353c23d7..1b86734624a5 100644 --- a/pkgs/development/python-modules/mip/default.nix +++ b/pkgs/development/python-modules/mip/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mip"; - version = "1.14.1"; + version = "1.14.2"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bvpm5vUp15fbv/Sw1Lx70ihA7VHsSUzwFzoFDG+Ow1M="; + sha256 = "sha256-wr4gXSh456heG5nsaEi2yo7LMre2Nd6QbTm0dcDCX1k="; }; checkInputs = [ matplotlib networkx numpy pytestCheckHook ]; From bf5f0d590c45bfdb3ccc2a7c80e0254bf05d4352 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:25 +0100 Subject: [PATCH 278/673] python3Packages.mkdocs: 1.3.0 -> 1.4.2 --- .../python-modules/mkdocs/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 0fb61bd8a599..347f7452d73b 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -4,7 +4,11 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder - # runtime deps + +# buildtime +, hatchling + +# runtime deps , click , ghp-import , importlib-metadata @@ -15,7 +19,8 @@ , pyyaml , pyyaml-env-tag , watchdog - # testing deps + +# testing deps , babel , mock , unittestCheckHook @@ -23,16 +28,26 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.3.0"; + version = "1.4.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-S4xkr3jS5GvkMu8JnEGfqhmkxy3FtZZb7Rbuniltudg="; + rev = "refs/tags/${version}"; + hash = "sha256-/NxiKbCd2acYcNe5ww3voM9SGVE2IDqknngqApkDbNs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "Markdown >=3.2.1, <3.4" "Markdown" + ''; + + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click jinja2 From e6e62e9014765d34c22c05efe09d5c06d4252791 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 14:25:59 +0100 Subject: [PATCH 279/673] python3Packages.mkdocs-material-extensions: 1.0.3 -> 1.1.1 --- .../mkdocs-material-extensions.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix index 2d03c8fa8c5d..4e1c47a8c49d 100644 --- a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -1,16 +1,25 @@ -{ lib, fetchFromGitHub, buildPythonPackage }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, hatchling +}: buildPythonPackage rec { pname = "mkdocs-material-extensions"; - version = "1.0.3"; + version = "1.1.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = pname; - rev = version; - sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3"; + rev = "refs/tags/${version}"; + hash = "sha256-FHI6WEQRd/Ff6pmU13f8f0zPSeFhhbmDdk4/0rdIl4I="; }; + nativeBuildInputs = [ + hatchling + ]; + doCheck = false; # Circular dependency pythonImportsCheck = [ "materialx" ]; From 3b8c42c9b04a3c8a1e40b62ae9e274c89af87c0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 13:49:05 +0100 Subject: [PATCH 280/673] python3Packages.hatch-requirements-txt: init at 0.3.0 --- .../hatch-requirements-txt/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/hatch-requirements-txt/default.nix diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix new file mode 100644 index 000000000000..b7ba9446575d --- /dev/null +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatch +, hatchling +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hatch-requirements-txt"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "hatch-requirements-txt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Gyt5Fs8uqVe0cOKtxFeg1n1WMyeK5Iokh71ynb2i5cM="; + }; + + nativeBuildInputs = [ + hatch + ]; + + propagatedBuildInputs = [ + hatchling + packaging + ]; + + doCheck = false; # missing coincidence dependency + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/repo-helper/hatch-requirements-txt/releases/tag/${version}"; + description = "Hatchling plugin to read project dependencies from requirements.txt"; + homepage = "https://github.com/repo-helper/hatch-requirements-txt"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f96120165e0a..da85f0e3352d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4189,6 +4189,8 @@ self: super: with self; { hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { }; + hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; From 7504ff4f4e5ebbe91cf3b016b8b6f52c3e043b93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:25 +0100 Subject: [PATCH 281/673] python3Packages.mkdocs-material: 8.4.3 -> 8.5.11 --- .../python-modules/mkdocs-material/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index d82c1a654362..fe1eca400072 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -2,6 +2,9 @@ , callPackage , buildPythonPackage , fetchFromGitHub +, hatch-requirements-txt +, hatch-nodejs-version +, hatchling , jinja2 , markdown , mkdocs @@ -9,12 +12,13 @@ , pygments , pymdown-extensions , pythonOlder +, requests }: buildPythonPackage rec { pname = "mkdocs-material"; - version = "8.4.3"; - format = "setuptools"; + version = "8.5.11"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +26,15 @@ buildPythonPackage rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ntArFD/wnoFC2vMS9WjiFP5/I1XklgSPGKGxFXxdNxs="; + hash = "sha256-jF5lpRv2itkhkqH7RzUXEH5e0Bia3SnTApfoy61RfJA="; }; + nativeBuildInputs = [ + hatch-requirements-txt + hatch-nodejs-version + hatchling + ]; + propagatedBuildInputs = [ jinja2 markdown @@ -32,6 +42,7 @@ buildPythonPackage rec { mkdocs-material-extensions pygments pymdown-extensions + requests ]; # No tests for python From 60a8a9c7be0112654cf6e8e72a53c1ebe1a74521 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:25 +0100 Subject: [PATCH 282/673] python3Packages.mkdocs-minify: 0.5.0 -> 0.6.2 --- pkgs/development/python-modules/mkdocs-minify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify/default.nix index ee6765d31751..3c952fb06610 100644 --- a/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mkdocs-minify"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "byrnereese"; repo = "${pname}-plugin"; - rev = version; - sha256 = "sha256-7v4uX711KAKuXFeVdLuIdGQi2i+dL4WX7+Zd4H1L3lM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-ABoLt5sFpt8Hm07tkqeAcs63ZvJ4vTbGw4QRYVYpMEA="; }; propagatedBuildInputs = [ From 2f3020e43ca735688dbf2609fba474147df82db8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:25 +0100 Subject: [PATCH 283/673] python3Packages.mkdocs-swagger-ui-tag: 0.4.3 -> 0.5.1 --- .../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 2997e93ce0b9..46e3d410614b 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.4.3"; + version = "0.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-N/7JhVX3STsUAz7O6yWkvKz72+3RZA5CNb3Z6FTrdRs="; + sha256 = "sha256-CAIQbSg8o+FxPqb/O9ML1b6OxmmH4c+RRU4ecHyfn8w="; }; propagatedBuildInputs = [ mkdocs beautifulsoup4 ]; From 31c183f769e85d1de26be0bbd37c481651e6785e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 284/673] python3Packages.mlxtend: 0.20.0 -> 0.21.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 63cc4e3b39ec..a3747545b4da 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.20.0"; + version = "0.21.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ECDO3nc9IEgmZNdSA70BzOODOi0wnisI00F2Dxzdz+M="; + sha256 = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; }; checkInputs = [ pytestCheckHook ]; From e8147603f742bc133f3f668f3d9137b0c4b67ad1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 285/673] python3Packages.mne-python: 1.2.2 -> 1.3.0 --- 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 53a852934d47..702521de977a 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.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KFifnu9MR3FoVs7gLv+CpB/p3/6Iej9RJuBf1uc1HJs="; + hash = "sha256-3N9S8QhQ3vtC9SZBQqvwVpE8V062VVWTV3nBhPI1lmA="; }; propagatedBuildInputs = [ From d082644e73e2847cfd1fc0dafbaa675ec339a976 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 286/673] python3Packages.mocket: 3.10.8 -> 3.10.9 --- 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 7e5d62454c6b..799c67089275 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.8"; + version = "3.10.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-aiofKFE9CPLMVJm+IT6VmtJSsVuH7ucpv5Kp1w7d2FE="; + sha256 = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; }; propagatedBuildInputs = [ From 258013bebaca02bf013de591296797b655156914 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 287/673] python3Packages.monai: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/monai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index 4f142c5f2bba..faa8e112c530 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "monai"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; rev = "refs/tags/${version}"; - hash = "sha256-BnsgZpkXsY2l6inuzOkuvK4zJqYs2dj7jF5gKKiLnZM="; + hash = "sha256-XTjZhynIiFtFjJSW6rRAnpErZvf6QHkuK4e2L6l3naM="; }; # Ninja is not detected by setuptools for some reason even though it's present: From d80c5f78a759e5f1deb0c6656968dbe47dd52fde Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 288/673] python3Packages.mongoengine: 0.24.1 -> 0.25.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 ff91a63d792f..3ba9c9dea368 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.24.1"; + version = "0.25.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-KmCk4YTkwpWePTOOFyp4hGIcxpy/rrfAAC1/Xes/IYk="; + sha256 = "sha256-2UPjyKJGiW8UfWgMu8WKZJ5l+p4vTR57GxMFC5amb4A="; }; propagatedBuildInputs = [ From d48a83c558925d6b09880c554627b9d251447353 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 289/673] python3Packages.monty: 2022.9.8 -> 2022.9.9 --- pkgs/development/python-modules/monty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index a5d5958ec0dc..b4b8292ea01d 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2022.9.8"; + version = "2022.9.9"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-3C5L7nKokuxtYlw13AKSrNVsvKH9okmBNyLXt7Vmjqk="; + sha256 = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw="; }; postPatch = '' From d691b8da974f839e18aa51ea7d347f4d11c7cc7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 290/673] python3Packages.more-itertools: 8.14.0 -> 9.0.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 1735148c58ec..4f8b9884d44c 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 = "8.14.0"; + version = "9.0.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wJRDzT1UOLja/M2GemvBywiUOJ6Qy1PSJ0VrCwvMt1A="; + sha256 = "sha256-WmJX5Ah47wUgsYA5kOPiIwOkG1cUAGwyo/2DBLJuoas="; }; nativeBuildInouts = [ From 9ae1a57e3392ecfbde6312dafeb0e0c352edf605 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 291/673] python3Packages.mt-940: 4.26.0 -> 4.27.0 --- pkgs/development/python-modules/mt-940/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 3b63b02986a2..b2e5f53119f7 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.26.0"; + version = "4.27.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE="; + sha256 = "sha256-LL4CRioio63gpXrsurVucrkFgQrEh0gZPZ79Y2tk/90="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; From 08e5a5a0f510424ec87d29098297d793d897573a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 292/673] python3Packages.multidict: 6.0.3 -> 6.0.4 --- pkgs/development/python-modules/multidict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index ebc4daae0bc1..0a32937f13a5 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "multidict"; - version = "6.0.3"; + version = "6.0.4"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-JSOikAbANGh+zNPucAk6aXEpo//ocyU107Lfak7MJ50="; + hash = "sha256-NmaQZJLvt2RTwOe5fyz0WbBoLnQCwEialUhJZdvB2kk="; }; postPatch = '' From 3c7fd0faaba45968573d3e1690d8b5e0e1f30c7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:26 +0100 Subject: [PATCH 293/673] python3Packages.multiprocess: 0.70.13 -> 0.70.14 --- 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 8558706485c2..6d0780370ff0 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.13"; + version = "0.70.14"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/multiprocess-${version}"; - sha256 = "sha256-L/PesvaidavDEgJGqBxwcCYtG9TlKSwaxrUMJ+XVFOM="; + sha256 = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; }; propagatedBuildInputs = [ From 334b50032b41dbfa23fd18f3c92ad28a08481e80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 294/673] python3Packages.myst-docutils: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/myst-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index c7d9f7999bc7..6746b314c021 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-evyIuNLbBWR3KfQMv2lNw6fOgX1+/uMS5cHIbSTYDmA="; + sha256 = "sha256-Dxg5TtQaK4plvRmXZa7AqPFIv/jvUOpV8M/BJohiXj0="; }; nativeBuildInputs = [ From aa03642101b84a69e45243c00ebcd51d2969147f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 295/673] python3Packages.myst-parser: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/myst-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index e81bf763b3a8..a7a0ec69c8f5 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -19,15 +19,15 @@ buildPythonPackage rec { pname = "myst-parser"; - version = "0.18.0"; + version = "0.18.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-GEtrC7o5YnkuvBfQQfhG5P74QMiHz63Fdh1cC/r5CF0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wgRZwafAF05LtwjH6SVKzsY7bKeZ6lUlM3dB5PdOn1E="; }; postPatch = '' From 6e483a3261b17d95de5ce03625fc87468c1ab206 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 296/673] python3Packages.nameparser: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/nameparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 63e795f98c85..d3780e0c3c29 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM="; + sha256 = "sha256-9LbHwQSNUovWqisnz0KgZEfSsx5FqVsgRJUTB48dhu8="; }; LC_ALL="en_US.UTF-8"; From b9a99f8adf435cff7ac70db067fad8cb07ec867c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 297/673] python3Packages.napari: 0.4.16 -> 0.4.17 --- pkgs/development/python-modules/napari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 4e4fffa53063..592407007221 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -35,7 +35,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.16"; + version = "0.4.17"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Fx3DoTIb2ev5wMP/gmprPIoxeF2f+Cbac6pnWB/zTTw="; + hash = "sha256-34FALCI7h0I295553Rv0KZxKIipuA2OMNsINGde7/oE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 0b7bcc050395c4986d26ddae85dc8b66502ab39c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 298/673] python3Packages.nbclient: 0.6.8 -> 0.7.2 --- .../python-modules/nbclient/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 1643904c314f..937ade730310 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,6 +1,7 @@ { async_generator , buildPythonPackage , fetchFromGitHub +, hatchling , ipykernel , ipywidgets , jupyter-client @@ -11,14 +12,15 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, testpath , traitlets , xmltodict }: let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.8"; - format = "setuptools"; + version = "0.7.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,10 +28,20 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+GQkEGWReo9y8bgcysslQdzJUcvQiZkQTQiwmWJ1mx8="; + hash = "sha256-2H6Oi1tK/GrtfMTR1j12tZdRzQkFUxXzMSpfCtGPyWE="; }; - propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + async_generator + traitlets + nbformat + nest-asyncio + jupyter-client + ]; # circular dependencies if enabled by default doCheck = false; @@ -40,6 +52,7 @@ let nbclient = buildPythonPackage rec { nbconvert pytest-asyncio pytestCheckHook + testpath xmltodict ]; From 4c58c9fd41503369e0cdc00a0720177ae1a8da5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 299/673] python3Packages.nbformat: 5.7.0 -> 5.7.1 --- 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 a418e5c6b48f..c9c66ca33a64 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.7.0"; + version = "5.7.1"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1d4760c15c1a04269ef5caf375be8b98dd2f696e5eb9e603ec2bf091f9b0d3f3"; + sha256 = "sha256-OBCgEwRT7QMZcFIdIJibilkvPC5zKDqCgK40rh91s/g="; }; nativeBuildInputs = [ From 9732403d4ad5236cab526577357a6fdccce8dbe2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 300/673] python3Packages.nest_asyncio: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/nest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index faa015d85f31..995641eb9253 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.5.5"; + version = "1.5.6"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "sha256-5EIpHNlCaYvmGYI6F6hqV1nqvh+GEwhHkN4Yn+nhbWU="; + sha256 = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and From 6c06893996ec3fc2849d853c90033a84f9070164 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:27 +0100 Subject: [PATCH 301/673] python3Packages.networkx: 2.8.6 -> 2.8.8 --- 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 7c026be5cd26..65a722b8500c 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 = "2.8.6"; + version = "2.8.8"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vSt3MDAIYMvS2v6OWvif9cmmXDl1s1J5nYemI4tDAaY="; + sha256 = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4="; }; propagatedBuildInputs = [ decorator setuptools ]; From f16d438df3998a97cd7513d3fae978f804dbf3f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 302/673] python3Packages.nipype: 1.8.4 -> 1.8.5 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index fc221085f98e..1e95b77c181d 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.8.4"; + version = "1.8.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-yoG6iLfF7ugBL4eNC9OLINIzBj1YgF4TVngFKb77qak="; + sha256 = "sha256-44QnQ/tmBGTdKd5z3Pye9m0nO+ELzGQFn/Ic1e8ellU="; }; postPatch = '' From 2bae125367bdd3c3a4ed32f4b7f0a6438036b635 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 303/673] python3Packages.nkdfu: 0.1 -> 0.2 --- pkgs/development/python-modules/nkdfu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index fa094404b8b1..d95b688ed9ce 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "nkdfu"; - version = "0.1"; + version = "0.2"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A="; + sha256 = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; propagatedBuildInputs = [ From 41320581ccacba1800b1e0a5681a78880b49f6c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 304/673] python3Packages.notebook: 6.4.12 -> 6.5.2 --- 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 fdb599466ff2..4e16aa3bdd0f 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.12"; + version = "6.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-YmjJ7JBIz/ekVAXJkMKaycpAsLw+wpJj0hjF4B8rToY="; + sha256 = "sha256-wYl+UxfiJfx4tFVJpqtLZo5MmW/QOgTpOP5eevK//9A="; }; LC_ALL = "en_US.utf8"; From e28781aeeddda06c2cc988b756e09e8f77e4436f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 305/673] python3Packages.notebook-shim: 0.1.0 -> 0.2.2 --- pkgs/development/python-modules/notebook-shim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index a37e0cb3c679..4f606a415709 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "notebook-shim"; - version = "0.1.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; - rev = "v${version}"; - sha256 = "sha256-5oIYj8SdC4E0N/yFxsmD2p4VkStHvqrVqAwb/htyPm4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; }; propagatedBuildInputs = [ jupyter_server ]; From b7460358cfb5e167640eef57657958370ad1c91a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 306/673] python3Packages.nsz: 4.1.0 -> 4.2.1 --- pkgs/development/python-modules/nsz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index c165e850de0c..29284c97eaeb 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "nicoboss"; repo = pname; - rev = version; - sha256 = "sha256-tdngXV+VUOAkg3lF2NOmw0mBeSEE+YpUfuKukTKcPnM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4="; }; propagatedBuildInputs = [pycryptodome enlighten zstandard ] From 5393c637129ead9f4a19046f0de7101056d43cc2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 307/673] python3Packages.ntc-templates: 3.0.0 -> 3.2.0 --- pkgs/development/python-modules/ntc-templates/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index a188daf6b428..f0b6c0dedc60 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.0.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "networktocode"; repo = pname; - rev = "v${version}"; - sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY="; }; nativeBuildInputs = [ From d8cf929129ddd8d8aaf87b47d926df981d6dfdea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 308/673] python3Packages.numcodecs: 0.10.2 -> 0.11.0 --- pkgs/development/python-modules/numcodecs/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index bb550bea782c..e6b4e591e921 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,28 +2,33 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , setuptools-scm , cython , entrypoints , numpy , msgpack +, py-cpuinfo , pytestCheckHook , python }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.10.2"; + version = "0.11.0"; + format ="pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-IoOMaz/Zhr2cckA5uIhwBX95DiKyDm4cu6oN4ULdWcQ="; + sha256 = "sha256-bAWLMh3oShcpKZsOrk1lKy5I6hyn+d8NplyxNHDmNes="; }; nativeBuildInputs = [ + setuptools setuptools-scm cython + py-cpuinfo ]; propagatedBuildInputs = [ From 34958e7fc36620e14f6ad81591add9ed92163572 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:28 +0100 Subject: [PATCH 309/673] python3Packages.numexpr: 2.8.3 -> 2.8.4 --- 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 6c76a8fc88ee..63d95622c061 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.3"; + version = "2.8.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y2R8nZx4Xa4HWb9sh1zeK+xHK1w/emAVc0sWGudm0UE="; + hash = "sha256-1UMlN0GNGGkbkRXWFdbaoX7oJ1uu8+3xr7v4vGmAYUc="; }; nativeBuildInputs = [ From 051bb529f0d8e02991b5208ea9a49b2b0f908d44 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:29 +0100 Subject: [PATCH 310/673] python3Packages.numpydoc: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/numpydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 9eebc8c39a48..6be8e93f545a 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-lJTa8cdhL1mQX6CeZcm4qQu6yzgE2R96lOd4gx5vz6U="; + sha256 = "sha256-sNt7daMjZ6DiXCOzl4QsZeNEoSBlJNFsgGnwockbX0w="; }; postPatch = '' From acd47c7e3fe4b190ed82ef380e8fefec2db19a4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:29 +0100 Subject: [PATCH 311/673] python3Packages.numpy-stl: 2.17.1 -> 3.0.0 --- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index c4877e839cd1..1b28ac339f7f 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.17.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NskgGS9EXdV/CRpjYpvdpaknTUdROjOsLvrRJzc5S3o="; + sha256 = "sha256-V4t46ssFKayaui8X3MNj1Yx8PFcIcQwY+MHpll8ugaw="; }; propagatedBuildInputs = [ From 0a2aafb65e3996fb8dea63add1aac4283b0e286a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:29 +0100 Subject: [PATCH 312/673] python3Packages.nutils: 7.0 -> 7.2 --- 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 3089093d9cd1..4d85e9bab865 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "7.0"; + version = "7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8="; + hash = "sha256-KCvUBE3qbX6v1HahBj4/jjM8ujvFGtWNuH1D+bTHrQ0="; }; propagatedBuildInputs = [ From 5cd36bd3675d98115e4f7e7559b7b226c8de756d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:29 +0100 Subject: [PATCH 313/673] python3Packages.oci: 2.85.0 -> 2.90.0 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 11525c710382..361eefdfd7d1 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.85.0"; + version = "2.90.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-NaVD7oWdKrUC0wjoFTbRg02tCFMlRyNIRHciTtyra7w="; + hash = "sha256-pDLG8w5YfjmiP5JYDWoSLC0NGTfJ2Zmkz4Ed8zAB1pY="; }; propagatedBuildInputs = [ From f2025defc27736259d18c44e8c7935d9d984d1c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:29 +0100 Subject: [PATCH 314/673] python3Packages.openapi-core: 0.16.3 -> 0.16.4 --- 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 509e5a2184dd..8a2bcc444dd1 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.16.3"; + version = "0.16.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-aej82CXk0bCE5W0+uuSVSvC08D5yoXv0h1wcoABWRoI="; + hash = "sha256-16DM9HrptQmj95OOM5XSGIEKzxrCkN3sU/7o8Yh0l6s="; }; postPatch = '' From f2a63866f8139aabdcf4730917d229c663d44f93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:29 +0100 Subject: [PATCH 315/673] python3Packages.openstep-plist: 0.3.0 -> 0.3.0.post1 --- pkgs/development/python-modules/openstep-plist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index 274294f59388..8fb7d7676403 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openstep-plist"; - version = "0.3.0"; + version = "0.3.0.post1"; src = fetchPypi { pname = "openstep_plist"; inherit version; - sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk="; + sha256 = "sha256-GK/z1e3tnr++3+ukRKPASDJGl7+KObsENhwN1Tv+qws="; extension = "zip"; }; From 5876815f2cbac6447ff79d9f501dc760136d590a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:29 +0100 Subject: [PATCH 316/673] python3Packages.optuna: 2.10.1 -> 3.0.5 --- pkgs/development/python-modules/optuna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 1236a24628ec..f4dfcf4f58da 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.10.1"; + version = "3.0.5"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-HHVEoLCZtEJEfc4xYobQrzRcDDxxeQjgL2Rw2KeVbi0="; + sha256 = "sha256-TfAWL81a7GIePkPm+2uXinBP5jwnhWCZPp5GJjXOC6g="; }; checkInputs = [ From f35fa7843977f6b2fdcb709c09e1940e7bf476ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 317/673] python3Packages.oslo-utils: 6.0.1 -> 6.1.0 --- 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 fe207cbd5c46..4d2c1e5754c3 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.0.1"; + version = "6.1.0"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-mwRU+ZQV0MqsXIYFNxbXRtGY7Oxm5nLY5eY4a2+6orY="; + sha256 = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; }; postPatch = '' From 3795acc160631d5be8bf3429f31a69280d57bd1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 318/673] python3Packages.osqp: 0.6.2.post5 -> 0.6.2.post8 --- pkgs/development/python-modules/osqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 016f9325db40..fc001c52a5ef 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post5"; + version = "0.6.2.post8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-svoXquQqftSY7CYbM/Jiu0s2BefoRkBiFZ2froF/DWE="; + hash = "sha256-I9a65KNhL2DV9lLQ5fpLLq1QfKv/9dkw2CIFeubtZnc="; }; postPatch = '' From 08491ea91e94c7b84b821d9c0e5ccb2d13287bc5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 319/673] python3Packages.ovoenergy: 1.2.0 -> 1.3.0 --- .../python-modules/ovoenergy/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index 1e60872b2c1b..005557a2a6e6 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -3,12 +3,15 @@ , buildPythonPackage , click , fetchFromGitHub +, incremental +, pydantic , pythonOlder +, typer }: buildPythonPackage rec { pname = "ovoenergy"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,13 +19,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timmo001"; repo = pname; - rev = "v${version}"; - hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; + rev = "refs/tags/${version}"; + hash = "sha256-ZbLs8w0qeaV2qWP08FKnlZ3fefj15Bw2A2bGpL6/d0I="; }; + nativeBuildInputs = [ + incremental + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "typer==0.6.1" "typer" + ''; + propagatedBuildInputs = [ aiohttp click + pydantic + typer ]; # Project has no tests From 7850963e5d4e0a6c26010f66352ccaaaabbbd1f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 320/673] python3Packages.panel: 0.14.1 -> 0.14.2 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 1271fb3b4da0..9b35cb6ac177 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.1"; + version = "0.14.2"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI="; + hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU="; }; propagatedBuildInputs = [ From ab27d4b784aac6716f0900a00bde4d28c7e09e6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 321/673] python3Packages.parfive: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/parfive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 131d8de094fc..28f69b432079 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parfive"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/b4KrYg0mXoQJ/L+9ol7gD2myB0aLgDj0IWa8sxarKU="; + sha256 = "sha256-kIIR+cXLUtyLJ5YmhyCV88zhXahok/U7QXbezt3PyF0="; }; buildInputs = [ From 3520c79fea38599a22cb1a9c511d5bff9a394684 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 322/673] python3Packages.particle: 0.20.1 -> 0.21.0 --- pkgs/development/python-modules/particle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index d1207fe84983..a804ed19dfb5 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "particle"; - version = "0.20.1"; + version = "0.21.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HoWWwoGMrkRqlYzrF2apGsxsZAHwHbHSO5TCSCelxUc="; + sha256 = "sha256-SDdIg05+gfLNaQ+glitTf3Z/6K9HBci62mjIu9rIoX0="; }; nativeBuildInputs = [ setuptools-scm From 2694b9d7c021e96163cff538eb35ca20557a2b22 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 323/673] python3Packages.parver: 0.3.1 -> 0.4 --- .../python-modules/parver/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index 878b2746758c..7ce7a7a3884f 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -1,32 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, six +, pythonOlder +, setuptools , attrs , pytestCheckHook , hypothesis , pretend , arpeggio +, typing-extensions }: buildPythonPackage rec { pname = "parver"; - version = "0.3.1"; + version = "0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3"; + hash = "sha256-1KPbuTxTNz7poLoFXkhYxEFpsgS5EuSdAD6tlduam8o="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "arpeggio ~= 1.7" "arpeggio" - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ - six attrs arpeggio + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; checkInputs = [ From e6f5bef95ba3dac5d203e8215073dbc3f141a060 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 324/673] python3Packages.path: 16.4.0 -> 16.6.0 --- 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 a22aa64e8b1e..0f8a96be94e1 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.4.0"; + version = "16.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uvLnV8Sxm+ggj55n5I+0dbSld9VhNZDORmk7298IL1I="; + hash = "sha256-vqOBbh1U9OM6rHjSAxoLDtL5XmnbhbRdUfF9+XBx2mk="; }; nativeBuildInputs = [ From b6097e1a1bd7c1d9b5fc725cbd2422983f83ad5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:30 +0100 Subject: [PATCH 325/673] python3Packages.pathos: 0.2.9 -> 0.3.0 --- 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 9c6dd6256606..333f1be21c4e 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.2.9"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/pathos-${version}"; - sha256 = "sha256-39D+itH0nkOzmh3Rpg/HXLRj2F1UPsys+iU0ZiodkM0="; + sha256 = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; }; propagatedBuildInputs = [ From 900a521d817c456eb7d0e46e19c25b6fda4e9ea3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 326/673] python3Packages.pathspec: 0.10.1 -> 0.10.3 --- 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 121f83df2898..66facfd1e132 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.10.1"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0="; + hash = "sha256-ViAN5Ad9nQeRRlqpCVoB1CGGHkBbUJaVUFHe79aX1vY="; }; nativeBuildInputs = [ From 59791d4b010aacfc258a95f6fa9224a33af30c15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 327/673] python3Packages.pdm-pep517: 1.0.4 -> 1.0.6 --- pkgs/development/python-modules/pdm-pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 156226536bcf..94af38104c6c 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.0.4"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OS+MK0fG7CBVDLjhniS529Jzc0E/BntW7Ndfl2f5MBU="; + sha256 = "sha256-pEB3A9UPpNZxODo1SGiwWhMGDBvzgmTLtd3Jpz5KHcU="; }; preCheck = '' From 0d18c3b1a56d3f04efc185cb2fd12f338a3ad2ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 328/673] python3Packages.peewee: 3.15.3 -> 3.15.4 --- 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 089088a09bd3..8351b05c39a8 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.15.3"; + version = "3.15.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6s+JTUYmuP6Y6D+mi8YTznHbPYUS7yk259MuPpm9H/s="; + hash = "sha256-UbhJWooZuZOm1AUbM+66Qm76zar+sBOvuUnAc1vLvOU="; }; buildInputs = [ From bbc8fb4c920efdeb3506f3f2800937b641a13962 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 329/673] python3Packages.pex: 2.1.117 -> 2.1.119 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index b42bb5e4e406..314d3fdfb0e6 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.117"; + version = "2.1.119"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q1dz/xEQuJOrelDAB3YhISK6HPsqBQXGAx7Qgpqq+6w="; + hash = "sha256-QughY8G0Z9/371tlG0VMUqeKW/Nndv9mMbR1AIBlmTA="; }; nativeBuildInputs = [ From e1908edd6eba58c62581fac49cede11487c1f32e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 330/673] python3Packages.phonenumbers: 8.13.2 -> 8.13.3 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 5123b9be6856..ce5c8a2e363d 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.2"; + version = "8.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AXn2iNSMDn4WHre52G1YeUCvH1F0+Xwf39iTxZnA2Uo="; + hash = "sha256-fQxFwVQBOXC3i4b0GI4OAKjnfWvr73yB79wDjbh27ro="; }; checkInputs = [ From d4142f11b9a3a0da0bb074570a87ab3a97df34e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 331/673] python3Packages.phonopy: 2.17.0 -> 2.17.1 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index db88015eaf76..fdfd05a8e497 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.17.0"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bBlNCfq+b73Z/yxIhmP9s2kgjlGz+EKTpI1CnpuqkuU="; + hash = "sha256-t+1i1S8UVd0s9/Fda0H2kaouDDBVS+x6G40Meb2rLYc="; }; propagatedBuildInputs = [ From 09ec532f1c2b3603544f3c4f509ab56c5d29deb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 332/673] python3Packages.piccolo-theme: 0.12.0 -> 0.14.0 --- pkgs/development/python-modules/piccolo-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 8f04d0ce00dc..4a0e3bf0f98b 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - sha256 = "sha256-o6uaqAo/Nb28doByq40XakKJpA4o6/Z/PzMhmb058FE="; + sha256 = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU="; }; propagatedBuildInputs = [ From 8b27759a3a4983c58e128e10ed1efda63caef768 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:31 +0100 Subject: [PATCH 333/673] python3Packages.pint: 0.19.2 -> 0.20.1 --- pkgs/development/python-modules/pint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index b4e68c190946..0dd3650810e1 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pint"; - version = "0.19.2"; + version = "0.20.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "sha256-4dSYn/UQs3ja1k+RcR572r5cp411sGoYVprEVGeMS68="; + sha256 = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc="; }; nativeBuildInputs = [ setuptools-scm ]; From 15870dea7ad73f55554b7f7f3ab709d0bac555c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:32 +0100 Subject: [PATCH 334/673] python3Packages.pip-tools: 6.11.0 -> 6.12.1 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 7a595a85d8fd..78e2952ceae1 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.11.0"; + version = "6.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kMXcFQ44VuRGO4HMyZMHzPlVTl24OT6yc3BcsLj3HGA="; + hash = "sha256-iO+3spqSP/6sBxPm8j74UpzGF1Un1CuT9zdWzJQ4cpM="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; From 77a284c3dacc673bf87d65667e89a931db0d3d4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:32 +0100 Subject: [PATCH 335/673] python3Packages.pkginfo: 1.8.3 -> 1.9.2 --- pkgs/development/python-modules/pkginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index b3f4f1d450bf..5dd176c7ed90 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.8.3"; + version = "1.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qE2kMY3Yb4cKlEeoyYNAqgYha/xvK3vcS4dmmErhhnw="; + sha256 = "sha256-rAPjfk1gGq7kD4CH9j/EoqbJgU3aLI+mqrGxgpZTvfo="; }; checkInputs = [ From fb714af70d4cec3710df5962ecc46e3ab1fdc4c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:32 +0100 Subject: [PATCH 336/673] python3Packages.plantuml-markdown: 3.7.3 -> 3.8.0 --- pkgs/development/python-modules/plantuml-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index 6da64c191315..3c2d4bd7495c 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -11,7 +11,7 @@ }: let pname = "plantuml-markdown"; - version = "3.7.3"; + version = "3.8.0"; in buildPythonPackage { inherit pname version; @@ -20,7 +20,7 @@ buildPythonPackage { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-iRIHq4GmYzNq11t61Lz69amOoG54j50Mc32NsaLNHOk="; + sha256 = "sha256-6zGE3j+AfS5r3dj+4mfT4juxKUODEOgGlnn3wtvPcEk="; }; propagatedBuildInputs = [ From 0a075a8ef706f74149b3c49121072db629c57132 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:32 +0100 Subject: [PATCH 337/673] python3Packages.plaster: 1.0 -> 1.1.2 --- pkgs/development/python-modules/plaster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 749ffdb7f321..ad2e4545cb04 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "plaster"; - version = "1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3"; + sha256 = "sha256-+L78VL+MEUfBCrQCl+yEwmdvotTqXW9STZQ2qAB075g="; }; checkPhase = '' From 077dffd8a50ae02b125d3fec669d47d4511236cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:32 +0100 Subject: [PATCH 338/673] python3Packages.platformdirs: 2.6.0 -> 2.6.2 --- 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 8c0bdb3cb43a..b21e65479bf5 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 = "2.6.0"; + version = "2.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qh5pv+rAFRMMJHr4nhKQ9Ndyvjd2QuSlkIeVcrXPrQI="; + hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d7d8e5291434837e91ff5a8754ed67678802c5b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:32 +0100 Subject: [PATCH 339/673] python3Packages.plotly: 5.10.0 -> 5.11.0 --- 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 f150945a37cb..05e7e15a0086 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.10.0"; + version = "5.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TTbZhZt6FTsnNWLe7tjCklh6Ry6x/VfNQVjsidne+ts="; + sha256 = "sha256-Tv70ecLsHYbc2shAW2ynDKZWSad0COOafoSh6i22x4c="; }; propagatedBuildInputs = [ From c0f0ca33761b45cc4572462571a0ae67185e0414 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:32 +0100 Subject: [PATCH 340/673] python3Packages.plumbum: 1.7.2 -> 1.8.0 --- pkgs/development/python-modules/plumbum/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 70b4421778f3..d9410f246ba5 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = "plumbum"; - rev = "v${version}"; - sha256 = "sha256-bCCcNFz+ZsbKSF7aCfy47lBHb873tDYN0qFuSCxJp1w="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SqZO9qYOtBB+KWP0DLsImI64QTTpYKzWMYwSua9k2S0="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-config=setup.cfg" "" + substituteInPlace pyproject.toml \ + --replace '"--cov-config=setup.cfg", ' "" ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -61,6 +61,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}"; description = " Plumbum: Shell Combinators "; homepage = " https://github.com/tomerfiliba/plumbum "; license = licenses.mit; From 0451b99f7d15a1f352b5ec1b4ad89cb3974400f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:33 +0100 Subject: [PATCH 341/673] python3Packages.plyvel: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/plyvel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index d47805bb643f..09a1c31297b7 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "4ea98bea04ebf0f44747bacdfafefc8827787106fbb787f0aedc46482b2dfd53"; + sha256 = "sha256-zZGOCzFpCrzT0gKodCyvlRqy/hVz3nr3HDhFaEf5ICs="; }; buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; From 90bb0fceca544c5afe01a9b16bddaa430098b916 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:33 +0100 Subject: [PATCH 342/673] python3Packages.poetry: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index ff5d4c91a5d6..83c91e847455 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e60lGOu/g3SahArQXUuW8nIFgReILF5/lPOfOn0qz5o="; + hash = "sha256-yiV2Y0vBF0d7BFfT5wonzRUGHVH040PZrlAUpVTFCZc="; }; nativeBuildInputs = [ From f3bf226a9d556b16ebac5c7bec7d2f9517a33d66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:33 +0100 Subject: [PATCH 343/673] python3Packages.poetry-dynamic-versioning: 0.18.0 -> 0.21.3 --- .../python-modules/poetry-dynamic-versioning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 00baeef1185b..e42228eb3b4e 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.18.0"; + version = "0.21.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UO2D80cZurfPCtDXAEQ4nOJdhNtIghLtZN7gL+9xbGc="; + hash = "sha256-LdcjzfOiKar0BCdU7W+N5adErdk/NOUf+FzeaMlfn3w="; }; nativeBuildInputs = [ From b469261cfc790bd92aae22e02e83db15102754b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:33 +0100 Subject: [PATCH 344/673] python3Packages.ppft: 1.7.6.5 -> 1.7.6.6 --- pkgs/development/python-modules/ppft/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 15597188135f..d53ac9acddbb 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.5"; + version = "1.7.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R+DauHpRbAuZks1bDJCDSOTH2WQwTRBrIn+tKK4DIZ4="; + sha256 = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE="; }; propagatedBuildInputs = [ @@ -26,8 +26,9 @@ buildPythonPackage rec { # darwin seems to hang doCheck = !stdenv.isDarwin; checkPhase = '' - cd examples + runHook preCheck ${python.interpreter} -m ppft.tests + runHook postCheck ''; pythonImportsCheck = [ From a8e5d43300a1f380349bf911a018a71697281bbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:33 +0100 Subject: [PATCH 345/673] python3Packages.prettytable: 3.4.1 -> 3.5.0 --- .../python-modules/prettytable/default.nix | 50 ++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 922f85990db7..6df087e3e68e 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -1,24 +1,35 @@ { lib , buildPythonPackage -, fetchPypi -, glibcLocales -, setuptools-scm +, fetchFromGitHub +, pythonOlder +, hatch-vcs +, hatchling , wcwidth , importlib-metadata -, pythonOlder +, pytest-lazy-fixture +, pytestCheckHook }: buildPythonPackage rec { pname = "prettytable"; - version = "3.4.1"; + version = "3.5.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-fX3YTQsgby2qxEcacvKZ1pB/NFFgZP6yg44zOk4lZ70="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = "prettytable"; + rev = "refs/tags/${version}"; + hash= "sha256-J6oWNug2MEkUZSi67mM5H/Nf4tdSTB/ku34plp1XWCM="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ glibcLocales ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; propagatedBuildInputs = [ wcwidth @@ -26,18 +37,21 @@ buildPythonPackage rec { importlib-metadata ]; - preCheck = '' - export LANG="en_US.UTF-8" - ''; + checkInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; - # no test no longer available in pypi package - doCheck = false; - pythonImportsCheck = [ "prettytable" ]; + pythonImportsCheck = [ + "prettytable" + ]; meta = with lib; { - description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = "http://code.google.com/p/prettytable/"; + changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; + description = "Display tabular data in a visually appealing ASCII table format"; + homepage = "https://github.com/jazzband/prettytable"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 7b06e06240e11d6fdf8430719badd7d4e015ffec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:33 +0100 Subject: [PATCH 346/673] python3Packages.prompt-toolkit: 3.0.31 -> 3.0.36 --- 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 038575794bd3..ad0281d7eeb6 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.31"; + version = "3.0.36"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "sha256-mtqVLJ0Xh/Uv9tXzSE0LTfiVJ4fAh+32offCyx6ogUg="; + sha256 = "sha256-PhY/JUvvWgOxRjl9fBljvT4oEvCWS7miTm7HYf0o22M="; }; propagatedBuildInputs = [ From 8ed4c4d45609cc12a5f78c0b9a3ee16bec39ea72 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:33 +0100 Subject: [PATCH 347/673] python3Packages.pyathena: 2.14.0 -> 2.19.0 --- pkgs/development/python-modules/pyathena/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 15b43db0e5b4..d49488ffc3d1 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.14.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "PyAthena"; - inherit version; - hash = "sha256-1DeqvlHlOt781nObnPdgZo3JqjwcK8lSREXqUNoKhhU="; + inherit pname version; + hash = "sha256-59NH4HIhgDOxwgSUJq71ewpQTn2sbpNNT9Q3nj8qJss="; }; propagatedBuildInputs = [ From 6316223bd08f29e139740d4dda88207f0b711a64 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:34 +0100 Subject: [PATCH 348/673] python3Packages.PyAudio: 0.2.12 -> 0.2.13 --- pkgs/development/python-modules/pyaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index 82f2b685d268..365a8565db65 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "PyAudio"; - version = "0.2.12"; + version = "0.2.13"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54="; + sha256 = "sha256-JrzMgeQkPRwP9Uh+a0gd5jKfzWXHk2XCZ87zjzY6K1Y="; }; buildInputs = [ pkgs.portaudio ]; From 6df4b29f69791f83b0b7eda67be3fa0eb5a95d8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:34 +0100 Subject: [PATCH 349/673] python3Packages.pybids: 0.15.3 -> 0.15.5 --- 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 18717f40f4fe..6bedbefb1954 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.15.3"; + version = "0.15.5"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TZnJebxLwgnP9woC0downJv4xrAzjioLZuvqd8fzxGE="; + sha256 = "sha256-ryIiWpFoh0KSmyLI4LDn+EkXEYwDIr8/A7opoZJ+bo4="; }; propagatedBuildInputs = [ From 3fbf757238f992c74383ba9c80a960a6ef3865d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:34 +0100 Subject: [PATCH 350/673] python3Packages.pycairo: 1.21.0 -> 1.23.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 ee77b3e10358..5d17ecef0386 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.21.0"; + version = "1.23.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cwkGN5O15DduCLkFWeh8DPO4lY64iIlCQaUsCBKB8Mw="; + sha256 = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; }; nativeBuildInputs = [ From 0abf95169fbf7d4b55d69c21e9d0e5d048c31499 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:34 +0100 Subject: [PATCH 351/673] python3Packages.pyclip: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/pyclip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index 6a344365b25b..a1a17fd8dc59 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyclip"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spyoungtech"; repo = pname; - rev = "v${version}"; - hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4="; + rev = "refs/tags/v${version}"; + hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM="; }; postPatch = '' From 682144d79934f24c1dce27f82cc627fd4a98b492 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:34 +0100 Subject: [PATCH 352/673] python3Packages.pyclipper: 1.3.0.post3 -> 1.3.0.post4 --- 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 9216f0d5b893..2f0f500f6784 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.post3"; + version = "1.3.0.post4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-viBnmzbCAH9QaVHwUq43rm11e8o3N/jtGsGpmRZokaw="; + hash = "sha256-FMqOZ0WOorTtbdweeu9UdoUNWOPrcwc+0SK+55XxyQQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From a4c28ebbbd031ee6933d9b1819e71d16ceabcf4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:34 +0100 Subject: [PATCH 353/673] python3Packages.pycm: 3.6 -> 3.7 --- pkgs/development/python-modules/pycm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index f3817a16d996..a2c3cb01511c 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.6"; + version = "3.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-96M/QKt4AdiZoZ7L9AHocSyZPkwEb2iuRJKW3rVP3hc="; + sha256 = "sha256-Yow5MVbaBgKA7U6RNpS/Yh1mG3XSLKPSDsUeBRSln1U="; }; propagatedBuildInputs = [ From af09c188704cf3ff8d1f609b5c090dd9ecd619b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 354/673] python3Packages.pycognito: 2022.08.0 -> 2022.12.0 --- pkgs/development/python-modules/pycognito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index c0e0043d0597..6f425f10bf21 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.08.0"; + version = "2022.12.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-A80iYF2zwM2YkhnwJMU/bZezsCzs389ro1fikG8vXSA="; + sha256 = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; }; propagatedBuildInputs = [ From bcf7a4ca43366da7b15684c8f830307bc3250143 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 355/673] python3Packages.pycuda: 2022.1 -> 2022.2.2 --- pkgs/development/python-modules/pycuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index c0ea080396bd..e2a41cca4a3a 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -24,11 +24,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2022.1"; + version = "2022.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rNkDDZPnbmCxIuM60WvPAbsTRPTDBN7f8c0r/7DzE6M="; + sha256 = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs="; }; preConfigure = with lib.versions; '' From 0a8c2d347d863200e8e42d5e963e65398bbef85e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 356/673] python3Packages.pydantic: 1.9.2 -> 1.10.4 --- .../development/python-modules/pydantic/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 31f456dabc68..e0f342f72217 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, autoflake , cython , devtools , email-validator @@ -9,6 +10,7 @@ , pytestCheckHook , python-dotenv , pythonOlder +, pyupgrade , typing-extensions # dependencies for building documentation. # docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245 @@ -27,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.9.2"; + version = "1.10.4"; outputs = [ "out" @@ -41,7 +43,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZGFxyQ1qD3zZWTdfTeoGj3UcUwAzO8K0DySdVAsMHyI="; + sha256 = "sha256-BFyv1uVq2pLcJeS5955G/pDA3ce9YTqZ6F7kAkwnuvY="; }; postPatch = '' @@ -65,8 +67,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + autoflake devtools email-validator + pyupgrade python-dotenv typing-extensions ]; @@ -76,6 +80,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # https://github.com/pydantic/pydantic/issues/4817 + "-W" "ignore::pytest.PytestReturnNotNoneWarning" + ]; + preCheck = '' export HOME=$(mktemp -d) ''; From a9e8c1393d29390f1454432d8c52a6a0d494772d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 357/673] python3Packages.pyfakefs: 4.6.3 -> 5.0.0 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index bac9202a2b22..67364ba58ebd 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.6.3"; + version = "5.0.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bfEqfPZXY3obA2vCAFlyfGQvkpkOkP7i+wA9qjzabKE="; + sha256 = "sha256-GdHY8e5SCJHXi27QXCB44HktVF+D3uM0YfuqXMcuGH0="; }; postPatch = '' From 455ed05201ab6d2bd45232facd2de0abc09d8022 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 358/673] python3Packages.pygame-gui: 064 -> 067 --- 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 7404a5fefcbb..f57004f3727d 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 = "064"; + version = "067"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - sha256 = "sha256-13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; + sha256 = "sha256-ZBd9jq+20A8kxsvZxuCIfyzuZvk5/73vhh4xmExuwGQ="; }; propagatedBuildInputs = [ pygame python-i18n ]; From 52ba811bcb7ee5cb95584192ff62b73cbe7f1afe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 359/673] python3Packages.pygeos: 0.13 -> 0.14 --- pkgs/development/python-modules/pygeos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index 3b22c119ba20..c6ce198ee26d 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pygeos"; - version = "0.13"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HDcweKrVou/tHDnNcceXqiAzvzCH8191FrrIm+ULmGE="; + sha256 = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM="; }; patches = [ From 23161011bb137abcbe38bd7321c3aa35f1eefb79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 360/673] python3Packages.pygit2: 1.10.1 -> 1.11.1 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 413b79c562b1..35230d44a5aa 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.10.1"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NUZRvwYsAtHwgEHW+/GptL96k6/OZZeb3Ai9xlZTqi4="; + hash = "sha256-eT9YP9M2IPCsODdtsPV3aO8pIribRZ51saxEA3frZOw="; }; preConfigure = lib.optionalString stdenv.isDarwin '' From 9b10cac84e752ded4d83e0081d284ebeb61ad906 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:35 +0100 Subject: [PATCH 361/673] python3Packages.pyglet: 1.5.27 -> 2.0.2.1 --- pkgs/development/python-modules/pyglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index f1c4bb44d9ae..b8aa22e9251b 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.27"; + version = "2.0.2.1"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TQDgZ0UfOxD9UbaXZP3atlRENyoto0TuKzXwqObr8AU="; + sha256 = "sha256-WonGjdooD3Yb3rAha536An+y4nUZoOo8FvZViyBPHl8="; extension = "zip"; }; From 71b0df651059029cd48beb46f7eac88d19d56bba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 362/673] python3Packages.pygmt: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/pygmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index a2a993de7f17..83c7bc5cc0fa 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Z38fZvmeWDLZEIyH+UG6Nb6KNnjEuXIn3RRH4CPWz9A="; + sha256 = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE="; }; postPatch = '' From a653dbcd1a12621fe5a8e6701b000d5a18d99bc2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 363/673] python3Packages.pyjwt: 2.5.0 -> 2.6.0 --- pkgs/development/python-modules/pyjwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index a46a05ba9c23..bd3b33578d05 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - sha256 = "sha256-53q4lICQXYaZhEKsV4jzUzP6hfZQR6U0rcOO3zyI/Ds="; + sha256 = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0="; }; postPatch = '' From 1c0fb6690f466f0cb9465860b049d4553bbb8ae7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 364/673] python3Packages.pykdtree: 1.3.5 -> 1.3.6 --- pkgs/development/python-modules/pykdtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index b4b442945962..642e5ba9d581 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c0L3XnMRA+ZT/B9rn9q8JBDPkrbnsGFggEp1eGybV0c="; + sha256 = "sha256-eAtpPQVVuFfXqrMeNdQpO/Tr253sekW6S7I7RAD2Jtw="; }; buildInputs = [ openmp ]; From fc590165ee6b336b3f8490edbd72c34f4090d2a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 365/673] python3Packages.pylink-square: 0.14.2 -> 1.0.0 --- pkgs/development/python-modules/pylink-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index e572ec542fbc..af522cd2171b 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.14.2"; + version = "1.0.0"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-4jmFU8jlrEAYTAQH+uQCWrzqwKX4onb7Xk4iTYzx9dI="; + hash = "sha256-05mg2raHiKg0gHxF/7zFd81C/8OrhStThMwEnpaFGSc="; }; propagatedBuildInputs = [ psutil six future ]; From 19d8e24671a04ca88149c8c846d50ece6e575aea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 366/673] python3Packages.pylsp-mypy: 0.6.3 -> 0.6.4 --- .../python-modules/pylsp-mypy/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index dbb35d71c5dd..aef852cafc55 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,17 +20,9 @@ buildPythonPackage rec { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4="; + hash = "sha256-BpYg2noReHFgJ/5iQI09XUWNAN7UdcYgqpZ/IPr17Ao="; }; - patches = [ - (fetchpatch { - name = "0001-adapt-test-to-latest-mypy.patch"; - url = "https://github.com/python-lsp/pylsp-mypy/commit/99cf687798464f810b128881dbbec82aa5353e04.patch"; - sha256 = "sha256-wLaGMaW/gTab2fX7zGnemLQQNDWxBURYb7VsgEas61Y="; - }) - ]; - propagatedBuildInputs = [ mypy python-lsp-server From 7fcc42532dfb471207ab9bf1d806f6d970bac5d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 367/673] python3Packages.pymavlink: 2.4.35 -> 2.4.37 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index baa31b40e342..d9b51d9d0755 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.35"; + version = "2.4.37"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P2pqcxI6w9cw4b26g5ad5CeW9Sf1fNN0FGiIzOWfOCU="; + sha256 = "sha256-dU561/kOBW++mrfzX/kqNVPgi7m/QniBrCJxBD/fZ1Y="; }; propagatedBuildInputs = [ future lxml ]; From 5bc47c33bde8b1e904931f117d121c3d1f4f36a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 368/673] python3Packages.pymc: 4.4.0 -> 5.0.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 b61766324130..8603eeabdee1 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "4.4.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-ZBltvvKXfqHYLeYOEYFK8kQc0wHM9+UHLRJFMSYX4Ow="; + hash = "sha256-uWvzWbZyRRE8L9X9+azmN+1JYahwwNSYCk2fQ/C8Yi0="; }; nativeBuildInputs = [ From 06f7e081179140d73f100c8d767848e6974aaaf6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:36 +0100 Subject: [PATCH 369/673] python3Packages.pymdown-extensions: 9.5 -> 9.9 --- .../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 08749312580c..a360517eb128 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -38,14 +38,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.5"; + version = "9.9"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - sha256 = "sha256-bgvoY+8bbGoG1A93A+Uan1UDpQmEUu/TJu3FOkXechQ="; + sha256 = "sha256-JZtze6KjiBJGEQzA8lsTShhZu96wxAr4KeKzCe0A18Q="; }; nativeBuildInputs = [ hatchling ]; From 3705a350630728dd68654de2bb6b4830ec14af45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 370/673] python3Packages.PyMeeus: 0.5.11 -> 0.5.12 --- pkgs/development/python-modules/pymeeus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 162f3ab55966..8cece9b0e67a 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyMeeus"; - version = "0.5.11"; + version = "0.5.12"; src = fetchPypi { inherit pname version; - sha256 = "bb9d670818d8b0594317b48a7dadea02a0594e5344263bf2054e1a011c8fed55"; + sha256 = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; checkInputs = [ pytest ]; From 499963505a8f6a3d0a73a37c80971ef25f1e557a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 371/673] python3Packages.pymodbus: 2.5.3 -> 3.0.2 --- pkgs/development/python-modules/pymodbus/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 41babc82175e..bb002a0fe8eb 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -9,6 +9,7 @@ , pygments , pyserial , pyserial-asyncio +, pytest-asyncio , pytestCheckHook , redis , sqlalchemy @@ -18,13 +19,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.3"; + version = "3.0.2"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7zuFKJuKc+J4g7qoK22xed8dmXJatQbQXz4aKAOcvN8="; }; # Twisted asynchronous version is not supported due to a missing dependency @@ -41,6 +42,7 @@ buildPythonPackage rec { checkInputs = [ asynctest mock + pytest-asyncio pytestCheckHook redis sqlalchemy From ed7b04272413c24853ea20c4ba736222a1fc7d31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 372/673] python3Packages.pymongo: 4.2.0 -> 4.3.3 --- pkgs/development/python-modules/pymongo/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 285a729eb894..292e7fceead6 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,18 +2,25 @@ , buildPythonPackage , fetchPypi , pythonOlder +, dnspython }: buildPythonPackage rec { pname = "pymongo"; - version = "4.2.0"; - disabled = pythonOlder "3.6"; + version = "4.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cvM49qq9N9NDvZ0f3T3pIRBNOVdmvMXNxAOeTC3Zd2Y="; + hash = "sha256-NOlf+wpov/vDtDfy0fJfyRb+899c3u0JktpfQvrpuAc="; }; + propagatedBuildInputs = [ + dnspython + ]; + # Tests call a running mongodb instance doCheck = false; From 78bbaa84a295ef6f44a3f2c074b902098b817544 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 373/673] python3Packages.pymupdf: 1.21.0 -> 1.21.1 --- 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 8095ee1b7c0c..075444ca17bd 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.21.0"; + version = "1.21.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMuPDF"; inherit version; - hash = "sha256-pj38KJ4SeharYDEO5gBf6DEhx6l/fBINtoj5KByeXQ8="; + hash = "sha256-+BV0GkNcYqADa7y/X6bFM1Z71pxTONQTcU/FeyLbk+A="; }; postPatch = '' From e518314491ee856ca49ad9a09005133d698c087f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 374/673] python3Packages.pynina: 0.1.8 -> 0.2.0 --- pkgs/development/python-modules/pynina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index be81bd6e6557..03f83f54494c 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.8"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0="; + sha256 = "sha256-2Ujq2+6xQXPjKzK3HQbJnjz8cX3ALUV+22gdQflFxFY="; }; propagatedBuildInputs = [ From c2a599e390356c8c2223b99bf60741097a676d90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 375/673] python3Packages.pynrrd: 0.4.3 -> 1.0.0 --- pkgs/development/python-modules/pynrrd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix index 91cff70bae35..a0a884297737 100644 --- a/pkgs/development/python-modules/pynrrd/default.nix +++ b/pkgs/development/python-modules/pynrrd/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynrrd"; - version = "0.4.3"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mhe"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4UM2NAKWfsjxAoLQCFSPVKG5GukxqppywqvLM0V/dIs="; + hash = "sha256-R/bUItF2BaKTFdMNBHFJKq0jSX6z49e8CGXENUn07SU="; }; propagatedBuildInputs = [ From 04d43b16e161612f4627f81ac071f160d50008a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 376/673] python3Packages.pyprecice: 2.4.0.0 -> 2.5.0.1 --- pkgs/development/python-modules/pyprecice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 621850742af2..d9172c959550 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "2.4.0.0"; + version = "2.5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg="; + hash = "sha256-0dxWtlN3x3orBgtCTxTsql39+MBVsgeHO7gXjOO8qcA="; }; nativeBuildInputs = [ From fb45efabed13fcbbde14e88fb36c8af8f278b9cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:37 +0100 Subject: [PATCH 377/673] python3Packages.pyro-ppl: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index b0cc9c7f91cd..48bc622f4adb 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-4Afl0ROCpY78+4+61xxy6vEGbIZsaNxURXDEGMGCiks="; + hash = "sha256-Pt1DgbAg0S6KtQ6+ApjHpo0VC4oCT5mK2G/ax6MI1Q4="; }; propagatedBuildInputs = [ From b7c37b77ae973328a5dfc2cfdb98f7a693cf05fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:38 +0100 Subject: [PATCH 378/673] python3Packages.pyrsistent: 0.18.1 -> 0.19.3 --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 5a1b66bfa26c..35758684474f 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.18.1"; + version = "0.19.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y="; + sha256 = "sha256-GimUdzcGu7SZXDGpe8lPFBgxSSO9EEjG2WSDcEA3ZEA="; }; propagatedBuildInputs = [ six ]; From 6a7f77ee6a76d4272c010ae334b4eb8108207993 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:38 +0100 Subject: [PATCH 379/673] python3Packages.pysam: 0.19.1 -> 0.20.0 --- pkgs/development/python-modules/pysam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 55883383c61d..461d0c19d854 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.19.1"; + version = "0.20.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-fbvfobffLha1eFatnHvh0tOYcuMRLTmy/BJ9QXFHx2o="; + sha256 = "sha256-7yEZJ+iIw4qOxsanlKQlqt1bfi8MvyYjGJWiVDmXBrc="; }; nativeBuildInputs = [ samtools ]; From 940d6dab6f84d0a12d75f0258ded1695ce7e8bbc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:38 +0100 Subject: [PATCH 380/673] python3Packages.pysensibo: 1.0.22 -> 1.0.24 --- 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 4fd0bacc89e6..ad68da4478db 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.22"; + version = "1.0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrey-git"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AUcdKcdoYCg8OgUcFoLLpNK5GQMTg89XCR5CkTfNkcc="; + hash = "sha256-lLorBf4HjynkTyLfKGcxEpSzyCawjKDej/HFtHl/Ar8="; }; propagatedBuildInputs = [ From 8e38f2c57917b07e754e51107e2f3663d84f60a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:38 +0100 Subject: [PATCH 381/673] python3Packages.pysigma: 0.8.9 -> 0.8.10 --- pkgs/development/python-modules/pysigma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 82fde07aef48..33737c42de4f 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.8.9"; + version = "0.8.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-SXZ6bo1b5xhVGSlWr51ZCxT0Ov1g/qd8V43P5KEhY+s="; + hash = "sha256-/MprHx4MlbdY22K8hWDPj7owwZcgWjRyVYDrPqB3oIE="; }; nativeBuildInputs = [ From 93c2e912c092d98e2b20a3e48cffd1c5fdf771cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:38 +0100 Subject: [PATCH 382/673] python3Packages.pysmb: 1.2.8 -> 1.2.9 https://github.com/miketeo/pysmb/releases/tag/pysmb-1.2.9 --- .../python-modules/pysmb/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 01f30bf2d5f1..497f76c9ec93 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -1,26 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pyasn1 , pythonOlder +, tqdm }: buildPythonPackage rec { pname = "pysmb"; - version = "1.2.8"; + version = "1.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - format = "setuptools"; - extension = "zip"; - hash = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U="; + src = fetchFromGitHub { + owner = "miketeo"; + repo = "pysmb"; + rev = "refs/tags/pysmb-${version}"; + hash = "sha256-2AZAtypotSVXWfwokUpfWYQMiMq6EgbdBx2G7bU0Cqw="; }; propagatedBuildInputs = [ pyasn1 + tqdm ]; # Tests require Network Connectivity and a server up and running @@ -33,6 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/miketeo/pysmb/releases/tag/pysmb-${version}"; description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines"; homepage = "https://miketeo.net/wp/index.php/projects/pysmb"; license = licenses.zlib; From cf1095c963811314f284002010162379f1fe84fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:38 +0100 Subject: [PATCH 383/673] python3Packages.pyspellchecker: 0.7.0 -> 0.7.1 --- .../python-modules/pyspellchecker/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index 425d1a67f136..462ed0f0b139 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.7.0"; - format = "setuptools"; + version = "0.7.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zKbDJCjuOI0Vsbh+lK/Dv5T7GGK6hIo7RJvs1inSatM="; + src = fetchFromGitHub { + owner = "barrust"; + repo = "pyspellchecker"; + rev = "refs/tags/v${version}"; + hash = "sha256-DM1Q8OirFMoYqjdSnsNL5r7Zxffxc0DEXwv1W6y8GnE="; }; - # no tests in PyPI - doCheck = false; + nativeBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Pure python spell checking"; From 014b3ef19242cfd8a65e447b60c66ca3cb794dd2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:38 +0100 Subject: [PATCH 384/673] python3Packages.pyspnego: 0.5.3 -> 0.7.0 --- 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 966fb6679237..303310a6b5dc 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.5.3"; + version = "0.7.0"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-awlS1VHXj6n9Ee4qUI1x5tEdkMF/ZEr9NPKh4ICkv3g="; + sha256 = "sha256-FtXHbPilQKqo/pmFAYRCoSHkq2fIhP9DYi8kNNBz7uM="; }; propagatedBuildInputs = [ From 1f1be99a018bbb0f5f46bd20b1a7092186426c59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 385/673] python3Packages.py-sr25519-bindings: 0.1.5 -> 0.2.0 --- .../python-modules/py-sr25519-bindings/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 9db6cc998956..c2c8d961f6cc 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-sr25519-bindings"; - version = "0.1.5"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "polkascan"; repo = "py-sr25519-bindings"; - rev = "a97398b386c10ebe0a1f6c45dea466add0d407ce"; - sha256 = "sha256-RJfwWeD82J5QqY+qq2bC3vlqT75jUwhTXuIsza4qUzk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE="; }; cargoDeps = rustPlatform.importCargoLock { From e4bd212f03817605fa4da75a4176ccaf4f1e6eae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 386/673] python3Packages.PyStemmer: 2.0.1 -> 2.2.0 --- .../python-modules/pystemmer/default.nix | 59 +++++++++++++++++-- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 120867f389cc..dd258c380c6f 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -1,22 +1,69 @@ -{ lib, python, fetchPypi, buildPythonPackage, cython }: +{ lib +, python +, fetchPypi +, fetchFromGitHub +, fetchpatch +, buildPythonPackage +, cython +, libstemmer + }: buildPythonPackage rec { pname = "PyStemmer"; - version = "2.0.1"; + version = "2.2.0"; + format = "setuptools"; - src = fetchPypi { + src' = fetchPypi { inherit pname version; - sha256 = "9b81c35302f1d2a5ad9465b85986db246990db93d97d3e8f129269ed7102788e"; + sha256 = "sha256-4hcbkbhrscap3d8J6Mhn5Ij4vWm94H0EEKNc3O4NhXw="; + }; + + src = fetchFromGitHub { + owner = "snowballstem"; + repo = "pystemmer"; + rev = "refs/tags/v${version}"; + hash = "sha256-bJVFeO7XP+aZ2nowQiuws5ziL/FmS1eaOllW6QxA70U="; }; nativeBuildInputs = [ cython ]; - preBuild = '' - cython src/Stemmer.pyx + patches = [ + (fetchpatch { + # Allow building with system libstemmer + url = "https://github.com/snowballstem/pystemmer/commit/2f52b4b2ff113fe6c33cebe14ed4fd4388bb1742.patch"; + hash = "sha256-JqR/DUmABgWaq23CNjoKSasL0mNhM2QuU986mouK6A8="; + }) + (fetchpatch { + # Fix doctests + url = "https://github.com/snowballstem/pystemmer/commit/b2826f19fe8ba65238b5f3b4cee7096a698f048e.patch"; + hash = "sha256-VTZydjYaJJ/KoHD4KbON36kZnkuAyO51H0Oeg6VXTqg="; + }) + ]; + + postConfigure = '' + export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include" ''; + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev libstemmer}/include" + ]; + + NIX_CFLAGS_LINK = [ + "-L${libstemmer}/lib" + ]; + + #preBuild = '' + # cython src/Stemmer.pyx + #''; + + pythonImportsCheck = [ + "Stemmer" + ]; + checkPhase = '' + runHook preCheck ${python.interpreter} runtests.py + runHook postCheck ''; meta = with lib; { From 0140880e76c29446618a8ab00c98c815c4c53499 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 387/673] python3Packages.pyswitchbee: 1.6.2 -> 1.7.16 --- pkgs/development/python-modules/pyswitchbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 58466f0d9b80..01bf784e3856 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.6.2"; + version = "1.7.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-MDutpeHI6MW1VwCRTPJK/y08ee4eidOHluMf6lPQfEk="; + hash = "sha256-n04N7wfCBJIbwEEHJ6I1Lt3rpZg46umGPawShlXDuZ8="; }; postPatch = '' From 89d8078be9d1f7a3e222b9fa4ae3d43f8653ea92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 388/673] python3Packages.pyswitchbot: 0.30.1 -> 0.36.1 --- .../development/python-modules/pyswitchbot/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 8100fcea5157..df5cf9d79607 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -1,15 +1,18 @@ { lib , bleak , bleak-retry-connector +, boto3 , buildPythonPackage +, cryptography , fetchFromGitHub , pythonOlder , pytestCheckHook +, requests }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.30.1"; + version = "0.36.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,12 +21,15 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-5Rn1hQ1TZhRiCJGJCaA1sl+HnerL/oOhRdMiSl1Recg="; + hash = "sha256-eXCHmtdizRJJdwFeZU0yLi8NWwMqbET6ZItQQClYVI4="; }; propagatedBuildInputs = [ bleak bleak-retry-connector + boto3 + cryptography + requests ]; checkInputs = [ From c39bbc6e1612e4f0c141348d9df3ae20e595e252 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 389/673] python3Packages.pyTelegramBotAPI: 4.7.0 -> 4.8.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 03ed9fc5884d..73cbce9161a9 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sVu518B+PDSpW6MhYtNWkPpwuT471VfGuDDtpL7Mo/U="; + hash = "sha256-6nfpXzq2yCVDK8pAuWzAVzr0pKn5VHqb3UH9VXhSHJ0="; }; propagatedBuildInputs = [ From db4920aac2572f278351cb1559422dbe71b2df80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 390/673] python3Packages.pytest-bdd: 6.0.0 -> 6.1.1 --- .../python-modules/pytest-bdd/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index cfae0cb2bf95..8490fba2b369 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,48 +1,49 @@ { lib , buildPythonPackage , fetchFromGitHub -, execnet -, glob2 , Mako -, mock , parse , parse-type -, py +, poetry-core , pytest , pytestCheckHook , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "6.0.0"; - format = "setuptools"; + version = "6.1.1"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1dyAhvEw8gUe78qDpgrcwl6grWKiwPgSe/QeFAjBzZg="; + hash = "sha256-+76jIgfDQPdIoesTr1+QUu8wmOnrdf4KT+TJr9F2Hqk="; }; + nativeBuildInputs = [ + poetry-core + ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ - glob2 Mako parse parse-type - py + typing-extensions ]; checkInputs = [ pytestCheckHook - execnet - mock + setuptools ]; preCheck = '' From 65625811e2cdd7d5faab55a2ad87d73653bc77fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 391/673] python3Packages.pytest-check: 1.0.10 -> 1.3.0 --- pkgs/development/python-modules/pytest-check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index f13cf9bba100..bda2aec16cf6 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.0.10"; + version = "1.3.0"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-ng7c10Dyxb5qbO22TDkNl5wAzXg2eYrLO21sjtEBoio="; + hash = "sha256-o4eWjWJSVzjNnzalKAEzFtfZFc8Mz1vhRqOOf/+gu6k="; }; buildInputs = [ From d38e9e7f7cf2aa65c9522c4f4512ea8bc1e323b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 392/673] python3Packages.pytest-cov: 3.0.0 -> 4.0.0 --- pkgs/development/python-modules/pytest-cov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 971b12dc01c7..88e77f9f7ce9 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"; + sha256 = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA="; }; buildInputs = [ pytest ]; From 837057ad441a6bc1e7a340112767efa80e8bbebc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: [PATCH 393/673] python3Packages.pytest-env: 0.6.2 -> 0.8.1 --- .../python-modules/pytest-env/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 72df18c88475..6947f56b8b11 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -1,15 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, hatch-vcs +, hatchling +, pytest +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-env"; - version = "0.6.2"; + version = "0.8.1"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "1hl0ln0cicdid4qjk7mv90lw9xkb0v71dlj7q7rn89vzxxm9b53y"; + pname = "pytest_env"; + inherit version; + hash = "sha256-17L1Jz7G0eIhdXmYvC9Q0kdO19C5MxuSVWAR+txOmr8="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Pytest plugin used to set environment variables"; From dbf99fbf180bfd77e6f83f177e3dbeaeef829bbf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 394/673] python3Packages.pytest-html: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/pytest-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 78b2de292f1d..dea7f772f78f 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "3.1.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3"; + sha256 = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; }; nativeBuildInputs = [ setuptools-scm ]; From bfffe9f517482b840696b42d0da097f6959b0978 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 395/673] python3Packages.pytest-httpx: 0.21.0 -> 0.21.2 --- pkgs/development/python-modules/pytest-httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 6a66727b1ebb..45c094d9f3c2 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.21.0"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; - rev = "v${version}"; - hash = "sha256-mUzmtZCguaab4fAE7VcUhv+NQVYiPpxxHpiVVlzwrIo="; + rev = "refs/tags/v${version}"; + hash = "sha256-pIYSXmOxLfWknWTfrnhslx76UMSSlnqzFE7qvJo1mz4="; }; buildInputs = [ From bdf5d789720d73f9598c09011f27cc09985937ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 396/673] python3Packages.pytest-metadata: 2.0.2 -> 2.0.4 --- .../pytest-metadata/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 321aacb5c704..7555ed351ea4 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,24 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, poetry-core , pytest +, pytestCheckHook , pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "pytest-metadata"; - version = "2.0.2"; + version = "2.0.4"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-/NL0FvFb4pWUNSezyLoWpErlpxQZOckMPcXOnRZ88qU="; + pname = "pytest_metadata"; + inherit version; + hash = "sha256-/MZT9l/jA1tHiCC1KE+/D1KANiLuP2Ci+u16fTuh9B4="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + poetry-core + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Plugin for accessing test session metadata"; From 7142d8529acdd689bee6890525690992c8a2e1b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 397/673] python3Packages.pytest-mypy: 0.9.1 -> 0.10.3 --- pkgs/development/python-modules/pytest-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index bec0ee59d0c5..e4d368bf61d4 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.9.1"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w="; + sha256 = "sha256-+EWPZCMj8Toso+LmFQn3dnlmtSe02K3M1QMsPntP09s="; }; nativeBuildInputs = [ setuptools-scm ]; From b30f07c456ad96d32412ed736ec0f463ba5a62e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 398/673] python3Packages.pytest-quickcheck: 0.8.6 -> 0.9.0 --- pkgs/development/python-modules/pytest-quickcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 99d65ec28669..0a7c1907635f 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-quickcheck"; - version = "0.8.6"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3ef9bde7ba1fe6470c5b61631440186d1254e276c67a527242d91451ab7994e5"; + sha256 = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY="; }; buildInputs = [ pytest ]; From a74ef53ea9fc30d9c6aa2f65c506247954fca37d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 399/673] python3Packages.pytest-regressions: 2.3.1 -> 2.4.1 --- .../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 99099d3ac924..08269f054ae9 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.3.1"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0="; + sha256 = "sha256-Jk0j6BMt7rV0Qc9Ga3tdtEV5fzRucrZyyVt/UqR78Bs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 21d87dc6a281f96489491efe5377a408a114c799 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 400/673] python3Packages.pytest-rerunfailures: 10.2 -> 10.3 --- .../python-modules/pytest-rerunfailures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 9b16760b23b8..8ea63cfa5ff4 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "10.2"; + version = "10.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9e1e1bad51e07642c5bbab809fc1d4ec8eebcb7de86f90f1a26e6ef9de446697"; + sha256 = "sha256-2CRNeZ+Jpu215XMB3a6ztvENZpFjjVHoCzcTEVkuKMY="; }; buildInputs = [ pytest ]; From a41745eb2cec309b30bb52e3077db2021bb22d05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 401/673] python3Packages.pytest-sugar: 0.9.5 -> 0.9.6 --- pkgs/development/python-modules/pytest-sugar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 9b59eb2e55b8..4377990df3c3 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-sugar"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7qeLbxW2NSd9PZAoDNOG2P7qHKsPm+dZR6Ym6LArR30="; + sha256 = "sha256-xHk0lfPDLhFPD1QWKQlGwxbrlq1aNoTc2t2pJn5Zsrg="; }; buildInputs = [ pytest ]; From 297ad1ff734f2911cb4574f59deccaa7397ba1d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:40 +0100 Subject: [PATCH 402/673] python3Packages.pytest-testmon: 1.4.0 -> 1.4.2 --- pkgs/development/python-modules/pytest-testmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 4748cdedf81b..1b9ab4c8336c 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.4.0"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PVLXOBTo2xnMBM4wyvrmGgyztW0ajGxMU+oIhrjZiw8="; + hash = "sha256-3tYW0RWRbbGKbPpXWuqJ79sRWMj+vnffS0XNa7Yb0fw="; }; buildInputs = [ From e51a24258b304e7b0f2cd7c9ebfaf4a51b713070 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:41 +0100 Subject: [PATCH 403/673] python3Packages.python-dbusmock: 0.28.4 -> 0.28.6 --- 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 cc8181e7325c..06bc1ff0cafa 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.4"; + version = "0.28.6"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-gsGg9zHVyDTCVZmFUI8qqXDt0ui+o3hPwjRlsYUmShg="; + sha256 = "sha256-tNV1GQsUG5BGTNGB0VBUa0Yxqv/HsRSlRfEU4KNd29w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d7ac074d6a24fc37d16e298a352744752c978679 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:41 +0100 Subject: [PATCH 404/673] python3Packages.python-gitlab: 3.11.0 -> 3.12.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 63cfb7c38846..6682b57ed7ae 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.11.0"; + version = "3.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-25Rytq5PupaLQJ3DL67iDdZQiQZdqpPgjSG3lqZdZXg="; + hash = "sha256-VnOQwrk2kNrmLtlzi/nyIfpFwBN4/fiWCJ2/fIoTT70="; }; propagatedBuildInputs = [ From f6e39eaa01ef90e29c66c18a03f619a6fcec59fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:41 +0100 Subject: [PATCH 405/673] python3Packages.python-lsp-server: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/python-lsp-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 62e6ce951bde..67119cdda521 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; + sha256 = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c0c4550c1b197436e24d5875e41d4fe38959c4bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:41 +0100 Subject: [PATCH 406/673] python3Packages.python-nomad: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/python-nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index 6d6c5c90fdfe..ffd93a2e28f0 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-nomad"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "087a7d5d2af9fd8ce5da70d29e4b456c6b8b0ea3cd16613ed50f6eb8ad6cdba6"; + sha256 = "sha256-VpngJvm9eK60lPeFIbjnTwzWWoJ9tRBDYP5SghDMbAg="; }; propagatedBuildInputs = [ requests ]; From c8f346cb9df3e5da47077712fd192bebdce38d94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:41 +0100 Subject: [PATCH 407/673] python3Packages.pythonocc-core: 7.6.2 -> 7.7.0 --- pkgs/development/python-modules/pythonocc-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 1bef56a01a40..da72cc0839af 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "7.6.2"; + version = "7.7.0"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; - rev = version; - sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-YybpwiCeBnwZfYS6ZxUbycHFn2DlqYxcNMylRN5ihFM="; }; postPatch = '' From 3e2e47e2f781ec3f6cd16bf300903b26095858d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 408/673] python3Packages.python-redis-lock: 3.7.0 -> 4.0.0 --- pkgs/development/python-modules/python-redis-lock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 7671e5a4a9b2..deb84265fd1c 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.7.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374"; + sha256 = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; }; propagatedBuildInputs = [ From 1e9beb3ead5f8d7d8af11733e6b2bb3a499b4bb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 409/673] python3Packages.python-socks: 2.0.3 -> 2.1.1 --- .../python-modules/python-socks/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index b0d0fbd36616..4d8f29de081b 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -3,29 +3,31 @@ , buildPythonPackage , curio , fetchFromGitHub +, anyio , flask , pytest-asyncio , pytest-trio , pythonOlder , pytestCheckHook , trio +, trustme , yarl }: buildPythonPackage rec { pname = "python-socks"; - version = "2.0.3"; + version = "2.1.1"; format = "setuptools"; - disabled = pythonOlder "3.6.1"; + disabled = pythonOlder "3.6.2"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "romis2012"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-tVoBon9HF9MTOK+dN9g58fQO706ElNlCeULx//7hPWA="; + repo = "python-socks"; + rev = "refs/tags/v${version}"; + hash = "sha256-QvUuCS8B/6+dgzWrflizLfNlAUeOPpUPtmFaE6LGYGc="; }; propagatedBuildInputs = [ @@ -34,11 +36,15 @@ buildPythonPackage rec { async-timeout ]; + doCheck = false; # requires tiny_proxy module + checkInputs = [ + anyio flask pytest-asyncio pytest-trio pytestCheckHook + trustme yarl ]; @@ -47,6 +53,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/romis2012/python-socks/releases/tag/v${version}"; description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; From af4145651e56992540031f43e563b0facac4486f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 410/673] python3Packages.python-stdnum: 1.17 -> 1.18 --- pkgs/development/python-modules/python-stdnum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 51ac732b1729..3799a7fda405 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-stdnum"; - version = "1.17"; + version = "1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N04rXhORLM2/ULCyP8osPgUxF0gFwy104UXzd1Yyg0A="; + hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA="; }; checkInputs = [ From cf13eef71f08775c6ae15657ca740352371b0155 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 411/673] python3Packages.pytorch-lightning: 1.6.5 -> 1.8.6 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index a2d8da399d28..55e580308aa8 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.6.5"; + version = "1.8.6"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CgD5g5nhz2DI4gOQyPl8/Cq6wWHzL0ALgOB5SgUOgaI="; + hash = "sha256-5AyOCeRFiV7rdmoBPx03Xju6eTR/3jiE+HQBiEmdzmo="; }; propagatedBuildInputs = [ From 9cc0036ba07370ef6bafb07d7b621306c1c573c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 412/673] python3Packages.pyvisa-py: 0.5.3 -> 0.6.0 --- pkgs/development/python-modules/pyvisa-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 4b7a179678a3..2218f81bbdb5 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-37GptqqBSIFOpm6SpS61ZZ9C4iU5AiOduVq255mTRNo="; + hash = "sha256-1EAkE2uYjo8sUbSrF6E1AGZkKPTxkSre3ov2RU8YhfM="; }; nativeBuildInputs = [ From 905f685b2927cf6aa0ab07da7fb52b6500298da3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 413/673] python3Packages.pyvmomi: 8.0.0.1 -> 8.0.0.1.1 --- pkgs/development/python-modules/pyvmomi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 4f07951be5db..54ee52c347bf 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.0.1"; + version = "8.0.0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DVqC5giVMixj9NlGJ2gaH7ybX3hdQsdNTjuTkesao9E="; + hash = "sha256-K3gCG4TYyCiHKhrixPwBtBZ4s0bNd7Z4f3CLGnqCDG0="; }; propagatedBuildInputs = [ From ba24a36da5b29eadd669a22eb944e0608a4cc65c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 414/673] python3Packages.PyWavelets: 1.3.0 -> 1.4.1 --- pkgs/development/python-modules/pywavelets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index a85a59ff4ab6..52ff09078e9b 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.3.0"; + version = "1.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-y6qdYgUtna+Np2X8jnwww46iuOnhwYhBkT37SuxnHuU="; + sha256 = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; }; checkInputs = [ nose pytest ]; From 5ed4e72c0c060a080817bd62c098f8136871b5d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 415/673] python3Packages.pywebview: 3.7 -> 3.7.2 --- 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 b80c85d8e13b..28c0da0e0434 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "3.7"; + version = "3.7.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-RRq6b0hqAzig/WwFK0VsrhHO6ar8HhMdAEIosPPNUQg="; + hash = "sha256-5e05XkyxvOGLaEwKljYFppHQ99BxDQ7wPkViRlRo1VI="; }; nativeBuildInputs = [ From 6f20f0c34e41476a892ba749d2055d0ebe2fd140 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:42 +0100 Subject: [PATCH 416/673] python3Packages.pyworld: 0.3.0 -> 0.3.2 --- pkgs/development/python-modules/pyworld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index 9833a29593e8..4e22e5f5d9cc 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyworld"; - version = "0.3.0"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "e19b5d8445e0c4fc45ded71863aeaaf2680064b4626b0e7c90f72e9ace9f6b5b"; + sha256 = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0="; }; nativeBuildInputs = [ From 8f330ab47ece16bdd84ce3644b3590834e45844e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 417/673] python3Packages.pyxattr: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/pyxattr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 35bfaecda977..1ad0391ea34d 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "68477027e6d3310669f98aaef15393bfcd9b2823d7a7f00a6f1d91a3c971ae64"; + sha256 = "sha256-e/QM7FrpPdZWEocX29Joz8Ozso2VU214hndslPomeFU="; }; # IOError: [Errno 95] Operation not supported (expected) From 9add900c29613a054e648c813f1d36b0af17750e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 418/673] python3Packages.pyzmq: 23.2.1 -> 24.0.1 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 480247d01bb0..af8131306f7c 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "23.2.1"; + version = "24.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KzgaqGfs59CoLzCgx/PUOHt88uBpfjPvqlvtbFeEq80="; + hash = "sha256-IW9dfbtnFmdZ5ZsEebyoK4rPm+1gFbUmuOsQFD+wjnc="; }; buildInputs = [ From 67333dc21a886619ea20b2a147b1a2b6f49ddda2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 419/673] python3Packages.qiskit-aer: 0.10.4 -> 0.11.2 --- pkgs/development/python-modules/qiskit-aer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index f7ad8da805a0..0941574a9575 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.10.4"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit-aer"; - rev = version; - sha256 = "sha256-mf+Pgw/daFkt1bvqSeYzlO/Sd2F2MtwZcLr+h1u+eb0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; }; postPatch = '' From 86698c039ae402faa9c7c8786a3aa0233ad727ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 420/673] python3Packages.qiskit: 0.37.0 -> 0.39.4 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 458fa6a146e3..02782b5939d6 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -28,7 +28,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.37.0"; + version = "0.39.4"; disabled = pythonOlder "3.6"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = "refs/tags/${version}"; - sha256 = "sha256-TsDDiSWSjk2iXaxFjGXQxPFEPCR242dR26H0cpA6ZxY="; + sha256 = "sha256-4Lf+0Dq64J53qTEzr9gtuYwe1a+zIgHmgoKMTBEef8M="; }; propagatedBuildInputs = [ From 95dab6bb8eb5dfa0d5775401ecc2246e1f87b150 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 421/673] python3Packages.qiskit-finance: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/qiskit-finance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 45764b4983ef..f731249ceef2 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.3.3"; + version = "0.3.4"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1XM4gBuMsvjwU4GSdQJobMyyDFZOOTbwvnUPG0nXFoc="; + sha256 = "sha256-Ijoqn6nANLsEVKA5nycd1xbW5htJ+TQm6LkiMUWTsSs="; }; postPatch = '' From 292c2df5c6a8f41af71a0b38685c006cb2bc589b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 422/673] python3Packages.qiskit-machine-learning: 0.4.0 -> 0.5.0 --- .../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 e4761dc33b02..a9b46f5980f8 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.4.0"; + version = "0.5.0"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-WZSXt+sVeO64wCVbDgBhuGvo5jTn/JKh9oNSO7ZY9wo="; + sha256 = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; }; propagatedBuildInputs = [ From c468a1fd9a1324aced102aee869f4ccb8a1f290b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 423/673] python3Packages.qiskit-nature: 0.4.3 -> 0.5.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 7c7510675f13..ee869d032f37 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.4.3"; + version = "0.5.2"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-trThxcft6AOxalOglOKPwrJ23Bqt/FmMCAucKmNmB7c="; + sha256 = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; }; propagatedBuildInputs = [ From a6c5e4aa48b4859f144e93156b90bd459c25a978 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:43 +0100 Subject: [PATCH 424/673] python3Packages.QtPy: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 97d2111677f3..f1c601f76810 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2F8bEh8kpBrSbFXERuZqvbfFKIOfjE8R8VbsRUGQORQ="; + sha256 = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U="; }; propagatedBuildInputs = [ From 7c265e1391e0f69b30777e2800de462e354059d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 425/673] python3Packages.radish-bdd: 0.14.0 -> 0.14.2 --- pkgs/development/python-modules/radish-bdd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 258cd012716c..322db5b8f9cd 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.14.0"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-7C8XgGlpNVUONSfg9DsIS8Awpy6iDzFOLAFs1xpfHXI="; + hash = "sha256-Xyj9yA4Rif3/BWEBnFubXQxwMM0IkHQ1koFZ+HWYQcI="; }; propagatedBuildInputs = [ From 87a1a8bc017f4f26e072ad274384005f7f51cc80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 426/673] python3Packages.rasterio: 1.3.0 -> 4 --- pkgs/development/python-modules/rasterio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 7876e6667491..01dca1adf748 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.0"; # not x.y[ab]z, those are alpha/beta versions + version = "4"; # not x.y[ab]z, those are alpha/beta versions format = "pyproject"; disabled = pythonOlder "3.6"; @@ -38,8 +38,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; - rev = "refs/tags/${version}"; - hash = "sha256-CBnG1zNMOL3rAmnErv7XZZ2Cu9W+DnRPcjtKdmYXHUA="; + rev = "refs/tags/release-test-${version}"; + hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4="; }; nativeBuildInputs = [ From 740f6fc4d817d24c80395ae4297777d111c7ed9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 427/673] python3Packages.rdflib: 6.1.1 -> 6.2.0 --- pkgs/development/python-modules/rdflib/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 27356390cfda..5ae23438b7a2 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -18,12 +18,13 @@ , html5lib # tests +, pytest-cov , pytestCheckHook }: buildPythonPackage rec { pname = "rdflib"; - version = "6.1.1"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RDFLib"; repo = pname; - rev = version; - hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd"; + rev = "refs/tags/${version}"; + hash = "sha256-GkqfSyApOFKPIiIYXhgaRZuMawk7PRYmxGDhnRI+Rz0="; }; propagatedBuildInputs = [ @@ -53,6 +54,7 @@ buildPythonPackage rec { }; checkInputs = [ + pytest-cov pytestCheckHook ] ++ passthru.optional-dependencies.networkx @@ -68,6 +70,10 @@ buildPythonPackage rec { # Requires network access "test_service" "testGuessFormatForParse" + "test_infix_owl_example1" + "test_context" + "test_guess_format_for_parse" + "rdflib.extras.infixowl" ] ++ lib.optionals stdenv.isDarwin [ # Require loopback network access "TestGraphHTTP" From 192e12eead22f03354c038c61a7e380d049ae6d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 428/673] python3Packages.readchar: 3.0.5 -> 4.0.3 --- pkgs/development/python-modules/readchar/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 81c489bd8c09..0b21c483cd02 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "readchar"; - version = "3.0.5"; + version = "4.0.3"; format = "setuptools"; # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov readchar" "" + --replace "--cov=readchar" "" ''; nativeBuildInputs = [ From 093bc511c056fdea34573f5b4629f0cc6e01edb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 429/673] python3Packages.readthedocs-sphinx-ext: 2.1.8 -> 2.2.0 --- .../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 e0ba8cd57cf4..6ff9d965b288 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.1.8"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pX43E9r3e/kdG6GeS5iIpHwKv+tj7PAuOsd/z9mb/mk="; + sha256 = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; }; propagatedBuildInputs = [ requests ]; From 5dd80f134507ee2e812a8a7a98b29459a7baf19f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 430/673] python3Packages.recipe-scrapers: 14.14.0 -> 14.26.0 --- .../python-modules/recipe-scrapers/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 897a8239f0fa..4b4d283e309c 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -8,19 +8,25 @@ , requests , pytestCheckHook , responses +, setuptools }: buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.14.0"; + version = "14.26.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; - rev = version; - sha256 = "sha256-3qrjNd1jX4JP3qG9YX8MQqwPh8cvfkZa1tEk0uCwego="; + rev = "refs/tags/${version}"; + hash = "sha256-U7A9HmkXPcuYEsY/uGUVh3LYHDYhV/uizELh1/vXG+U="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 extruct From 5213bbdae4431b52336358be6546969172b3f4b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 431/673] python3Packages.redis: 4.3.4 -> 4.4.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 adaf4d86ef69..649a1192afd0 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.3.4"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3fJwcd9K3zghxPLKWdZ1JcOoLl8mi+2XuBPLT6v4eIA="; + sha256 = "sha256-e4yH0ZxF0/EnGxJIWNKlwTFgxOdNSDXignNAD6NNUig="; }; propagatedBuildInputs = [ From 9737f9131cf4392784fc33981315aec2ba55e162 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 432/673] python3Packages.regex: 2022.9.13 -> 2022.10.31 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 1bd2d8b5d871..d41bed6136ed 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.9.13"; + version = "2022.10.31"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8HNztuVqbzoN89dbZRonjKe9NXp5YHiiapWOoc4FiP0="; + hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM="; }; checkPhase = '' From 3fc0fc46d93beb34ac0992c4ef514757d032062e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 433/673] python3Packages.reolink: 0.61 -> 0.63 https://github.com/fwestenberg/reolink/releases/tag/v0.62 https://github.com/fwestenberg/reolink/releases/tag/v0.63 --- 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 070c665e8a41..13b1c662c8a4 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.61"; + version = "0.63"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XUYTDHh0oTro6BT+h4LjRdMukOZTlWP+giFpjLciZNQ="; + hash = "sha256-qwS7frXRk4gCBoAyBFLlbpYsyQZYqMLGB/pdznwyCoA="; }; propagatedBuildInputs = [ From 640a0469e86cdbd98fc99f14fad036c174d7d26d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:44 +0100 Subject: [PATCH 434/673] python3Packages.reportlab: 3.6.11 -> 3.6.12 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 7a58aaddaace..a84ed43c5c05 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -12,11 +12,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.11"; + version = "3.6.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko="; + sha256 = "sha256-sTzr9OOXu6FFQrzQIzOLb/LBUaOhKqvKie7L+XLLNho="; }; patches = [ From 2359aa440b9e7831f32bbe4f7d046ad82d014676 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 435/673] python3Packages.reproject: 0.9 -> 0.9.1 --- pkgs/development/python-modules/reproject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index a8643ca65073..da889482998c 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.9"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zhjI4MjlCV9zR0nNcss+C36CZXY/imGsalfKMGacfi0="; + hash = "sha256-pXSUVeTrxtSqKTa286xdCAAFipg38iR4XSO6CRfWXtc="; }; nativeBuildInputs = [ From 1a3881d351f96dba60a50fbbd680163b7ac1430c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 436/673] python3Packages.requests-toolbelt: 0.9.1 -> 0.10.1 --- .../requests-toolbelt/default.nix | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index af6788d173fc..1b86cddc50f6 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A="; + hash = "sha256-YuCff/XMvakncqKfOUpJw61ssYHVaLEzdiayq7Yopj0="; }; propagatedBuildInputs = [ @@ -29,25 +29,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - (fetchpatch { - # Fix collections.abc deprecation warning, https://github.com/requests/toolbelt/pull/246 - name = "fix-collections-abc-deprecation.patch"; - url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch"; - sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4="; - }) - # Make pyopenssl optional - (fetchpatch { - url = "https://github.com/requests/toolbelt/commit/c7c1f8626b73e5715e6ecc1de0833fabdfd67323.patch"; - sha256 = "sha256-OhE3nyYyKKRHs9rCq8EJYebwaYyjWjbvbtL79MIMMRc="; - }) - # Make pyopenssl optional - (fetchpatch { - url = "https://github.com/requests/toolbelt/commit/2453f32f1c995e7b19294750a4177bc32326826e.patch"; - sha256 = "sha256-qmKHp+aVeazZt8X+sZeYfZCB56SE0OvFvWCXRZtkCew="; - }) - ]; - disabledTests = [ # https://github.com/requests/toolbelt/issues/306 "test_no_content_length_header" From 6f0d3dce5ea8b2ba2e8d16e213cea88337fc2d78 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 437/673] python3Packages.restrictedpython: 5.2 -> 6.0 --- pkgs/development/python-modules/restrictedpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 6e782b1bd336..4d8c10e97cad 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "5.2"; + version = "6.0"; format = "setuptools"; src = fetchPypi { pname = "RestrictedPython"; inherit version; - sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs="; + sha256 = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; }; checkInputs = [ From d207c3a7897224d178ca839379664fb2addf6d86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 438/673] python3Packages.rich: 12.6.0 -> 13.0.0 --- pkgs/development/python-modules/rich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 5d9c1f45c3b3..a760ed03dfde 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "rich"; - version = "12.6.0"; + version = "13.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Textualize"; repo = pname; - rev = "v${version}"; - hash = "sha256-g3tXftEoBCJ1pMdLyDBXQvY9haGMQkuY1/UBOtUqrLE="; + rev = "refs/tags/v${version}"; + hash = "sha256-Mc2ZTpn2cPGXIBblwwukJGiD8etdVi8ag9Xb77gG62A="; }; nativeBuildInputs = [ poetry-core ]; From 91e8bf9b3c0719f603bec1b9599d0fe01c602a50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 439/673] python3Packages.RoboMachine: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/robomachine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 504a5ac557ea..e0f04758b66f 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "RoboMachine"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4251d405759a38f1e665acc245dcbcdec319376718169a73c57560183370fe0e"; + sha256 = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; }; propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; From 9e9d8601f690d62672ed9cc494a9a25224181f5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 440/673] python3Packages.robotframework: 5.0.1 -> 6.0.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 4f925c341dcf..2b52290fbcba 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 = "5.0.1"; + version = "6.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-aJUXqY6OFlbdLIr5Qpg27mGFm6hD+WvCrqXmf204WUo="; + sha256 = "sha256-WyT7nZfWEXLWaAU7aRnCK/Uw99iysmq4hyjEIn4DCCc="; }; checkInputs = [ jsonschema ]; From bc7240f8120f8a6c304b8e19bf1048349bb9b396 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 441/673] python3Packages.s3fs: 2022.10.0 -> 2022.11.0 --- pkgs/development/python-modules/s3fs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index b1bebfce47c0..d295c73b2fe2 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,16 +11,20 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.10.0"; + version = "2022.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6N64DyC9CyBZFBuHT9udauuMzjUxLqXywCsiWnigBAY="; + hash = "sha256-EMWsKDpPW2f/rW0fJf9+4CYUJ1DFxdyGh0bNkE9hfDM="; }; + postPatch = '' + sed -i 's/fsspec==.*/fsspec/' requirements.txt + ''; + buildInputs = [ docutils ]; From 5fecd992be56f070208d9ef507556c46978844e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:45 +0100 Subject: [PATCH 442/673] python3Packages.sagemaker: 2.109.0 -> 2.126.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ebcb42920618..cac3e0fc4049 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.109.0"; + version = "2.126.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hs71bIoByh5S1ncsku+y4X2i0yU65FknJE05lEmnru4="; + hash = "sha256-wuU53FmrtAY8E08Q+W4OhBoBQ8kks3LjJiR7kxlbfAg="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; From 29bd96f3f4bff2c73aafd2af107510a66bd34d85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:46 +0100 Subject: [PATCH 443/673] python3Packages.scancode-toolkit: 31.1.1 -> 31.2.3 --- 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 40e391347702..87ef6331196d 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -60,13 +60,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.1.1"; + version = "31.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/QLW+rxkDbrv/78xiXOuSNaQvY+0oYZQV0/m60CEZLk="; + hash = "sha256-+5zYYpH8EyHPruX9LDWzeVPny7VoFiARb4+32FXMxUc="; }; dontConfigure = true; From 1a4a453473bfcf70cfa4999017af6137915c60ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:46 +0100 Subject: [PATCH 444/673] python3Packages.scikit-bio: 0.5.7 -> 0.5.8 --- 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 e86b384f9c4a..27e2063b075a 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.7"; + version = "0.5.8"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y0PKDGIeL8xdHAQsi+MgBmTFMllWqDvqdRzxvMddHak="; + sha256 = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; }; nativeBuildInputs = [ cython ]; From 9df08f2c6c0e4a854dc2cd71b41dbfc751008944 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:46 +0100 Subject: [PATCH 445/673] python3Packages.scikit-build-core: 0.1.3 -> 0.1.5 --- pkgs/development/python-modules/scikit-build-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 802b50cab32f..2685c42df626 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.1.3"; + version = "0.1.5"; format = "pyproject"; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-qkVj7fS2+JB8mpJ788vTw4jhD/TGtZAMtCiBlmjbFM8="; + hash = "sha256-OUS/QOaBd0DDBrDk8c3LzFrPVrVF65EJQPRjGtnUmjU="; }; postPatch = '' From 8a5cb90f399d9a539d9dbb16fd5de221363ee59e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:46 +0100 Subject: [PATCH 446/673] python3Packages.scikit-build: 0.15.0 -> 0.16.4 --- .../python-modules/scikit-build/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 4a466fcef06d..e2d2cffde73c 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -23,14 +23,20 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.15.0"; + version = "0.16.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5yPNDzSJoEI3C56piLu5z9dyXoslsgyhx5gYIfz2X7k="; + hash = "sha256-KiDEreqzwq7BHXC86WkJlc/w5Tvq/jIae1MACayo5zE="; }; + # This line in the filterwarnings section of the pytest configuration leads to this error: + # E UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils. + postPatch = '' + sed -i "/'error',/d" pyproject.toml + ''; + propagatedBuildInputs = [ distro packaging From d949566e919e0d91a5b1d25b7423427a3e2329b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:46 +0100 Subject: [PATCH 447/673] python3Packages.scikit-learn: 1.1.3 -> 1.2.0 --- pkgs/development/python-modules/scikit-learn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index ca5bc74c0105..ca982ecb7128 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.1.3"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vvUZeKUewZl3cA/nuGrs6knIJYhPOBF1a3SjsVK7TjU="; + sha256 = "sha256-aAtls8ruRpVBOF0spbA/9wQI9sYYxYOUgxLw0hJd9oA="; }; buildInputs = [ From b60a370d42ea64a8b4490950da51e2705347e778 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:46 +0100 Subject: [PATCH 448/673] python3Packages.scikit-survival: 0.18.0 -> 0.19.0.post1 --- 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 1dd50b6380d8..38d602e291bc 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.18.0"; + version = "0.19.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LfQESmKxSJ4tWlp3EZTBajOxZC3IEOUtJmX8A5ROpmU="; + sha256 = "sha256-UBhUCpRXyd5gLxaf38wBURo2DIoUgMmROogGF3bwWJk="; }; nativeBuildInputs = [ From 8d8e62e74f511160a599471549a98bc9e4f4818d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 449/673] python3Packages.setuptools-scm: 7.0.5 -> 7.1.0 --- .../python-modules/setuptools-scm/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index b4e8cc5afa62..dc338bd41120 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -5,24 +5,33 @@ , typing-extensions , tomli , setuptools +, pythonOlder , lib }: buildPythonPackage rec { pname = "setuptools-scm"; - version = "7.0.5"; + version = "7.1.0"; + format = "pyproject"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "sha256-Ax4Tr3cdb4krlBrbbqBFRbv5Hrxc5ox4qvP/9uH7SEQ="; + hash = "sha256-bFCDRadxqtfVbr/w5wYovysOx1c3Yr6ZYCFHMN4njyc="; }; + nativeBuildInputs = [ + packaging + setuptools + typing-extensions + ]; + propagatedBuildInputs = [ packaging - typing-extensions - tomli setuptools + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; pythonImportsCheck = [ From 6426df7cc26bc3329c089185e53d28c9d30bc804 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 450/673] python3Packages.Shapely: 1.8.4 -> 2.0.0 --- .../python-modules/shapely/default.nix | 17 +++------- .../shapely/library-paths.patch | 31 ------------------- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/shapely/library-paths.patch diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index fda2645105f6..260a27236500 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -11,13 +11,13 @@ }: buildPythonPackage rec { - pname = "Shapely"; - version = "1.8.4"; + pname = "shapely"; + version = "2.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + sha256 = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; }; nativeBuildInputs = [ @@ -33,18 +33,9 @@ buildPythonPackage rec { pytestCheckHook ]; - # Environment variable used in shapely/_buildcfg.py + # Environment variable used in setup.py GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - patches = [ - # Patch to search form GOES .so/.dylib files in a Nix-aware way - (substituteAll { - src = ./library-paths.patch; - libgeos_c = GEOS_LIBRARY_PATH; - libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; - }) - ]; - preCheck = '' rm -r shapely # prevent import of local shapely ''; diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch deleted file mode 100644 index d095eada9d6e..000000000000 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/shapely/geos.py b/shapely/geos.py -index 88c5f53..1ccd6e4 100644 ---- a/shapely/geos.py -+++ b/shapely/geos.py -@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -+ '@libgeos_c@', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': - "/usr/local/lib/libgeos_c.dylib", - # homebrew Apple Silicon - "/opt/homebrew/lib/libgeos_c.dylib", -+ "@libgeos_c@", - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -diff --git a/tests/test_dlls.py b/tests/test_dlls.py -index c71da8e..c36262c 100644 ---- a/tests/test_dlls.py -+++ b/tests/test_dlls.py -@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): - '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) - os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) - 'libgeos_c.so.1', -- 'libgeos_c.so']) -+ 'libgeos_c.so', -+ '@libgeos_c@']) From 809587a8eb88fe2b7030b6dad44a3407de716247 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 451/673] python3Packages.shortuuid: 1.0.9 -> 1.0.11 --- pkgs/development/python-modules/shortuuid/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index b443e319290c..097cf5be5334 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "shortuuid"; - version = "1.0.9"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RZ8S+hrMNP8hOxNxRnwDJRaWRaMe2YniaIcjOa91Y9U="; + hash = "sha256-/HXyYVkUgVqOTLFQGzpRN0XLZu8P1fxvufjD+jSB94k="; }; checkInputs = [ @@ -25,10 +25,6 @@ buildPythonPackage rec { "shortuuid" ]; - pytestFlagsArray = [ - "shortuuid/tests.py" - ]; - meta = with lib; { description = "Library to generate concise, unambiguous and URL-safe UUIDs"; homepage = "https://github.com/stochastic-technologies/shortuuid/"; From 4d3f8ca00ec989546565c55e58cc09cb7be1c32f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 452/673] python3Packages.sip: 6.7.4 -> 6.7.5 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 07a731b53d92..5facfac582c0 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.7.4"; + version = "6.7.5"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-nb+KDnyNdtFkLi/dP1PmpSL3wwmA5Sd2PEV2DCUFz78="; + sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ="; }; propagatedBuildInputs = [ packaging ply toml ]; From 09ab6a0715ebb1bd71831f29309dfa011317b4d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 453/673] python3Packages.slackclient: 2.9.3 -> 3.19.5 --- .../python-modules/slackclient/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 1c02d592d679..49e3cc70a30b 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -1,12 +1,14 @@ { lib , stdenv , aiohttp +, boto3 , buildPythonPackage -, codecov , fetchFromGitHub -, flake8 +, flask +, flask-sockets , isPy3k , mock +, moto , psutil , pytest-cov , pytest-mock @@ -15,20 +17,23 @@ , requests , responses , six +, sqlalchemy +, websockets , websocket-client }: buildPythonPackage rec { pname = "slackclient"; - version = "2.9.3"; + version = "3.19.5"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; - rev = "v${version}"; - sha256 = "1rfb7izgddv28ag37gdnv3sd8z2zysrxs7ad8x20x690zshpaq16"; + rev = "refs/tags/v${version}"; + hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk="; }; propagatedBuildInputs = [ @@ -39,22 +44,30 @@ buildPythonPackage rec { ]; checkInputs = [ - codecov - flake8 + boto3 + flask + flask-sockets mock + moto psutil - pytest-cov pytest-mock pytestCheckHook - pytest-runner responses + sqlalchemy + websockets ]; # Exclude tests that requires network features pytestFlagsArray = [ "--ignore=integration_tests" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" + "test_interactions" + "test_send_message_while_disconnection" ] ++ lib.optionals stdenv.isDarwin [ # these fail with `ConnectionResetError: [Errno 54] Connection reset by peer` "test_issue_690_oauth_access" From 627d90a0d1b51eb8033a9ca544d8d02adb8d2d22 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 454/673] python3Packages.sly: 0.4 -> 0.5 --- pkgs/development/python-modules/sly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix index 273972cbe4ee..b13c41be7276 100644 --- a/pkgs/development/python-modules/sly/default.nix +++ b/pkgs/development/python-modules/sly/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sly"; - version = "0.4"; + version = "0.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0an31bm5m8wqwphanmcsbbnmycy6l4xkmg4za4bwq8hk4dm2dwp5"; + sha256 = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ="; }; checkInputs = [ pytest ]; From 579b0aa1a9b872fbd9ce6ddef472b32e66e59a7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 455/673] python3Packages.softlayer: 6.1.0 -> 6.1.3 --- pkgs/development/python-modules/softlayer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 6c3df4eb6f98..70bfb13f8008 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.0"; + version = "6.1.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; - rev = "v${version}"; - sha256 = "sha256-T49KVAsgcAZySkaJi47IrFcMHGZvEkGDjPWsdMarzwM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; }; postPatch = '' From 77976313e7fa5a07ced531e68320ec71b2ca06be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 456/673] python3Packages.solc-select: 0.2.1 -> 1.0.2 --- .../python-modules/solc-select/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index e51f1cd143f1..af8724d1999d 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, packaging +, pycryptodome }: buildPythonPackage rec { pname = "solc-select"; - version = "0.2.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6VawTcffIgnR+zuC4rti+Ocwu1VMTX+VihT/L7LzchI="; + sha256 = "sha256-zrpWHQdoCVDGaDGDf9fWhnRsTe1GVwqk1qls1PyvlLw="; }; + propagatedBuildInputs = [ + packaging + pycryptodome + ]; + # no tests doCheck = false; pythonImportsCheck = [ "solc_select" ]; From 1f5d31e1d501ac01f3b09e3919f5c872011df269 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:47 +0100 Subject: [PATCH 457/673] python3Packages.spacy: 3.4.1 -> 3.4.4 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 54c96a73cb82..c64e1384c65a 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.4.1"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-WcXPXTSKbA5kpZrFz+bNhdCOhmM3hwyV0exhYdUx5GM="; + hash = "sha256-5QDPLLXxhJRhp5KPomlwN1YGm9+3FVkGUkCvbQIIsIw="; }; propagatedBuildInputs = [ From 1cb93c0d8fc91fc79c922349dd67cd460f4f29cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 458/673] python3Packages.sphinx-argparse: 0.3.2 -> 0.4.0 --- .../development/python-modules/sphinx-argparse/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index a4a414328b55..778ce64016b6 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -7,11 +7,12 @@ buildPythonPackage rec { pname = "sphinx-argparse"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-5UrWyPiVrGu50N2foH5H4TeipCrhinFFFSYuhrTMS6s="; + pname = "sphinx_argparse"; + inherit version; + sha256 = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek="; }; postPatch = '' From 41f040ace8ff2a2e4dd6a11c003789a81851f855 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 459/673] python3Packages.sphinx-autodoc-typehints: 1.19.2 -> 1.19.5 --- .../sphinx-autodoc-typehints/default.nix | 12 ++++++++++-- 1 file changed, 10 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 85f6366f0f07..bd3edbd9c0f6 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling , pythonOlder , sphinx , pytestCheckHook @@ -8,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.19.2"; + version = "1.19.5"; in buildPythonPackage { @@ -20,9 +22,14 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-hy+y17PXlIJsKONu32c56TVJSRRH3KvrB8WIVen5FN4="; + hash = "sha256-OKInN44rwVyE4pr4yx11gRgtoRBxEf0ciLGbXrcHYgU="; }; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ sphinx ]; @@ -39,6 +46,7 @@ buildPythonPackage { ]; meta = with lib; { + changelog = "https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/${version}"; description = "Type hints (PEP 484) support for the Sphinx autodoc extension"; homepage = "https://github.com/tox-dev/sphinx-autodoc-typehints"; license = licenses.mit; From 93ce11ea74a842f63bb43d035bb786a006092e6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 460/673] python3Packages.sphinxcontrib-bayesnet: 0.1 -> 0.4 --- .../python-modules/sphinxcontrib-bayesnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 6f53dd79d364..799a4ba1b5cf 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-bayesnet"; - version = "0.1"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "0x1kisvj7221cxfzmwplx3xlwbavl636fpncnjh7gghp1af71clw"; + sha256 = "sha256-+M+K8WzQqxQUGgAgGPK+isf3gKK7HOrdI6nNW/V8Wv0="; }; propagatedBuildInputs = [ sphinx sphinxcontrib-tikz ]; From 5f3a7bf8bd743519aa18c21fedfe2d5bca630b8c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 461/673] python3Packages.sphinx-mdinclude: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/sphinx-mdinclude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index 246c30e79664..ad4f1b5d326e 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; - version = "0.5.2"; + version = "0.5.3"; format = "flit"; src = fetchPypi { pname = "sphinx_mdinclude"; inherit version; - hash = "sha256-F7UVe1xNrz+vCbJOCxwyJQoxfwSCORW+qu9vDH7oEPc="; + hash = "sha256-KZjj0YswIsmYPRtyGR/jfiX/zNVBZcvjrLIszu3ZGvQ="; }; nativeBuildInputs = [ flit-core ]; From f2e460fc9b28796eaaf61da1e2ddbdad1226acba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 462/673] python3Packages.sphinx-rtd-theme: 1.0.0 -> 1.1.1 --- 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 514ce279fe79..3259b47963fd 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf"; + sha256 = "sha256-YUbIRfHhlHs8PdRDLCiZihaTzMdCtPmtfGMSnwdXwQM="; }; postPatch = '' From 19cd4c7199eb7edc6238200dba68f1d49ac439ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 463/673] python3Packages.spyder: 5.4.0 -> 5.4.1 --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index bb744b2abab4..d6d408b8c686 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -46,14 +46,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.0"; + version = "5.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw="; + hash = "sha256-kQBOYRXhjz+OQk7Vlxb/UKiDi92mA8ialsFQ+QzqhlE="; }; nativeBuildInputs = [ From b440d1cffbd093832cd741bed2023dfdf178497b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 464/673] python3Packages.spyder-kernels: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f39b03763c81..837cf0c0a520 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O9MvvjChUKucztvVvrbd04veHZqHeNpS9+30ILv7jlE="; + hash = "sha256-eD2N+9cVzZdyjpE5FnebN8+OllZjVevaz+NBHSvrR5Y="; }; propagatedBuildInputs = [ From 93eba65f4673757ee4cb46b9f57fca363c88e19d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:48 +0100 Subject: [PATCH 465/673] python3Packages.sqlalchemy-utils: 0.38.3 -> 0.39.0 --- .../sqlalchemy-utils/default.nix | 89 ++++++++++++++----- .../skip-database-tests.patch | 78 ++-------------- 2 files changed, 72 insertions(+), 95 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 49bba2811312..af108f17c0d3 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,58 +1,101 @@ { lib , buildPythonPackage , fetchPypi -, six +, pythonOlder + +# runtime +, importlib-metadata , sqlalchemy -, colour -, flexmock -, jinja2 -, mock -, pg8000 + +# optionals +, babel +, arrow +, pendulum +#, intervals , phonenumbers -, pygments -, pymysql -, pytestCheckHook +, passlib +, colour , python-dateutil +, furl +, cryptography + +# tests +, pytestCheckHook +, pygments +, jinja2 +, docutils +, flexmock +, psycopg2 +, psycopg2cffi +, pg8000 +, pytz +, backports-zoneinfo +, pymysql +, pyodbc + }: buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.38.3"; + version = "0.39.0"; + format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "sha256-n5r7pgekBFXPcDrfqYRlhL8mFooMWmCnAGO3DWUFH00="; + hash = "sha256-s3JAkX2BwU/htuUJakArrORysXkSE4TkfBDYVNv1r5I="; }; patches = [ - # We don't run MySQL, MSSQL, or PostgreSQL ./skip-database-tests.patch ]; propagatedBuildInputs = [ - six sqlalchemy + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; + passthru.optional-dependencies = { + babel = [ babel ]; + arrow = [ arrow ]; + pendulum = [ pendulum ]; + #intervals = [ intervals ]; + phone = [ phonenumbers ]; + password = [ passlib ]; + color = [ colour ]; + timezone = [ python-dateutil ]; + url = [ furl ]; + encrypted = [ cryptography ]; + }; + checkInputs = [ - colour - flexmock - jinja2 - mock - pg8000 - phonenumbers - pygments - pymysql pytestCheckHook + pygments + jinja2 + docutils + flexmock + psycopg2 + psycopg2cffi + pg8000 + pytz python-dateutil + pymysql + pyodbc + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; - disabledTests = [ - "test_literal_bind" + pytestFlagsArray = [ + "--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" ]; meta = with lib; { + changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}"; homepage = "https://github.com/kvesteri/sqlalchemy-utils"; description = "Various utility functions and datatypes for SQLAlchemy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch index 79aa12f03d99..d5f9a46ecb88 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch +++ b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch @@ -1,13 +1,12 @@ diff --git a/conftest.py b/conftest.py -index 9e146cd..8dbc9a5 100644 +index 4426e02..1f84096 100644 --- a/conftest.py +++ b/conftest.py -@@ -61,17 +61,12 @@ def mysql_db_user(): - +@@ -73,17 +73,12 @@ def mysql_db_user(): @pytest.fixture def postgresql_dsn(postgresql_db_user, postgresql_db_password, postgresql_db_host, db_name): -- return 'postgresql://{0}:{1}@{2}/{3}'.format( +- return 'postgresql://{}:{}@{}/{}'.format( - postgresql_db_user, - postgresql_db_password, - postgresql_db_host, @@ -18,83 +17,18 @@ index 9e146cd..8dbc9a5 100644 @pytest.fixture def mysql_dsn(mysql_db_user, db_name): -- return 'mysql+pymysql://{0}@localhost/{1}'.format(mysql_db_user, db_name) +- return f'mysql+pymysql://{mysql_db_user}@localhost/{db_name}' + pytest.skip() @pytest.fixture -@@ -108,8 +104,7 @@ def mssql_db_driver(): +@@ -121,8 +116,7 @@ def mssql_db_driver(): @pytest.fixture def mssql_dsn(mssql_db_user, mssql_db_password, mssql_db_driver, db_name): -- return 'mssql+pyodbc://{0}:{1}@localhost/{2}?driver={3}'\ +- return 'mssql+pyodbc://{}:{}@localhost/{}?driver={}'\ - .format(mssql_db_user, mssql_db_password, db_name, mssql_db_driver) + pytest.skip() @pytest.fixture -diff --git a/tests/functions/test_database.py b/tests/functions/test_database.py -index 0ad6721..83f208d 100644 ---- a/tests/functions/test_database.py -+++ b/tests/functions/test_database.py -@@ -76,28 +76,6 @@ class TestDatabasePostgres(DatabaseTest): - "TEMPLATE my_template") in str(excinfo.value) - - --class TestDatabasePostgresPg8000(DatabaseTest): -- -- @pytest.fixture -- def dsn(self, postgresql_db_user, postgresql_db_password): -- return 'postgresql+pg8000://{0}:{1}@localhost/{2}'.format( -- postgresql_db_user, -- postgresql_db_password, -- 'db_to_test_create_and_drop_via_pg8000_driver' -- ) -- -- --class TestDatabasePostgresPsycoPG2CFFI(DatabaseTest): -- -- @pytest.fixture -- def dsn(self, postgresql_db_user, postgresql_db_password): -- return 'postgresql+psycopg2cffi://{0}:{1}@localhost/{2}'.format( -- postgresql_db_user, -- postgresql_db_password, -- 'db_to_test_create_and_drop_via_psycopg2cffi_driver' -- ) -- -- - @pytest.mark.usefixtures('postgresql_dsn') - class TestDatabasePostgresWithQuotedName(DatabaseTest): - -@@ -116,31 +94,6 @@ class TestDatabasePostgresWithQuotedName(DatabaseTest): - 'TEMPLATE "my-template"') in str(excinfo.value) - - --class TestDatabasePostgresCreateDatabaseCloseConnection: -- def test_create_database_twice( -- self, -- postgresql_db_user, -- postgresql_db_password -- ): -- dsn_list = [ -- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-a'.format( -- postgresql_db_user, -- postgresql_db_password -- ), -- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-b'.format( -- postgresql_db_user, -- postgresql_db_password -- ), -- ] -- for dsn_item in dsn_list: -- assert not database_exists(dsn_item) -- create_database(dsn_item, template="template1") -- assert database_exists(dsn_item) -- for dsn_item in dsn_list: -- drop_database(dsn_item) -- assert not database_exists(dsn_item) -- -- - @pytest.mark.usefixtures('mssql_dsn') - class TestDatabaseMssql(DatabaseTest): - From 3719a7bb2684b195c0f0856245b2d0554066f938 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 466/673] python3Packages.sqlitedict: 2.0.0 -> 2.1.0 --- .../python-modules/sqlitedict/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 5634eb41601a..bb373761504d 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, py +, pytest-benchmark , pytestCheckHook }: buildPythonPackage rec { pname = "sqlitedict"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; - rev = "refs/tags/${version}"; - sha256 = "sha256-8dmGn5h3NigCdDtnDYjpjntRpyjk7ivRp1B8x8nUgpE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic="; }; preCheck = '' @@ -20,9 +22,15 @@ buildPythonPackage rec { ''; checkInputs = [ + py + pytest-benchmark pytestCheckHook ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; + meta = with lib; { description = "Persistent, thread-safe dict"; homepage = "https://github.com/RaRe-Technologies/sqlitedict"; From 539f174c28346323df925c65fcda7cea866c832e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 467/673] python3Packages.sqlparse: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/sqlparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 29e92cdecb93..16b5626da199 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.4.2"; + version = "0.4.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae"; + sha256 = "sha256-acqASEa7EU0uw4DkNgqKNA24PwzPOvzusUBN8Cj1cmg="; }; nativeBuildInputs = [ installShellFiles ]; From e9c7c8cd48b02176dcffd53a4991e51ed3700c46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 468/673] python3Packages.srsly: 2.4.4 -> 2.4.5 --- .../python-modules/sly/default.nix | 25 +++++++++++++++---- .../python-modules/srsly/default.nix | 24 ++++++++++++++---- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix index b13c41be7276..411bc3e9297e 100644 --- a/pkgs/development/python-modules/sly/default.nix +++ b/pkgs/development/python-modules/sly/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, setuptools +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "sly"; version = "0.5"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ="; + hash = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; - # tests not included with pypi release - doCheck = false; + postPatch = '' + # imperative dev dependency installation + rm Makefile + ''; + + pythonImportsCheck = [ + "sly" + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "An improved PLY implementation of lex and yacc for Python 3"; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 5108f9ea5eaa..8dd111b0797c 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -6,35 +6,49 @@ , catalogue , mock , numpy +, psutil , pytest , ruamel-yaml +, setuptools +, tornado }: buildPythonPackage rec { pname = "srsly"; - version = "2.4.4"; + version = "2.4.5"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg="; + hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + setuptools + ]; - propagatedBuildInputs = [ catalogue ]; + propagatedBuildInputs = [ + catalogue + ]; checkInputs = [ mock numpy + psutil pytest ruamel-yaml + tornado ]; - pythonImportsCheck = [ "srsly" ]; + pythonImportsCheck = [ + "srsly" + ]; meta = with lib; { + changelog = "https://github.com/explosion/srsly/releases/tag/v${version}"; description = "Modern high-performance serialization utilities for Python"; homepage = "https://github.com/explosion/srsly"; license = licenses.mit; From e207360d518ab1115548cdbd89894b7f82220af3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 469/673] python3Packages.ssdp: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/ssdp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index bd73a6abaead..b21f043f0b5e 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "ssdp"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "codingjoe"; repo = pname; - rev = version; - sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy"; + rev = "refs/tags/${version}"; + sha256 = "sha256-D2mww3sEc2SvufWNmT450a2CW+ogROn3RHypljkebuY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 00a1031c62c2557b6f2ad1b5a3c15a8bc8cff790 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 470/673] python3Packages.statsd: 3.3.0 -> 4.0.1 --- pkgs/development/python-modules/statsd/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index da455c02d670..3f9caa13132e 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose , mock }: buildPythonPackage rec { pname = "statsd"; - version = "3.3.0"; + version = "4.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3"; + hash = "sha256-mXY9qBv+qNr2s9ItEarMsBqND1LqUh2qs351ikyn0Sg="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ nose mock ]; patchPhase = '' From 9270985e662dd5f435b3fd5f87ee787078e52695 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 471/673] python3Packages.stem: 1.8.0 -> 1.8.1 --- pkgs/development/python-modules/stem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 9ad5e2285ffb..1259e4cc91bb 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stem"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50"; + sha256 = "sha256-gdQ6fGaLqde8EQOy56kR6dFIKUs3PSelmujaee96Pi8="; }; postPatch = '' From 49d262033a6e3329085d2fd650a3d5bfe85129d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 472/673] python3Packages.stravalib: 0.10.4 -> 1.1.0 --- 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 a06a375be0e5..c59ffc8253b7 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "stravalib"; - version = "0.10.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215"; + sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs="; }; checkInputs = [ From bc7b5c5f0284566f095e8016bd1334032dfeeb4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:49 +0100 Subject: [PATCH 473/673] python3Packages.strawberry-graphql: 0.125.0 -> 0.151.2 --- .../python-modules/strawberry-graphql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index ca4b1b81725d..cd01471d366d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.125.0"; + version = "0.151.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; - rev = version; - sha256 = "sha256-8ERmG10qNiYg9Zr8oUZk/Uz68sCE+oWrqmJ5kUMqbRo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-sHrdZ33irwTkm3OHQ2yxxcCWZDcaNbKy7amfRTtPVZ8="; }; patches = [ From 8dd1aaf5967da58bfacc5d695309007113df9937 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:50 +0100 Subject: [PATCH 474/673] python3Packages.stripe: 4.1.0 -> 5.0.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 18d348b144cb..96a7310cb04c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "4.1.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hSrKk/Lu6rWCPSrPSlvtsl+Ub6EM6llaW1l9B0jxNl8="; + hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0="; }; propagatedBuildInputs = [ From 04ebeb2953392595e8a2e1ad798e8e29fe24d0d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:50 +0100 Subject: [PATCH 475/673] python3Packages.subprocess-tee: 0.3.5 -> 0.4.1 --- pkgs/development/python-modules/subprocess-tee/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix index adc4cae187bc..4b1c120e31d1 100644 --- a/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/pkgs/development/python-modules/subprocess-tee/default.nix @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "subprocess-tee"; - version = "0.3.5"; + version = "0.4.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577"; + sha256 = "sha256-s8EkmT+LiNHrHC/eC8IGl4fqxyC6iHccuhfoyTMkgl0="; }; nativeBuildInputs = [ From a4975abeeab0649a552828286f8faf0d4ca57f2d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:50 +0100 Subject: [PATCH 476/673] python3Packages.sunpy: 4.0.5 -> 4.1.0 --- 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 88dca4a51d4a..253be956cdc6 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.0.5"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7I23WtSeZPtHULJ7sNAbOdwAuzjiPE6WW2ukKUCMODs="; + hash = "sha256-DAWc5G5YTydxHIuZkY7Nb3euejPn0aQy7D01xChFDeM="; }; nativeBuildInputs = [ From ec9de6c4beba001b198504d272a8291bb0f31fbb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:50 +0100 Subject: [PATCH 477/673] python3Packages.tabulate: 0.8.10 -> 0.9.0 --- .../python-modules/tabulate/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 34e668339878..e1867c9ce76f 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -1,22 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pythonOlder +, setuptools-scm +, setuptools +, wcwidth +, pytestCheckHook }: buildPythonPackage rec { - version = "0.8.10"; + version = "0.9.0"; pname = "tabulate"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bFfz8916wngncBVfOtstsLGiaWN+QvJ1mZJeZLEU9Rk="; + hash = "sha256-AJWxK/WWbeUpwP6x+ghnFnGzNo7sd9fverEUviwGizw="; }; - checkInputs = [ nose ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Tests: cannot import common (relative import). - doCheck = false; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + passthru.optional-dependencies = { + widechars = [ wcwidth ]; + }; + + checkInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = { description = "Pretty-print tabular data"; From 0ee4e7b85c3eff599028206dc3082d1732320455 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:50 +0100 Subject: [PATCH 478/673] python3Packages.tempest: 32.0.0 -> 33.0.0 --- pkgs/development/python-modules/tempest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 654c8a9e2ab0..0e24cbc03451 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "tempest"; - version = "32.0.0"; + version = "33.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MPaGhT2H8Hzk29qylQru9Z6QaRrHM+9I7N5qhe9Wts4="; + sha256 = "sha256-aEtBAE3p+HVw/macwZtKo20mSJctrsIN7idqWe6Dvtc="; }; propagatedBuildInputs = [ From 30cbebb20567bb888338d77f23aa7122eb2fa88b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:50 +0100 Subject: [PATCH 479/673] python3Packages.tempora: 5.0.2 -> 5.1.0 --- pkgs/development/python-modules/tempora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 8b50406c7eac..2549fc234df2 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.0.2"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MfpbszsmQQJiEfI+gI64vTUZAZiLFn1F8yPI9FDs8hE="; + sha256 = "sha256-PnxKU2mheIyIqZtr46THTAx3KNO2L9dop+gb0L4OiN8="; }; nativeBuildInputs = [ From 7f3b1755d7069e72eb3ea675d98fded3e6865cda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:50 +0100 Subject: [PATCH 480/673] python3Packages.tensorboard: 2.10.0 -> 2.11.0 --- .../python-modules/tensorboard/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index f42d1b3220b7..7a10279ce88f 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , pythonAtLeast +, pythonRelaxDepsHook , numpy , wheel , werkzeug @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; @@ -31,23 +32,17 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-dskaXolZzSIIzDLLF6DLACutq7ZqBqwq8Cp4EPSaWeM="; + hash = "sha256-oOWS7oeWLhevPw3Of6rj+70jkDAVnp5iXM6BC341xT0="; }; - postPatch = '' - chmod u+rwx -R ./dist - pushd dist - wheel unpack --dest unpacked ./*.whl - pushd unpacked/tensorboard-${version} + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; - substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<1.0,>=0.4.1)" \ - --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)" - - popd - wheel pack ./unpacked/tensorboard-${version} - popd - ''; + pythonRelaxDeps = [ + "google-auth-oauthlib" + "protobuf" + ]; propagatedBuildInputs = [ absl-py From de82fa8d7d91cc80ffec01a071414c6e9e9ebe51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:51 +0100 Subject: [PATCH 481/673] python3Packages.tensorboard_plugin_profile: 2.8.0 -> 2.11.1 --- .../python-modules/tensorboard-plugin-profile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 2cb1629ffe67..158437a93d1f 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.8.0"; + version = "2.11.1"; format = "wheel"; src = fetchPypi { @@ -17,7 +17,7 @@ buildPythonPackage rec { format = "wheel"; dist = "py3"; python = "py3"; - hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto="; + hash = "sha256-t9AZg0BGjDcOxtoRBHZO0joIgLHpoKqEUY4pxmw8sjg="; }; nativeBuildInputs = [ From 58e78ec5aff10987a86329da191ef71e5596fb21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:51 +0100 Subject: [PATCH 482/673] python3Packages.tensorflow-datasets: 4.6.0 -> 4.8.0 --- .../python-modules/tensorflow-datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 1afd6c55a3fb..b9639806b12f 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.6.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - sha256 = "sha256-z52UZz9d1AaZklLOPbWuzByEl1hJ6ra4Hoz6eNGD+hg="; + sha256 = "sha256-YG0Abb5xdTaq+/0I45KU02wuZHyLKD5oMSINJOy7Nrk="; }; patches = [ From eb12e0a3f6b9a731e48c039be50231eea626edd9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:51 +0100 Subject: [PATCH 483/673] python3Packages.tensorflow-metadata: 1.9.0 -> 1.12.0 --- .../python-modules/tensorflow-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 994d821d9a25..f5008136f0b5 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.9.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - sha256 = "sha256-6BtKHyVrprtEb2Bi7g2YuctUykWSRXmKwADfHzGkYjc="; + sha256 = "sha256-pgeQ9qMcz/DsdvF3THMZ4uPToLxtIM0No/kgRlBzU8A="; }; patches = [ From 5583abe8e70777a47d710822ea81e94a36ef59b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:51 +0100 Subject: [PATCH 484/673] python3Packages.termcolor: 2.0.1 -> 2.1.1 --- 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 b1cfc0dc0461..e6bb7e3bafef 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.0.1"; + version = "2.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ayz3aekzZKJnbh3lanwM/yz1vQfzfpzICw3WMg6/44g="; + sha256 = "sha256-Z87iAJrcZEnGUPa8873u0AyLpTqM2lNiczxT4KOftws="; }; nativeBuildInputs = [ From bf2179d3f7dd76aa005a267147de8d84e8b3ebdb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:51 +0100 Subject: [PATCH 485/673] python3Packages.terminado: 0.15.0 -> 0.17.1 --- pkgs/development/python-modules/terminado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index ac5481e13a8e..92586f37243e 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.15.0"; + version = "0.17.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q07u3M/MHmE0v+6GEGr5CFLGnWAohOo6Hoym1Ehum/4="; + sha256 = "sha256-bMu806T4olpewEmR85oLjbUt/NSH6g5XjZd+Z1I4AzM="; }; nativeBuildInputs = [ From 7804423d769c2137300b8e3cd40e3c80d99cb6d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:51 +0100 Subject: [PATCH 486/673] python3Packages.tern: 2.10.1 -> 2.11.0 --- pkgs/development/python-modules/tern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 4769dc64e7ab..2e95c6acc2fc 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "tern"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MMsq8/Obe3ogQSjiP8EebYseUJGcchMOczUrxE9jht4="; + hash = "sha256-MELPpz7UeOKSAW7hC2xDIog/bdLUflU00vvIbAePNBA="; }; preBuild = '' From 92fc29a8bc367acf53f13080fde7fb3fa132c237 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:52 +0100 Subject: [PATCH 487/673] python3Packages.texttable: 1.6.4 -> 1.6.7 --- pkgs/development/python-modules/texttable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index b104bd845962..9b492747bf22 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.4"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9"; + sha256 = "sha256-KQNI+2f3dGkxvN/VWsdYTs1OWwhGqxZDM/B5SxIXYPI="; }; meta = with lib; { From 73f51168cbe06c8797ca7f275493e5d545e58d27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 15:35:25 +0100 Subject: [PATCH 488/673] python3Packages.nanoid: init at 2.0.0 --- .../python-modules/nanoid/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/nanoid/default.nix diff --git a/pkgs/development/python-modules/nanoid/default.nix b/pkgs/development/python-modules/nanoid/default.nix new file mode 100644 index 000000000000..495e7337f877 --- /dev/null +++ b/pkgs/development/python-modules/nanoid/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nanoid"; + version = "2.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WoDK1enG6a46Qfovs0rhiffLQgsqXY+CvZ0jRm5O+mg="; + }; + + doCheck = false; # tests not in sdist, git not tagged + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nanoid" + ]; + + meta = with lib; { + description = "A tiny, secure, URL-friendly, unique string ID generator for Python"; + homepage = "https://github.com/puyuan/py-nanoid"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da85f0e3352d..d2efbb0de3bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6088,6 +6088,8 @@ self: super: with self; { nampa = callPackage ../development/python-modules/nampa { }; + nanoid = callPackage ../development/python-modules/nanoid { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; nomadnet = callPackage ../development/python-modules/nomadnet { }; From 51dd1f3ed5a61a770718d5f5a479d61bf9b75752 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 15:42:48 +0100 Subject: [PATCH 489/673] python3Packages.syrupy: init at 3.0.6 --- .../python-modules/syrupy/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/syrupy/default.nix diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix new file mode 100644 index 000000000000..c3430a2d6f90 --- /dev/null +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest +, colored +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "syrupy"; + version = "3.0.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tophat"; + repo = "syrupy"; + rev = "refs/tags/v${version}"; + hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + colored + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}"; + description = "Pytest Snapshot Test Utility"; + homepage = "https://github.com/tophat/syrupy"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2efbb0de3bf..d05eba3a8407 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11007,6 +11007,8 @@ self: super: with self; { sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; + syrupy = callPackage ../development/python-modules/syrupy { }; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; tables = callPackage ../development/python-modules/tables { }; From 537fdd3167fdc9a2dcfc8475fe0769b68ff51886 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:52 +0100 Subject: [PATCH 490/673] python3Packages.textual: 0.1.18 -> 0.9.1 --- .../python-modules/textual/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 5806b28e3490..4afe9220fa15 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -2,15 +2,24 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, importlib-metadata +, nanoid , rich , typing-extensions +, aiohttp +, click +, jinja2 +, msgpack +, pytest-aiohttp , pytestCheckHook , pythonOlder +, syrupy +, time-machine }: buildPythonPackage rec { pname = "textual"; - version = "0.1.18"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,29 +27,38 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Textualize"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-a32H5X3VsfYuU1TkOH5uGn1eDLvGUDI6WhXEQ0AKwq8="; }; nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'importlib-metadata = "^4.11.3"' 'importlib-metadata = "*"' + ''; + propagatedBuildInputs = [ + importlib-metadata + nanoid rich - ] ++ lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; checkInputs = [ + aiohttp + click + jinja2 + msgpack + pytest-aiohttp pytestCheckHook + syrupy + time-machine ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.3.0"' 'rich = "*"' - ''; - pythonImportsCheck = [ "textual" ]; From f1582b3c1d2b5cd1e5ec4de16c164d0118edb202 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:52 +0100 Subject: [PATCH 491/673] python3Packages.thinc: 8.1.1 -> 8.1.6 --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 1a43bcbbc4ed..64646c08cc65 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.1"; + version = "8.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80="; + hash = "sha256-kkHDd2HwBP5oTmN9K02Lea3eurxk40OqHLoUT60sm0c="; }; buildInputs = [ From efa9d8990df37ec49bb7ed3350c2721868319631 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:52 +0100 Subject: [PATCH 492/673] python3Packages.tifffile: 2022.8.12 -> 2022.10.10 --- 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 8e4bacad9aac..f2b841e22b47 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 = "2022.8.12"; + version = "2022.10.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PnTg/UiDhHfrz0Dgm3eAvQle5ZILIjj0heLGhGOj3LQ="; + hash = "sha256-ULYbqUO4ZtGRKVvDigAZHJ/asj7OBjVEx/GiZOP2qo4="; }; propagatedBuildInputs = [ From 5192e51ab66a198906b5e7fade6b5fe3420c7c95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:52 +0100 Subject: [PATCH 493/673] python3Packages.tiledb: 0.16.3 -> 0.19.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 99020f8d7ac1..ab5cf84d8697 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.16.3"; + version = "0.19.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - sha256 = "sha256-Tg2MHlLwwcpXoHoflaNWXmXr6s7dg3IJou4PZBahRzc="; + sha256 = "sha256-eha0I/SJmBGFdvJrNUBg/sx54UXdbjhEbyvI40Vngm4="; }; nativeBuildInputs = [ From 3eb732b42e63c7f6a697e3984f3f3072f03632cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:52 +0100 Subject: [PATCH 494/673] python3Packages.timetagger: 22.10.1 -> 22.12.1 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index c7775aa435d6..ee264c909323 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.10.1"; + version = "22.12.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+7PKYVZfX+zDBKpaFwEVftyp4yPL90X9HSQDvoNNFuA="; + sha256 = "sha256-yoDILEE/mUWkGPWp2xTKlkpmw1gZctaQmBsed8U7bHc="; }; propagatedBuildInputs = [ From b7655b80d0533cb94bc6a264b612b9ea0981082a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:52 +0100 Subject: [PATCH 495/673] python3Packages.timezonefinder: 6.0.2 -> 6.1.9 --- pkgs/development/python-modules/timezonefinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index f5dc5f7c346f..c747cac05c02 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.0.2"; + version = "6.1.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jannikmi"; repo = pname; - rev = version; - hash = "sha256-jquaA/+alSRUaa2wXQ6YoDR4EY9OlZCAdcxS5TR0CAU="; + rev = "refs/tags/${version}"; + hash = "sha256-A5s1npvgJGp6SvIqoXGRmFN3iE0pqMUl1ZTi07ix5b0="; }; nativeBuildInputs = [ From ef92e33096d9de730d45305c14fb78a55c09100e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 496/673] python3Packages.torchinfo: 1.7.1 -> 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 f751a046aeca..c18f1c68be98 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.1"; + 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-jiQ24gx3N9djvTTB6IthzxcuGWX2/php0Up3IdEDvm8="; + hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; }; propagatedBuildInputs = [ From a3c6b213088d94613857131144464b9fa726aba9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 497/673] python3Packages.torchmetrics: 0.9.3 -> 0.11.0 --- 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 eee18b2cb7b3..8dbf0cd3cdf1 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.9.3"; + version = "0.11.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY="; + hash = "sha256-vHWW9TAIocU4g7++UQ0SWtOV/Cdtdq+tOV1x0MLwY7E="; }; propagatedBuildInputs = [ From daf41758cf32c5c8f26d92c3e9a6e307635b1ddc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 498/673] python3Packages.tox: 4.0.16 -> 4.1.0 --- 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 c60691c0674b..b0cf95cd3ae8 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.0.16"; + version = "4.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-D53koe8XJLhEmDqfFOs2quDNVsC0jvr3/VzNCH4h8DY="; + hash = "sha256-ApJa7v1HJDca2jvZFKqOgKho4fI2tXFrjaFzLcS9Vfk="; }; postPatch = '' From 7e0f659543227170f28b4fb8c488571ffb280dd1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 499/673] python3Packages.trainer: 0.0.16 -> 0.0.20 --- 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 627c21ee4bf0..1e0b177b8928 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -17,7 +17,7 @@ let pname = "trainer"; - version = "0.0.16"; + version = "0.0.20"; in buildPythonPackage { inherit pname version; @@ -27,7 +27,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-G2qFQEO5OOEI2jsb+zXsO8cbC13o7pqAC2xkFrhGkLc="; + hash = "sha256-se2Q2wJyynPc/3TkfEn4nEh+emqBJBwPGDSnOV+sH4I="; }; postPatch = '' From 79dec5e91081cab465561d5e308afd218bb20bca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 500/673] python3Packages.traitlets: 5.4.0 -> 5.8.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 30bff404032e..565730bd34da 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.4.0"; + version = "5.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PyxOQ14nFZL+Q5DxdG6laDbjoID4Tngz8PgB2WE/7Dk="; + sha256 = "sha256-bMV9bcKMhdU2WWFyb/0ZtThzk0d0nhPr404DMjoOj4Q="; }; nativeBuildInputs = [ hatchling ]; From 9e4c065d5855ac40648af9accf63fc91bdef2760 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 501/673] python3Packages.treex: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/treex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 7f247bbdc07d..17f12cab5b07 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "treex"; - version = "0.6.10"; + version = "0.6.11"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; - rev = version; - hash = "sha256-ZHfgmRNbFh8DFZkmilY0pmRNQhJFqT689I7Lu8FuFm4="; + rev = "refs/tags/${version}"; + hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ="; }; # At the time of writing (2022-03-29), rich is currently at version 11.0.0. From a0c4c05557ae6adc336445ebd7e36c3cb45333d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 502/673] python3Packages.trio: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 7bbfb6f2ca9c..ca262f773461 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.21.0"; + version = "0.22.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uj85t7ae73NQHOv+Gq/UAKmq1bA1Q6Dt7VKVJIj/HBM="; + sha256 = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8="; }; propagatedBuildInputs = [ From 5f668e684a487cb4755be07dbfc1b0da579f0c49 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 503/673] python3Packages.trove-classifiers: 2022.12.1 -> 2022.12.22 --- 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 4e87963e9e8d..c8e99f7971ec 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2022.12.1"; + version = "2022.12.22"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "8eccd9c075038ef2ec73276e2422d0dbf4d632f9133f029632d0df35374caf77"; + sha256 = "sha256-/g/j8IWYcWGu4qWoU8fMfN9kUVxZZdV62Wj92Mw7A2I="; }; nativeBuildInputs = [ From a30b1a4ba084436d69e47ae4c1d76dfc814ec1df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:53 +0100 Subject: [PATCH 504/673] python3Packages.trytond: 6.4.5 -> 6.6.1 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index ce39ed5d1a05..35d0a9322d4a 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.4.5"; + version = "6.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AF8LG68K+CvHpFOIoGbxD+lF7IVwBDk8K06I4uTNguI="; + sha256 = "sha256-fE1JBlvKIvDFjMat/lgOM22rIpMlqnxoo9p8VJF6szs="; }; propagatedBuildInputs = [ From 8867ba18082bf29d2a7854df79937a54a7b507dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:54 +0100 Subject: [PATCH 505/673] python3Packages.ttp: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/ttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index afa66b288ab2..0301a8673165 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FhuIYXktcNnOVX+KU5cDOd2Qk7AcWaSKvfB/BZYpsZo="; + hash = "sha256-KhQRC4zcLCnYUtQm08wJzb/YwBquOEGR5L0YUmnzheg="; }; nativeBuildInputs = [ From 68db460e6fc0d771a21581265fe48729fab85429 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:54 +0100 Subject: [PATCH 506/673] python3Packages.turnt: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/turnt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index a04d16a959fd..b6c0549c040a 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "turnt"; - version = "1.8.0"; + version = "1.9.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "c6cfcb68a3353032c4ce6fff352196e723d05f9cee23eaf4f36d4dcfd89b8e49"; + sha256 = "sha256-X0uJmY2MVnvM50LDBXDn9hK4NuHAil4Kf39V/8b8OIQ="; }; propagatedBuildInputs = [ From 8f899dbe485c35453ba8e6d520fa0fb29a5dad50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:54 +0100 Subject: [PATCH 507/673] python3Packages.twill: 3.0.2 -> 3.1 --- pkgs/development/python-modules/twill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index f68ec91e1cbb..fdc750fa8962 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "twill"; - version = "3.0.2"; + version = "3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk="; + hash = "sha256-tWcZRvBvkRyQ7gD5zjocBzFVlzQ0Mhf1unF3gUkhB94="; }; propagatedBuildInputs = [ From fcbec3c53318137c723af2e4ced3d031e604727c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:54 +0100 Subject: [PATCH 508/673] python3Packages.twitchapi: 2.5.7.1 -> 3.2.1 --- pkgs/development/python-modules/twitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 9427d39c20af..96fdbd249746 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.7.1"; + version = "3.2.1"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-ZhmzrHWbwoHL+9FdkVoc+GGxH1v2j7rB/3ZiaWu9kjQ="; + hash = "sha256-E01LkuTnHy2R4Vdr2iLNi7f8KjsIRoDHokyjLAnWieM="; }; propagatedBuildInputs = [ From 96994cfea89b1492662b1383448f1c6c314354b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:54 +0100 Subject: [PATCH 509/673] python3Packages.typed-settings: 1.1.1 -> 2.0.0 --- pkgs/development/python-modules/typed-settings/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 81ca0bfd0bf3..f866e631a089 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -13,13 +13,14 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "1.1.1"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-fbo4oj84j7Vkz2V6B/EqoyRl9OutSpm5Ko9Tctu2DYM="; + pname = "typed_settings"; + inherit version; + hash = "sha256-o0cPD/7/DS9aUtLDA1YhxKrxUDE7Elv4B7zlKVSsFJQ="; }; nativeBuildInputs = [ From bc5b4286b00b52ff3aa32a3cb5b28aa1d9a7f4e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:54 +0100 Subject: [PATCH 510/673] python3Packages.typer: 0.6.1 -> 0.7.0 --- pkgs/development/python-modules/typer/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 35a946c6079b..0048109bccae 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -17,16 +17,21 @@ buildPythonPackage rec { pname = "typer"; - version = "0.6.1"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM="; + hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "rich >=10.11.0,<13.0.0" "rich" + ''; + nativeBuildInputs = [ flit-core ]; From e935b52e4beac7084b2ce9c6c469f227c9c241a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:54 +0100 Subject: [PATCH 511/673] python3Packages.types-protobuf: 3.20.4.2 -> 4.21.0.2 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 92415fb04c61..862b8ff805c2 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.20.4.2"; + version = "4.21.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/WWrhQL5oI4InyytJtUvqwTNVzIs+JbFcKszkcp2C64="; + sha256 = "sha256-ffSD00rT/LH6f/8Qc1YNWWyawfQZz6hRsiDJqTOGyZg="; }; propagatedBuildInputs = [ From 558997fbf384ac8794e489f379b0db729bcdd733 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 512/673] python3Packages.uamqp: 1.6.0 -> 1.6.3 --- pkgs/development/python-modules/uamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 6fb474aefc2b..985a0af28f83 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.0"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LDG3ShCFbszyWNc8TQjlysTWBgo0uYNIkL/UK8sTg1A="; + sha256 = "sha256-fOA+tGANKKHeq0uGbzd9Tq5/yc3Gfj6I94jV8daD3IY="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ From 9d39427bd540c0472edaaccc05a91e7e4a08430c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 13:33:08 +0100 Subject: [PATCH 513/673] python3Packages.cu2qu: init at 1.6.7.post2 --- .../python-modules/cu2qu/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/cu2qu/default.nix diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix new file mode 100644 index 000000000000..b62b4cb11a77 --- /dev/null +++ b/pkgs/development/python-modules/cu2qu/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build +, cython +, setuptools-scm +, setuptools + +# propagates +, defcon +, fonttools + +# tests +, pytestCheckHook +}: + +let + pname = "cu2qu"; + version = "1.6.7.post2"; +in +buildPythonPackage rec { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HfVi2ZvWBZImCI9ENwK/Uc/djMY2I/IxN0WaeNe/WAg="; + extension = "zip"; + }; + + nativeBuildInputs = [ + cython + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + defcon + fonttools + ] ++ fonttools.optional-dependencies.ufo; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/googlefonts/cu2qu/releases/tag/v${version}"; + description = "Cubic-to-quadratic bezier curve conversion"; + homepage = "https://github.com/googlefonts/cu2qu"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d05eba3a8407..fc30327e2d5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2094,6 +2094,8 @@ self: super: with self; { csvw = callPackage ../development/python-modules/csvw { }; + cu2qu = callPackage ../development/python-modules/cu2qu { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cufflinks = callPackage ../development/python-modules/cufflinks { }; From b0a1aac93a02eabfbf765b2f296c28e67a65771a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 514/673] python3Packages.ufo2ft: 2.28.0 -> 2.30.0 --- .../python-modules/ufo2ft/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 5a87bfd42c2b..5e20ffaafe67 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -1,45 +1,50 @@ { lib , buildPythonPackage , fetchPypi + +# build , setuptools-scm -, fonttools -, defcon -, compreffor + +# runtime , booleanoperations , cffsubr +, compreffor +, cu2qu +, defcon +, fonttools +, skia-pathops , ufoLib2 + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "ufo2ft"; - version = "2.28.0"; - + version = "2.30.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pWHvjAvHNWlmJiQ75JRmFyrjYnzbJG7M8/DGoIWpEBk="; + hash = "sha256-ZpO55rNXkVbqMdGxsZn77gJnGBbM8c8GIAaQnTzVnf8="; }; - patches = [ - # Use cu2qu from fonttools. - # https://github.com/googlefonts/ufo2ft/pull/461 - ./fonttools-cu2qu.patch - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ + cu2qu fonttools defcon compreffor booleanoperations cffsubr ufoLib2 - ]; + skia-pathops + ] + ++ fonttools.optional-dependencies.lxml + ++ fonttools.optional-dependencies.ufo; checkInputs = [ pytestCheckHook From d27ea37e462ad10a996d74b40eba7cc8d5854e21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 515/673] python3Packages.ufoLib2: 0.13.1 -> 0.14.0 --- .../python-modules/ufoLib2/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index fab42e5169b8..e42b6766f439 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -4,35 +4,46 @@ , attrs , fonttools , pytestCheckHook -, fs , setuptools-scm + +# optionals +, cattrs +, lxml +, orjson +, msgpack }: buildPythonPackage rec { pname = "ufoLib2"; - version = "0.13.1"; - + version = "0.14.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs="; + hash = "sha256-OdUJfNe3nOQyCf3nT9/5y/C8vZXnSAWiLHvZ8GXMViw="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ attrs fonttools - # required by fonttools[ufo] - fs - ]; + ] ++ fonttools.optional-dependencies.ufo; - nativeBuildInputs = [ setuptools-scm ]; + passthru.optional-dependencies = { + lxml = [ lxml ]; + converters = [ cattrs ]; + json = [ cattrs orjson ]; + msgpack = [ cattrs msgpack ]; + }; checkInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); -pythonImportsCheck = [ "ufoLib2" ]; + pythonImportsCheck = [ "ufoLib2" ]; meta = with lib; { description = "Library to deal with UFO font sources"; From c09b2de6e828f1edcce7dfd88ec02f7fc6517992 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 516/673] python3Packages.u-msgpack-python: 2.7.1 -> 2.7.2 --- pkgs/development/python-modules/u-msgpack-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 1a82fe4b70a8..a472cc1546cb 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551"; + sha256 = "sha256-6G96xqoO9MbEnwBLT9Q1vOmcI+LdXXMAPz+YFgJMK9g="; }; LC_ALL="en_US.UTF-8"; From 932c1971277db3f88fb1a508de1f3d497efae857 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 517/673] python3Packages.uncompyle6: 3.8.0 -> 3.9.0 --- pkgs/development/python-modules/uncompyle6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 15c7322fb3c3..b22de9043ecb 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.8.0"; + version = "3.9.0"; disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331 src = fetchPypi { inherit pname version; - sha256 = "sha256-YgYzYY9t/B8+eBh+Igk014/8Y5wOOdrsofxTWquBcBQ="; + sha256 = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0="; }; checkInputs = [ nose pytest hypothesis six ]; From d362772c49ba0bfb2e0d2c53209d9b1cfcba45ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 518/673] python3Packages.upb-lib: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/upb-lib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 52b422c0e1d3..310480a49ab4 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -8,13 +8,14 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0="; + pname = "upb_lib"; + inherit version; + hash = "sha256-/TNKsno0JJtxBY9HCPQfp7OhlfkOP6sJI51rgp2ujDg="; }; propagatedBuildInputs = [ From 6171fc94a14cc016dab803186980b183f69c7612 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 519/673] python3Packages.vallox-websocket-api: 2.12.0 -> 3.0.0 --- .../python-modules/vallox-websocket-api/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 821dbb19e635..8e760921ba28 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , construct , websockets , asynctest @@ -10,19 +11,22 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "2.12.0"; + version = "3.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; - format = "setuptools"; - src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-Ibp+oAd6q8Vu9V+TaLzlPbWIDheFUjCyW83Hg4Ztw20="; + hash = "sha256-iy5ipW7ldvLWhfxgPlWcsFeKrAXqtyypveAX74u8zmo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ construct websockets From 0e57d7d533b1dd48497bf7d43d8d4db38b15f116 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: [PATCH 520/673] python3Packages.vector: 0.10.0 -> 0.11.0 --- 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 706c6eb85ec8..04190a8eb4ba 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "vector"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b785678f449de32476f427911248391ddcc7c3582a522a88cbbd50c92dcae490"; + sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y="; }; nativeBuildInputs = [ From f7b0e864b950568ec92c440d2744b3d90fe8c603 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 521/673] python3Packages.viv-utils: 0.7.5 -> 0.7.7 --- pkgs/development/python-modules/viv-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 6b86123ade75..4df2ecd0ed94 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; - rev = "v${version}"; - sha256 = "sha256-JDu+1n1wP2Vsp2V/bKdE+RFp6bE8RNmimi4wdsatwME="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE="; }; postPatch = '' From 7e3e0b42ac2d5885d267497cc6f5dbabae5f9f9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 522/673] python3Packages.vowpalwabbit: 9.5.0 -> 9.6.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index d87bbff3595e..40303c29f9c9 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.5.0"; + version = "9.6.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-LfEP0T/dYFuLPgz8cBtO6iajfnTt9GXCuor0NibP0qY="; + sha256 = "sha256-LHs98lccPjub5GDPB3dxtkOYCDxri04CVpSSsypa4xI="; }; nativeBuildInputs = [ From 9170e9911c03545764a99c231325eef29640662e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 523/673] python3Packages.vsure: 1.8.1 -> 2.6.0 --- .../development/python-modules/vsure/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 4928c2adc40c..1551ab31183e 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, click , requests }: buildPythonPackage rec { pname = "vsure"; - version = "1.8.1"; + version = "2.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zh83t7yjZU2NjOgCkqPUHbqvEyEWXGITRgr5d2fLtRI="; + hash = "sha256-KMLW1270Xs9s2a4ROWTvwRpfr4n4RO9rIYlskNjGzFQ="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + click + requests + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "verisure" ]; + + pythonImportsCheck = [ + "verisure" + ]; meta = with lib; { description = "Python library for working with verisure devices"; From bbc981ec236e05adc194eec578a6ed3b75821427 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 524/673] python3Packages.vulture: 2.5 -> 2.6 --- 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 0062bbd9e415..bb5d1fd31b45 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.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KDFpQFXrLjagnDt2gJNINxArm2wJaSBuOQLVE2Ehd8M="; + hash = "sha256-JRX6hIGBAB3Ipzq6agGhoXQG9dNy8k7H9xkYZvn0mX4="; }; postPatch = '' From 4d1ff9f6f1f9f1b54ded267ba30064359bdd0cda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 525/673] python3Packages.wandb: 0.13.5 -> 0.13.7 --- pkgs/development/python-modules/wandb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index b649bd16880a..8925ea7f3476 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.13.5"; + version = "0.13.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1GoFmncG5bUWJOIUDLatopQMxCFsmlcj8aofJMGUTzQ="; + hash = "sha256-o9mIGSILztnHY3Eyb0MlznUEdMbCfA1BT6ux0UlesBc="; }; patches = [ From 0896e7a96db2ad67e8c63607c123eddead6bdd6b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 526/673] python3Packages.wasabi: 0.10.1 -> 1.1.0 --- pkgs/development/python-modules/wasabi/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 2f751e8105e4..6fc0f16bec4e 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# tests +, ipykernel +, nbconvert +, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { pname = "wasabi"; - version = "0.10.1"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yONyeBvhknKUI4KxTZkxTRdVGNeCIFfLepcBDEJZ0kk="; + sha256 = "sha256-RaYTplXhFKsnL1rxRMNR+VT92S2ym3z6buIQuCwZeeU="; }; checkInputs = [ + ipykernel + nbconvert + typing-extensions pytestCheckHook ]; From c335326b2faae55ae20c97fd84e84e1aaae90f23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 527/673] python3Packages.weasyprint: 57.0 -> 57.2 --- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 71ae956d6df8..96b7ec489800 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "57.0"; + version = "57.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-e29cwTgZ6afYdIwdvw6NJET3pIGKmDOfgtzKqCK/kRs="; + hash = "sha256-uOnvLcvPvILpkhWs/Wj5R7K18ZmbWxVtt1+r44C6fpo="; }; patches = [ From af3649d1e40d577ffeba75c7acce632a8fe0ddac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 528/673] python3Packages.whatthepatch: 1.0.2 -> 1.0.3 --- .../python-modules/whatthepatch/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix index 9244e26520cd..5c6d0114d034 100644 --- a/pkgs/development/python-modules/whatthepatch/default.nix +++ b/pkgs/development/python-modules/whatthepatch/default.nix @@ -2,19 +2,25 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "whatthepatch"; - version = "1.0.2"; + version = "1.0.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "cscorley"; repo = pname; - rev = version; - hash = "sha256-0l/Ebq7Js9sKFJ/RzkQ1aWEDCxt+COVd2qVnLSWwFx0="; + rev = "refs/tags/${version}"; + hash = "sha256-P4SYSMdDjwXOmre3hXKS4gQ0OS9pz0SWqBeD/WQMQFw="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From f129485c7150e72ed58b33baebe4729a96011bf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:56 +0100 Subject: [PATCH 529/673] python3Packages.widgetsnbextension: 4.0.3 -> 4.0.5 --- .../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 7b077d14c58e..65d5eebfeaa4 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.3"; + version = "4.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY="; + hash = "sha256-AD9xbZMNOFvj/Z3kLdm/AI4wBT9zvd3iNdFPvq7/Ga8="; }; nativeBuildInputs = [ From 7021745d29b2e7a52a1dd4783c709f82bdb60e34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 530/673] python3Packages.wordfreq: 2.5.1 -> 3.0.2 --- pkgs/development/python-modules/wordfreq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 72a2f013928d..ce8c81b2ab94 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "wordfreq"; - version = "2.5.1"; + version = "3.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; - rev = "v${version}"; - sha256 = "1lw7kbsydd89hybassnnhqnj9s5ch9wvgd6pla96198nrq9mj7fw"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE="; }; propagatedBuildInputs = [ From b5f0b70c351a5afad3c324560d6772237b0c04fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 531/673] python3Packages.xarray: 2022.6.0 -> 2022.12.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 2d10f0ddb572..a24743ed2884 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2022.6.0"; + version = "2022.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ECjRmEk/ZrsVvTXc/dEd79gxy+469lif/xb0G93WfoQ="; + sha256 = "sha256-CD0I5VKnZHx+zhNt+jpLahN5JWvrVbvti43fBfHhTsc="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; From d661aed24b3e801fd36f03d6d0343f89eec8f138 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 532/673] python3Packages.xarray-einstats: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/xarray-einstats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index 244541f7d852..df8855cc7a2f 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N8ievasPaqusx51FCxcl1FGIjXooyBsRqsuRU73puRM="; + hash = "sha256-6Wf5pc8e36lMv1V115N6sQbmE4l3QT6kbO7izUws0zc="; }; nativeBuildInputs = [ From 431617b025f7551be50e1f673b11a364cea59e04 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 533/673] python3Packages.xcffib: 0.11.1 -> 1.1.2 --- pkgs/development/python-modules/xcffib/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index cb9e1ddf921c..3f3a35edf1dc 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -3,17 +3,17 @@ , fetchPypi , xorg , cffi -, nose , six +, pytestCheckHook }: buildPythonPackage rec { - version = "0.11.1"; + version = "1.1.2"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "12949cfe2e68c806efd57596bb9bf3c151f399d4b53e15d1101b2e9baaa66f5a"; + sha256 = "sha256-Wqc6wlUUUpfMeJmhEFmEf41TDz2zhLPeOqwT+GDgS6w="; }; patchPhase = '' @@ -25,7 +25,11 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + xorg.xeyes + xorg.xorgserver + ]; pythonImportsCheck = [ "xcffib" ]; From 0a0a2908f0ad2a868bf08fb18a9402841366a17b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 534/673] python3Packages.xknx: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 2f3a3768331f..9d97d0268edc 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a8hC63G+FZBe6yePgrmzRsRTzpHWS+tBQmVUS/uHfzI="; + hash = "sha256-vz24saI0wuhax4/zCBDM3HB+ZjZI8bGOWr2va4V3zV8="; }; propagatedBuildInputs = [ From 671ba422dd4652850a4ff2d53c8ca6c3ab3bce5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 535/673] python3Packages.xlib: 0.31 -> 0.33 --- .../python-modules/xlib/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 05d5e095a163..29bab5e9b289 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -13,24 +13,29 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.31"; + version = "0.33"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; - rev = version; - sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; + rev = "refs/tags/${version}"; + hash = "sha256-u06OWlMIOUzHOVS4hvm72jGgTSXWUqMvEQd8bTpFog0="; }; - patches = [ - ./fix-no-protocol-specified.patch + nativeBuildInputs = [ + setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ xorg.libX11 ]; - propagatedBuildInputs = [ six ]; + buildInputs = [ + xorg.libX11 + ]; + + propagatedBuildInputs = [ + six + ]; doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook mock @@ -46,9 +51,11 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-xlib/python-xlib/releases/tag/${version}"; description = "Fully functional X client library for Python programs"; - homepage = "http://python-xlib.sourceforge.net/"; - license = licenses.gpl2Plus; + homepage = "https://github.com/python-xlib/python-xlib"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; }; } From 70008b33766e9ecd09756b71ade843fc9baa177a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 536/673] python3Packages.xml2rfc: 3.15.1 -> 3.15.3 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 28c9a856b3f8..5a9b839c3b57 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.15.1"; + version = "3.15.3"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/0Y49ZSaPM3IAFJGmWKiKD+mziA0LYQ3fvGFrkPkl9Y="; + sha256 = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; }; postPatch = '' From f0f59b94fea075e62f29816cdbeb415535799b14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: [PATCH 537/673] python3Packages.xmlschema: 1.11.3 -> 2.1.1 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 3dcfe8d7d026..b22f626d1a73 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "1.11.3"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-z6VgLRDp5PHaYstdV30gt6xGVd4uifz4LkYQ2z3ayk4="; + hash = "sha256-rt7QScg458ezDwktO1QRydmC3XqedX+kPpv6J+JvLzQ="; }; propagatedBuildInputs = [ From 7be5ba8e83755c0c2bfcdebd6e3dd2457bb8dd0f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 538/673] python3Packages.xxhash: 3.1.0 -> 3.2.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 658784387354..00cc42ee56c2 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.1.0"; + version = "3.2.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rCGx4h3G/f7ppXtT9Hd1OdU6hPLhVGo/gC8Vn5lmvcE="; + sha256 = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; }; nativeBuildInputs = [ From a225fbc6911312aa5ed1b9f4804d1ade5731fcdd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 539/673] python3Packages.yangson: 1.4.14 -> 1.4.15 --- 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 42caebb92e8b..2978799699e6 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.14"; + version = "1.4.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OMqtZ/kPj7ge235nuyrfCzawG6AOAqfJPzQHF8cW4Ok="; + sha256 = "sha256-yw/LwWjHW4vgHp06E/DgqauTvdfLxerHw1avge91XLU="; }; nativeBuildInputs = [ From 57123cd83b8a0ac74f013ddd0f310ed1023cea06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 540/673] python3Packages.yfinance: 0.1.93 -> 0.2.3 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 7a76ebeb8f28..86d93a604990 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.93"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AyuIngXReI4PX554SuGIgoQoklFieZiEZzeVBcvPvEk="; + hash = "sha256-1xO+zz+syuiWeZAxnRIV0va8WOIW2P9elRBtHDk7w1M="; }; propagatedBuildInputs = [ From 79a6bfe31000d4908c398b21a697cd3a5ae40974 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 541/673] python3Packages.yoyo-migrations: 7.3.2 -> 8.2.0 --- .../python-modules/yoyo-migrations/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yoyo-migrations/default.nix b/pkgs/development/python-modules/yoyo-migrations/default.nix index 14c90dbd5f28..14aec06320d7 100644 --- a/pkgs/development/python-modules/yoyo-migrations/default.nix +++ b/pkgs/development/python-modules/yoyo-migrations/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , setuptools , sqlparse , tabulate @@ -8,14 +9,19 @@ buildPythonPackage rec { pname = "yoyo-migrations"; - version = "7.3.2"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RIQIKOGgFp9UHnAtWu3KgYWtpoCH57rUhQpvxdced6Q="; + sha256 = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q="; }; - propagatedBuildInputs = [ setuptools sqlparse tabulate ]; + propagatedBuildInputs = [ + importlib-metadata + setuptools + sqlparse + tabulate + ]; doCheck = false; # pypi tarball does not contain tests From 43fce8b435ef6ee4732e0a16a62a952c1c13d5bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 542/673] python3Packages.zarr: 2.12.0 -> 2.13.3 --- 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 72cd251dcb31..dbe559724789 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.12.0"; + version = "2.13.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-UVox7kuta7SK4FF4xYiuSaAqNd76Ad2aMpMwaQM2gWU="; + sha256 = "sha256-2ySwkGFsY49l4zprxdlW1kIiEYKWFRXMvCixf7DQtIw="; }; nativeBuildInputs = [ From 0373076e2f8475418ea428004a82843c3c4a98e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 543/673] python3Packages.zdaemon: 4.3 -> 4.4 --- pkgs/development/python-modules/zbaemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index 23eae31057fc..738fbb075603 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zdaemon"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72"; + sha256 = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; }; propagatedBuildInputs = [ zconfig ]; From 270672d8441c106493166d8bc06caa0517cc4d14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 544/673] python3Packages.ZConfig: 3.6.0 -> 3.6.1 --- pkgs/development/python-modules/zconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 521bca4ece8c..22e4530674f3 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ZConfig"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; + sha256 = "sha256-RCLH1mOvdizXeVd1NmvGpnq0QKGreW6w90JbDpA08HY="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; From 4c7d998638275cadbe96ebce1fc205b338e88231 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 545/673] python3Packages.zeep: 4.1.0 -> 4.2.1 --- pkgs/development/python-modules/zeep/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 83ee3f37f7e4..033975ed5dbc 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -28,25 +28,17 @@ buildPythonPackage rec { pname = "zeep"; - version = "4.1.0"; + version = "4.2.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mvantellingen"; repo = "python-zeep"; - rev = version; - sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY="; }; - patches = [ - (fetchpatch { - # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293 - url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch"; - hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4="; - }) - ]; - propagatedBuildInputs = [ attrs cached-property From a6b94a416a31491c7a1d758bc6c51251946e198a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: [PATCH 546/673] python3Packages.zeroconf: 0.39.4 -> 0.47.1 --- .../python-modules/zeroconf/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 6bc6b7888d8c..a65e485004a8 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -4,15 +4,17 @@ , buildPythonPackage , fetchFromGitHub , ifaddr +, poetry-core , pytest-asyncio , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "zeroconf"; - version = "0.39.4"; - format = "setuptools"; + version = "0.47.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +22,14 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-CUHpTtCQBuuy8E8bjxfhGOIKr9n2Gdhg/RIyv6OWGvI="; + hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA="; }; + nativeBuildInputs = [ + poetry-core + setuptools + ]; + propagatedBuildInputs = [ async-timeout ifaddr @@ -36,6 +43,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + disabledTests = [ # tests that require network interaction "test_close_multiple_times" @@ -58,6 +69,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}"; description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21Only; From b4e0b24819fb543c1843db0279e2d65860937d8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 547/673] python3Packages.zipp: 3.10.0 -> 3.11.0 --- pkgs/development/python-modules/zipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index cdabed860c92..5a80489e8091 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.10.0"; + version = "3.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-enJi/ZML0+NsULmmSJeuw/r/89/e7JYjriK0DpP5m7g="; + sha256 = "sha256-p6IuBZKSkKZ0AUQLOWkK5lYyebztXzFGCdnQN5j1Z2Y="; }; nativeBuildInputs = [ From b7af636eb45e0d00622eb998010a2c304f266d88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 548/673] python3Packages.zope.copy: 4.2 -> 4.3 --- pkgs/development/python-modules/zope_copy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix index be4cdca72b65..ce9595ad537d 100644 --- a/pkgs/development/python-modules/zope_copy/default.nix +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "zope.copy"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "47bb9d09ff06c600b446f220f47a742396598ac4828d738d3d85e6490629a71a"; + sha256 = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc="; }; propagatedBuildInputs = [ zope_interface ]; From 2dbaf9479de651ea79a70504c3cdd9e024dbb235 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 549/673] python3Packages.zope.event: 4.5.0 -> 4.6 --- pkgs/development/python-modules/zope_event/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index 118a3a2c44a3..fddf45ef0631 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.event"; - version = "4.5.0"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330"; + sha256 = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA="; }; meta = with lib; { From faff52cbc1f4beb3afc82863225b03b01dbccfd1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 550/673] python3Packages.zope.exceptions: 4.5 -> 4.6 --- pkgs/development/python-modules/zope_exceptions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index fb1eb07154a0..16da25903ea1 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.5"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4="; + sha256 = "sha256-YZ0kpMZb7Zez3QUV5zLoK2nxVdQsyUlV0b6MKCiGg80="; }; propagatedBuildInputs = [ zope_interface ]; From c42766c56d5d8d3c26c7551b24fbd7c4befcc5b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 551/673] python3Packages.zope-hookable: 5.2 -> 5.4 --- pkgs/development/python-modules/zope-hookable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index f1bc3bf72f74..20d810064b6d 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "5.2"; + version = "5.4"; src = fetchPypi { pname = "zope.hookable"; inherit version; - sha256 = "sha256-TDAYvPKznPXMz0CCb3mbS4wUAFbbeA+WywyjMqJDvSk="; + sha256 = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; }; checkInputs = [ zope_testing ]; From 4d7043ea4ec0cbb2e79db1e560882fd4a161865e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 552/673] python3Packages.zope.i18nmessageid: 5.0.1 -> 5.1.1 --- .../development/python-modules/zope_i18nmessageid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 1155adc83e9e..3e89f05f60ff 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zope.i18nmessageid"; - version = "5.0.1"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "9534142b684c986f5303f469573978e5a340f05ba2eee4f872933f1c38b1b059"; + sha256 = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; }; propagatedBuildInputs = [ six ]; From 1e07e713aa743838e4e44d73a7260d08f5ab2eae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 553/673] python3Packages.zope.interface: 5.4.0 -> 5.5.2 --- pkgs/development/python-modules/zope_interface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index c1f61a4cbee5..eea485ab2a58 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "5.4.0"; + version = "5.5.2"; src = fetchPypi { inherit pname version; - sha256 = "5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e"; + sha256 = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE="; }; propagatedBuildInputs = [ zope_event ]; From d0fb184d06d84776f59e764c6e6fdabbee82754d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 554/673] python3Packages.zope.location: 4.2 -> 4.3 --- pkgs/development/python-modules/zope_location/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 69fee2e338ff..f4fe420951dd 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.location"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac"; + sha256 = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU="; }; propagatedBuildInputs = [ zope_proxy ]; From c7e7e791d172f0b1b4540c19afc114ebcfd329c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: [PATCH 555/673] python3Packages.zope.proxy: 4.5.0 -> 4.6.1 --- pkgs/development/python-modules/zope_proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 70e329cce9e9..24210e8c73cc 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.5.0"; + version = "4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1329846261cf6c552b05579f3cfad199b2d178510d0b4703eb5f7cdd6ebad01a"; + sha256 = "sha256-+xUTt6jtc3oxI/1XHCRPB+7iRdYIGlY3CyBhHUAPCXQ="; }; propagatedBuildInputs = [ zope_interface ]; From bbac79ab18a806f8ca2df5f7d9af5dd6a3a93ad7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:14:00 +0100 Subject: [PATCH 556/673] python3Packages.zope.schema: 6.2.0 -> 6.2.1 --- pkgs/development/python-modules/zope_schema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 9472000f15d1..4dd97d94e43b 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.2.0"; + version = "6.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2201aef8ad75ee5a881284d7a6acd384661d6dca7bde5e80a22839a77124595b"; + sha256 = "sha256-47M8i8i6nYWlZxOrjwo8JhXVSoCF8eQVzgyN+15UC+Y="; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; From 2f18aa4de898b894f6fbad9223a4d97b86f0b7b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:14:00 +0100 Subject: [PATCH 557/673] python3Packages.zope.testing: 4.10 -> 5.0.1 --- pkgs/development/python-modules/zope_testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index f8ea4e83b15c..773209adcdf4 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.testing"; - version = "4.10"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O25ZBsrd0UjCP+lY5qrj+tyKCKilP3R9l5HC2BNe5W4="; + sha256 = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; doCheck = !isPyPy; From 25198fdf61e2db06b512b8e7f6854f5049aa6c01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:14:00 +0100 Subject: [PATCH 558/673] python3Packages.zope.testrunner: 5.5.1 -> 5.6 --- pkgs/development/python-modules/zope_testrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 1b838354c4cf..a1f85a9d0f36 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.5.1"; + version = "5.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ahDTg1RZ7tO8hDHyGq9gS8dU/4OSopeXzSDlqUHBQ74="; + sha256 = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; From d693b569b87616a15e02fe49204abd20b2435905 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:17:33 +0100 Subject: [PATCH 559/673] python3Packages.wasserstein: normalize pname --- pkgs/development/python-modules/wasserstein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix index 79994a616951..391712828ecd 100644 --- a/pkgs/development/python-modules/wasserstein/default.nix +++ b/pkgs/development/python-modules/wasserstein/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - pname = "Wasserstein"; + pname = "wasserstein"; version = "1.1.0"; src = fetchFromGitHub { owner = "pkomiske"; - repo = pname; + repo = "Wasserstein"; rev = "89c2d6279a7e0aa3b56bcc8fb7b6009420f2563e"; # https://github.com/pkomiske/Wasserstein/issues/1 hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE="; }; From c2c5defbbf59d1adc38115e9c2dab8cdafb8300a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 22:41:01 +0100 Subject: [PATCH 560/673] python3Packages.pytest-shutil: Disable failing test and reformat and use a more recent formatting. --- .../python-modules/pytest-shutil/default.nix | 57 +++++++++++++++---- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index e3b2277fa99b..64b0ff0c1d0d 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,14 +1,33 @@ -{ lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, path, execnet -, contextlib2, termcolor, six }: +{ lib +, isPyPy +, buildPythonPackage +, fetchPypi + +# build +, pytest + +# runtime +, setuptools-git +, mock +, path +, execnet +, contextlib2 +, termcolor +, six + +# tests +, cmdline +, pytestCheckHook + }: buildPythonPackage rec { pname = "pytest-shutil"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"; + hash = "sha256-2BZSYd5251CFBcNB2UwCsRPclj8nRUOrynTb+r0CEmE="; }; postPatch = '' @@ -16,13 +35,31 @@ buildPythonPackage rec { --replace "path.py" "path" ''; - buildInputs = [ pytest ]; - checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor six ]; + buildInputs = [ + pytest + ]; - checkPhase = '' - py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} - ''; + propagatedBuildInputs = [ + setuptools-git + mock + path + execnet + contextlib2 + termcolor + six + ]; + + checkInputs = [ + cmdline + pytestCheckHook + ]; + + disabledTests = [ + "test_pretty_formatter" + ] ++ lib.optionals isPyPy [ + "test_run" + "test_run_integration" + ]; meta = with lib; { description = "A goodie-bag of unix shell and environment tools for py.test"; From 86af3e680b9145a84ed5c9a02a0821f3909eef48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 23:04:45 +0100 Subject: [PATCH 561/673] python3Packages.requests: relax charset-normalizer constraint --- .../python-modules/requests/default.nix | 6 ++ .../requests/relax-charset-normalizer.patch | 55 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/requests/relax-charset-normalizer.patch diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index d7230c532eb2..26641f51a8ed 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -6,6 +6,7 @@ , chardet , charset-normalizer , fetchPypi +, fetchpatch , idna , pysocks , pytest-mock @@ -18,6 +19,7 @@ buildPythonPackage rec { pname = "requests"; version = "2.28.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; @@ -27,6 +29,10 @@ buildPythonPackage rec { hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM="; }; + patches = [ + ./relax-charset-normalizer.patch + ]; + propagatedBuildInputs = [ brotlicffi certifi diff --git a/pkgs/development/python-modules/requests/relax-charset-normalizer.patch b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch new file mode 100644 index 000000000000..ef14c09fffb8 --- /dev/null +++ b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch @@ -0,0 +1,55 @@ +From 54ae822ce968f49a4d5a10e30c5d75e76c887fe4 Mon Sep 17 00:00:00 2001 +From: deedy5 <65482418+deedy5@users.noreply.github.com> +Date: Thu, 20 Oct 2022 18:26:18 +0000 +Subject: [PATCH] Allow charset normalizer >=2 and <4 (#6261) + +--- + requests/__init__.py | 4 ++-- + setup.cfg | 2 +- + setup.py | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/requests/__init__.py b/requests/__init__.py +index 7ac8e29..22db3c1 100644 +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver + elif charset_normalizer_version: + major, minor, patch = charset_normalizer_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) +- # charset_normalizer >= 2.0.0 < 3.0.0 +- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) ++ # charset_normalizer >= 2.0.0 < 4.0.0 ++ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) + else: + raise Exception("You need either charset_normalizer or chardet installed") + +diff --git a/setup.cfg b/setup.cfg +index 93d1f99..ea45aaf 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -5,7 +5,7 @@ provides-extra = + use_chardet_on_py3 + requires-dist = + certifi>=2017.4.17 +- charset_normalizer>=2,<3 ++ charset_normalizer>=2,<4 + idna>=2.5,<4 + urllib3>=1.21.1,<1.27 + +diff --git a/setup.py b/setup.py +index 23977ed..092b40d 100755 +--- a/setup.py ++++ b/setup.py +@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish": + sys.exit() + + requires = [ +- "charset_normalizer>=2,<3", ++ "charset_normalizer>=2,<4", + "idna>=2.5,<4", + "urllib3>=1.21.1,<1.27", + "certifi>=2017.4.17", +-- +2.38.1 + From 5e7a3f86397768951889fb5a29b5897424b060f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 02:42:08 +0100 Subject: [PATCH 562/673] python3Packages.sphinx-rtd-theme: relax sphinx constraint --- pkgs/development/python-modules/sphinx-rtd-theme/default.nix | 5 +++-- 1 file changed, 3 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 3259b47963fd..2820080e118c 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -18,8 +18,9 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py \ - --replace "docutils<0.18" "docutils" + substituteInPlace setup.cfg \ + --replace "docutils <0.18" "docutils" \ + --replace "sphinx >=1.6,<6" "sphinx" ''; preBuild = '' From 5d16d1bde192b4521842e5cb8a5200f6eb234fec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 02:51:24 +0100 Subject: [PATCH 563/673] python3Packages.graphql-core: Pass py as checkInput --- pkgs/development/python-modules/graphql-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 22372843bdb0..e4a2d5e937cb 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, py , pytest-benchmark , pytest-asyncio , pytestCheckHook @@ -22,6 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ + py pytest-asyncio pytest-benchmark pytestCheckHook From c89f79b5825ea2edbb015b2dfc9b188d7927fa8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 02:59:44 +0100 Subject: [PATCH 564/673] python3Packages.pyhamcrest: Disable failing tests --- .../python-modules/pyhamcrest/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 8abf3b8ea44b..86467a66aa40 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + nativeBuildInputs = [ hatch-vcs hatchling @@ -34,10 +39,12 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' - ''; + disabledTests = [ + # Tests started failing with numpy 1.24 + "test_numpy_numeric_type_complex" + "test_numpy_numeric_type_float" + "test_numpy_numeric_type_int" + ]; pythonImportsCheck = [ "hamcrest" From 96649b692749e1fe14459e7809e8c50d9efa0dcb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 03:04:33 +0100 Subject: [PATCH 565/673] python3Packages.base58: Pass py into checkInputs --- pkgs/development/python-modules/base58/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 6fe7a111b5d4..416eba18dec3 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, py , pyhamcrest , pytest-benchmark , pytestCheckHook @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "base58"; version = "2.1.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { @@ -18,6 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ + py pyhamcrest pytest-benchmark pytestCheckHook From 98584cba4492fbb25b6a104e6329967f6c54016d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 03:31:08 +0100 Subject: [PATCH 566/673] python3Packages.pytest-describe: Pass py into checkInputs --- pkgs/development/python-modules/pytest-describe/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index 7f5fbf361597..52e7764ce43b 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -6,6 +6,7 @@ , pytest # tests +, py , pytestCheckHook }: @@ -27,6 +28,7 @@ buildPythonPackage { ]; checkInputs = [ + py pytestCheckHook ]; From adca32766a946870e1566cb1204ae9dfaf3fb5eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 04:13:19 +0100 Subject: [PATCH 567/673] python3Packages.Flask-Limiter: 2.6.2 -> 3.1.0 https://github.com/alisaifee/flask-limiter/releases/tag/2.6.3 https://github.com/alisaifee/flask-limiter/releases/tag/2.7.0 https://github.com/alisaifee/flask-limiter/releases/tag/2.8.0 https://github.com/alisaifee/flask-limiter/releases/tag/2.8.1 https://github.com/alisaifee/flask-limiter/releases/tag/2.9.0 https://github.com/alisaifee/flask-limiter/releases/tag/2.9.1 https://github.com/alisaifee/flask-limiter/releases/tag/2.9.2 https://github.com/alisaifee/flask-limiter/releases/tag/3.0.0 https://github.com/alisaifee/flask-limiter/releases/tag/3.1.0 --- .../python-modules/flask-limiter/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 275b4507fb3b..f2288c883b23 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -4,6 +4,7 @@ , flask , limits +, ordered-set , rich , typing-extensions @@ -18,18 +19,30 @@ buildPythonPackage rec { pname = "Flask-Limiter"; - version = "2.6.2"; + version = "3.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; - rev = version; - sha256 = "sha256-JjksKwSMWzcslXCs977/Wlq1wDMaACxm8e6Ub+r3wPg="; + rev = "refs/tags/${version}"; + hash = "sha256-eAJRqyAH1j1NHYfagRZM2fPE6hm9+tJHD8FMqvgvMBI="; }; + postPatch = '' + substituteInPlace requirements/main.txt \ + --replace "rich>=12,<13" "rich" + + sed -i "/--cov/d" pytest.ini + + # flask-restful is unmaintained and breaks regularly, don't depend on it + sed -i "/import flask_restful/d" tests/test_views.py + ''; + propagatedBuildInputs = [ flask limits + ordered-set rich typing-extensions ]; @@ -44,13 +57,6 @@ buildPythonPackage rec { pymongo ]; - postPatch = '' - sed -i "/--cov/d" pytest.ini - - # flask-restful is unmaintained and breaks regularly, don't depend on it - sed -i "/import flask_restful/d" tests/test_views.py - ''; - disabledTests = [ # flask-restful is unmaintained and breaks regularly "test_flask_restful_resource" From 1b1a48f4b2aff57aec3f8c69b2af4e473f1a6bbc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 04:57:59 +0100 Subject: [PATCH 568/673] python3Packages.python-levenshtein: drop Duplicate package, the correct name is just `levenshtein`. --- .../python-levenshtein/default.nix | 29 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/python-levenshtein/default.nix diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix deleted file mode 100644 index 9795c27d9901..000000000000 --- a/pkgs/development/python-modules/python-levenshtein/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "python-levenshtein"; - version = "0.12.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6"; - }; - - # No tests included in archive - doCheck = false; - - pythonImportsCheck = [ - "Levenshtein" - ]; - - meta = with lib; { - description = "Functions for fast computation of Levenshtein distance and string similarity"; - homepage = "https://github.com/ztane/python-Levenshtein"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ aske ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 75f5cf537a20..697b6bca59bc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -178,6 +178,7 @@ mapAliases ({ python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03 + python-Levenshtein = levenshtein; python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc30327e2d5f..2d273ffd0c60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9166,8 +9166,6 @@ self: super: with self; { python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; - python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; - python-linux-procfs = callPackage ../development/python-modules/python-linux-procfs { }; python-logstash = callPackage ../development/python-modules/python-logstash { }; From b7d5b405cdc919d3e4e3e3082fe8e0ba7a725339 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 05:00:20 +0100 Subject: [PATCH 569/673] python3Packages.levenshtein: fix meta.changelog --- pkgs/development/python-modules/levenshtein/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index afeeea52f33a..c79aee3bd390 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; homepage = "https://github.com/maxbachmann/Levenshtein"; - changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md"; + changelog = "https://github.com/maxbachmann/Levenshtein/blob/${version}/HISTORY.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; }; From d5aa5af5f301bbbe193c51e7d0a3fc088fd7cfe8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Dec 2022 10:54:34 +0100 Subject: [PATCH 570/673] python310Packages.devtools: add changelog to meta --- pkgs/development/python-modules/devtools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index a6cc42dfe962..f8aa63d7a22f 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python's missing debug print command and other development tools"; homepage = "https://python-devtools.helpmanual.io/"; + changelog = "https://github.com/samuelcolvin/python-devtools/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jdahm ]; }; From a2bc91cd9bce4f9742e4fc62cb99533cd00cc8e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Dec 2022 11:06:00 +0100 Subject: [PATCH 571/673] python310Packages.littleutils: add changelog to meta --- .../python-modules/littleutils/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/littleutils/default.nix b/pkgs/development/python-modules/littleutils/default.nix index ea490f19fe5d..538f4dea0a67 100644 --- a/pkgs/development/python-modules/littleutils/default.nix +++ b/pkgs/development/python-modules/littleutils/default.nix @@ -1,24 +1,32 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib +, pythonOlder }: buildPythonPackage rec { pname = "littleutils"; version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0vwijrylppmk0nbddqvn527r9cg3zw8d6zk6r58hslry42jf7jp6"; + hash = "sha256-5srjpCA+Uw1RyWZ+0xD/47GUjyh249aWBbPeS32WkW8="; }; - # This tiny package has no unit tests at all + # Module has no tests doCheck = false; - pythonImportsCheck = [ "littleutils" ]; + + pythonImportsCheck = [ + "littleutils" + ]; meta = with lib; { description = "Small collection of Python utility functions"; homepage = "https://github.com/alexmojaki/littleutils"; + changelog = "https://github.com/alexmojaki/littleutils/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; From 06e855311a37989dd525ad13163c1817ea3631de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Dec 2022 14:23:00 +0100 Subject: [PATCH 572/673] python310Packages.executing: reformat --- .../python-modules/executing/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 0c7cbf276318..1201ffaff170 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,11 +2,12 @@ , asttokens , buildPythonPackage , fetchFromGitHub -, setuptools-scm -, pytestCheckHook , littleutils +, pytestCheckHook , pythonAtLeast +, pythonOlder , rich +, setuptools-scm }: buildPythonPackage rec { @@ -14,25 +15,25 @@ buildPythonPackage rec { version = "1.2.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M="; + hash = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - checkInputs = [ - pytestCheckHook asttokens littleutils + pytestCheckHook ] ++ lib.optionals (pythonAtLeast "3.11") [ rich ]; From aa4397fae050f001474400b961c4fb33194d7f6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Oct 2022 19:50:22 +0200 Subject: [PATCH 573/673] python310Packages.virtualenv: disable on older Python releases --- .../python-modules/virtualenv/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index e86ec5fa7da7..cb9f8ed989bc 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,9 +1,8 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , isPy27 -, backports-entry-points-selectable , cython , distlib , fetchPypi @@ -18,7 +17,6 @@ , pytest-timeout , pytestCheckHook , setuptools-scm -, six }: buildPythonPackage rec { @@ -26,6 +24,8 @@ buildPythonPackage rec { version = "20.17.1"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; hash = "sha256-+LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg="; @@ -36,13 +36,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - backports-entry-points-selectable distlib filelock platformdirs - six - ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ - pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ] ++ lib.optionals (pythonOlder "3.8") [ @@ -66,8 +62,8 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # Ignore tests which require network access disabledTestPaths = [ + # Ignore tests which require network access "tests/unit/create/test_creator.py" "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" ]; @@ -78,16 +74,16 @@ buildPythonPackage rec { "test_seed_link_via_app_data" # Permission Error "test_bad_exe_py_info_no_raise" - ] ++ lib.optionals isPy27 [ - "test_python_via_env_var" - "test_python_multi_value_prefer_newline_via_env_var" ]; - pythonImportsCheck = [ "virtualenv" ]; + pythonImportsCheck = [ + "virtualenv" + ]; meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; + changelog = "https://github.com/pypa/virtualenv/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; From 4553e6237ff3eb7ddb44897d4782d9d1314c4551 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 13:43:27 +0100 Subject: [PATCH 574/673] python3Packages.aiohttp: Relax charset-normalizer constraint and set format. --- pkgs/development/python-modules/aiohttp/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 9a6f14f765e5..087e87ded21e 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { pname = "aiohttp"; version = "3.8.3"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -39,6 +41,9 @@ buildPythonPackage rec { postPatch = '' sed -i '/--cov/d' setup.cfg + + substituteInPlace setup.cfg \ + --replace "charset-normalizer >=2.0, < 3.0" "charset-normalizer >=2.0, < 4.0" ''; propagatedBuildInputs = [ From 1b4b5be9cabf223ccc81d798ffacee2075f2c133 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 14:05:14 +0100 Subject: [PATCH 575/673] python3Packages.anyio: disable failing tests --- pkgs/development/python-modules/anyio/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 9d2e2a333590..3ad4d8495f06 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -71,9 +71,17 @@ buildPythonPackage rec { mock ]; + pytestFlagsArray = [ + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # block devices access "test_is_block_device" + # INTERNALERROR> AttributeError: 'NonBaseMultiError' object has no attribute '_exceptions'. Did you mean: 'exceptions'? + "test_exception_group_children" + "test_exception_group_host" + "test_exception_group_filtering" ]; disabledTestPaths = [ From a9125ee26186fd91eee791284ee24ceba17e3aab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 14:19:30 +0100 Subject: [PATCH 576/673] python3Packages.factory_boy: Disable failing tests with latest flask-sqlalchemy. --- pkgs/development/python-modules/factory_boy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 407083e4f691..e3168c863bce 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { "MongoEngineTestCase" ]; + disabledTestPaths = [ + # incompatible with latest flask-sqlalchemy + "examples/flask_alchemy/test_demoapp.py" + ]; + pythonImportsCheck = [ "factory" ]; From f986c13814dc75dd6918d4fece378ca0d1dd69cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 14:21:53 +0100 Subject: [PATCH 577/673] python3Packages.autobahn: Stop testing with eth-abi The dependency chain is broken on every bump and causes a major hassle that is just not worth it. --- pkgs/development/python-modules/autobahn/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index c18d3b2bb84f..11bcb603f909 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -83,8 +83,6 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - # FIXME: remove the following dependencies when web3 gets added - eth-account ] ++ passthru.optional-dependencies.scram ++ passthru.optional-dependencies.serialization ++ passthru.optional-dependencies.xbr; From 2227593660cfbdad9d765655a46b24d6611f4e13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:01:28 +0100 Subject: [PATCH 578/673] python3Packages.pytest-aiohttp: Disable failing tests --- pkgs/development/python-modules/pytest-aiohttp/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 728544bd2618..a1e43a28435a 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -40,6 +40,12 @@ 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"; From 32461c69ea1bb81a3cbb1757115ae71885b0a229 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:12:27 +0100 Subject: [PATCH 579/673] python3Packages.fastdiff: Pass py into checkInputs, reformat and disable benchmarks during check phase. --- .../python-modules/fastdiff/default.nix | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index a790f1623817..9ad4c8296372 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,4 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, wasmer +, wasmer-compiler-cranelift +, py +, pytestCheckHook +, pytest-benchmark +}: buildPythonPackage rec { pname = "fastdiff"; @@ -16,11 +25,24 @@ buildPythonPackage rec { --replace "collect_ignore = ['setup.py']" "" ''; - propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ]; + propagatedBuildInputs = [ + wasmer + wasmer-compiler-cranelift + ]; - checkInputs = [ pytestCheckHook pytest-benchmark ]; + checkInputs = [ + py + pytestCheckHook + pytest-benchmark + ]; - pythonImportsCheck = [ "fastdiff" ]; + pytestFlagsArray = [ + "--benchmark-skip" + ]; + + pythonImportsCheck = [ + "fastdiff" + ]; meta = with lib; { description = "A fast native implementation of diff algorithm with a pure Python fallback"; From f5c98592d0ffd318a59ac30c2915601c495c2149 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:16:10 +0100 Subject: [PATCH 580/673] python3Packages.markdown-it-py: Pass py into checkInputs and disable benchmark tests. --- pkgs/development/python-modules/markdown-it-py/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index d408c0071003..afbe7b18d893 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -6,6 +6,7 @@ , linkify-it-py , mdurl , psutil +, py , pytest-benchmark , pytest-regressions , pytestCheckHook @@ -41,11 +42,16 @@ buildPythonPackage rec { checkInputs = [ psutil + py pytest-benchmark pytest-regressions pytestCheckHook ]; + pytestFlagsArray = [ + "--benchmark-skip" + ]; + pythonImportsCheck = [ "markdown_it" ]; From f6eecc04eef5dbabba512acbd8480b2c02c25720 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:28:37 +0100 Subject: [PATCH 581/673] python3Packages.myst-parser: Relax sphinx constraint and disable failing tests for now. --- pkgs/development/python-modules/myst-parser/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index a7a0ec69c8f5..f3efa9f85b2a 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "myst-parser"; version = "0.18.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,11 +33,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "docutils>=0.15,<0.19" "docutils>=0.15" + --replace "docutils>=0.15,<0.19" "docutils>=0.15" \ + --replace "sphinx>=4,<6" "sphinx" ''; - format = "flit"; - nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ @@ -67,6 +67,8 @@ buildPythonPackage rec { "test_fieldlist_extension" # docutils 0.19 expectation mismatches "test_docutils_roles" + # sphinx 6.0 expectation mismatches + "test_sphinx_directives" ]; meta = with lib; { From f9dc9d540ac4bea5bebbfc94c13a2ddbc426cb15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:36:15 +0100 Subject: [PATCH 582/673] python3Packages.graphene: Pass py into checkInputs --- pkgs/development/python-modules/graphene/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index c6508cef7a7e..8e556fdd7c5d 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -5,6 +5,7 @@ , graphql-core , graphql-relay , promise +, py , pytest-asyncio , pytest-benchmark , pytest-mock @@ -37,6 +38,7 @@ buildPythonPackage rec { checkInputs = [ promise + py pytestCheckHook pytest-asyncio pytest-benchmark From 8e39086c7c39dc8798a9a3a7a5a3ba1a32c17d6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:41:18 +0100 Subject: [PATCH 583/673] python3Packages.starlette: Ignore trio's deprecation warnings --- pkgs/development/python-modules/starlette/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 6d96df91c4f5..91ea2a8bdd01 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -71,6 +71,10 @@ buildPythonPackage rec { typing-extensions ]; + pytestFlagsArray = [ + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # asserts fail due to inclusion of br in Accept-Encoding "test_websocket_headers" From 089c15835ed88db3a8d0dc73288f2d1836db308e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:41:47 +0100 Subject: [PATCH 584/673] awscli: 1.27.38 -> 1.27.40 Changelog: https://github.com/aws/aws-cli/blob/1.27.40/CHANGELOG.rst --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 3438580c7f22..04c87d780cb9 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.27.38"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.27.40"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-SjeFBWwfd+9sXcZL9NdqFyuBIQtql3KB3lnygeVVHU0="; + hash = "sha256-xP+ugapi6KJE+UokGKmG67ze5dH6nJuJk7BjIr6dtTE="; }; # https://github.com/aws/aws-cli/issues/4837 From a08e69ffeb616fa3a212cd1eb3441048aa5a837d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 15:42:17 +0100 Subject: [PATCH 585/673] python3Packages.graphene-django: 2022-03-03 -> 3.0.0 --- .../graphene-django/default.nix | 18 +-- .../graphene-django/graphene-3_2_0.patch | 150 ------------------ 2 files changed, 5 insertions(+), 163 deletions(-) delete mode 100644 pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index f5d9b7904594..728d64ed1f08 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , graphene , graphql-core @@ -13,6 +12,7 @@ , django-filter , mock +, py , pytest-django , pytest-random-order , pytestCheckHook @@ -20,26 +20,17 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "unstable-2022-03-03"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; - rev = "f6ec0689c18929344c79ae363d2e3d5628fa4a2d"; - hash = "sha256-KTZ5jcoeHYXnlaF47t8jIi6+7NyMyA4hDPv+il3bt+U="; + rev = "refs/tags/v${version}"; + hash = "sha256-wSZm0hRukBmvrmU3bsqFuZSQRXBwwye9J4ojuSz1uzE="; }; - patches = [ - ./graphene-3_2_0.patch - (fetchpatch { - url = "https://github.com/graphql-python/graphene-django/commit/ca555293a4334c26cf9a390dd1e3d0bd4c819a17.patch"; - excludes = [ "setup.py" ]; - sha256 = "sha256-RxG1MRhmpBKnHhSg4SV+DjZ3uA0nl9oUeei56xjtUpw="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" @@ -61,6 +52,7 @@ buildPythonPackage rec { checkInputs = [ django-filter mock + py pytest-django pytest-random-order pytestCheckHook diff --git a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch b/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch deleted file mode 100644 index 0e8fa63464a3..000000000000 --- a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py -index 7d440f4..0aec6e4 100644 ---- a/graphene_django/filter/tests/test_fields.py -+++ b/graphene_django/filter/tests/test_fields.py -@@ -1005,7 +1005,7 @@ def test_integer_field_filter_type(): - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection -@@ -1074,7 +1074,7 @@ def test_other_filter_types(): - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection -diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py -index 70116b8..a4ab4db 100644 ---- a/graphene_django/tests/test_command.py -+++ b/graphene_django/tests/test_command.py -@@ -49,7 +49,7 @@ def test_generate_graphql_file_on_call_graphql_schema(): - assert handle.write.called_once() - - schema_output = handle.write.call_args[0][0] -- assert schema_output == dedent( -+ assert schema_output.rstrip() + "\n" == dedent( - """\ - type Query { - hi: String -diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py -index bde72c7..0b64440 100644 ---- a/graphene_django/tests/test_types.py -+++ b/graphene_django/tests/test_types.py -@@ -247,7 +247,7 @@ def test_schema_representation(): - } - """ - ) -- assert str(schema) == expected -+ assert str(schema).rstrip() + "\n" == expected - - - def with_local_registry(func): -@@ -515,7 +515,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -541,7 +541,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -576,7 +576,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -603,7 +603,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: PetModelKind -@@ -642,7 +642,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: PetModelKind -diff --git a/graphene_django/tests/test_views.py b/graphene_django/tests/test_views.py -index 945fa87..e2e8b46 100644 ---- a/graphene_django/tests/test_views.py -+++ b/graphene_django/tests/test_views.py -@@ -109,12 +109,10 @@ def test_reports_validation_errors(client): - { - "message": "Cannot query field 'unknownOne' on type 'QueryRoot'.", - "locations": [{"line": 1, "column": 9}], -- "path": None, - }, - { - "message": "Cannot query field 'unknownTwo' on type 'QueryRoot'.", - "locations": [{"line": 1, "column": 21}], -- "path": None, - }, - ] - } -@@ -135,8 +133,6 @@ def test_errors_when_missing_operation_name(client): - "errors": [ - { - "message": "Must provide operation name if query contains multiple operations.", -- "locations": None, -- "path": None, - } - ] - } -@@ -476,8 +472,7 @@ def test_handles_syntax_errors_caught_by_graphql(client): - "errors": [ - { - "locations": [{"column": 1, "line": 1}], -- "message": "Syntax Error: Unexpected Name 'syntaxerror'.", -- "path": None, -+ "message": "Syntax Error: Unexpected Name 'syntaxerror'." - } - ] - } -diff --git a/graphene_django/views.py b/graphene_django/views.py -index c23b020..f533f70 100644 ---- a/graphene_django/views.py -+++ b/graphene_django/views.py -@@ -11,7 +11,6 @@ from django.views.decorators.csrf import ensure_csrf_cookie - from django.views.generic import View - from graphql import OperationType, get_operation_ast, parse, validate - from graphql.error import GraphQLError --from graphql.error import format_error as format_graphql_error - from graphql.execution import ExecutionResult - - from graphene import Schema -@@ -387,7 +386,7 @@ class GraphQLView(View): - @staticmethod - def format_error(error): - if isinstance(error, GraphQLError): -- return format_graphql_error(error) -+ return error.formatted - - return {"message": str(error)} - From 00f55143d9328f931400cfdd5fb3bb60065fe756 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Dec 2022 16:10:15 +0100 Subject: [PATCH 586/673] python3Packages.zxcvbn: use tagged release --- .../python-modules/zxcvbn/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index 67f48f34731d..96568bcd56ba 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "zxcvbn"; version = "4.4.28"; + format = "setuptools"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "dwolfhub"; repo = "zxcvbn-python"; - rev = "45afdf0d3dd8477bc7e457629bb4bc9680794cd7"; # not tagged in repository - sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2"; + rev = "refs/tags/v${version}"; + hash = "sha256-etcST7pxlpOH5Q9KtOPGf1vmnkyjEp6Cd5QCmBjW9Hc="; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Python implementation of Dropbox's realistic password strength estimator"; From f7d835e5e92b97efe2fff24e8d1b2a303cb50eb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 01:04:10 +0100 Subject: [PATCH 587/673] home-assistant: relax ciso8601, overrride astral --- pkgs/servers/home-assistant/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c09ecc6fb49d..9b7f66f4a020 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -43,6 +43,22 @@ let }; }); + astral = super.astral.overridePythonAttrs (oldAttrs: rec { + pname = "astral"; + version = "2.2"; + src = self.fetchPypi { + inherit pname version; + hash = "sha256-5B2ZZ9XEi+QhNGVS8PTe2tQ/85qDV09f8q0ytmJ7b74="; + }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry" "poetry.core.masonry" + ''; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ + self.pytz + ]; + }); + caldav = super.caldav.overridePythonAttrs (old: rec { version = "0.9.1"; src = fetchFromGitHub { @@ -225,6 +241,7 @@ in python.pkgs.buildPythonApplication rec { "attrs" "awesomeversion" "bcrypt" + "ciso8601" "cryptography" "home-assistant-bluetooth" "httpx" From 5da6234fe3a9aeeb81747620ede75021a5fe035c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 02:20:50 +0100 Subject: [PATCH 588/673] python311Packages.yarl: Disable failing test --- pkgs/development/python-modules/yarl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 171f6569cfd8..3c0a218b8e89 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , idna , multidict @@ -41,6 +42,10 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + "test_not_a_scheme2" + ]; + postCheck = '' popd ''; From acbd70e2623b11d5dffaaf3969bc02511ca6135e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 02:39:28 +0100 Subject: [PATCH 589/673] python311Packages.jedi: Disable failing tests --- pkgs/development/python-modules/jedi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 3c939195000d..e9a5faccd3b4 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -49,6 +49,10 @@ buildPythonPackage rec { # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved "test_interpreter" + "test_scanning_venvs" + "test_create_environment_venv_path" + "test_create_environment_executable" + "test_venv_and_pths" ]; meta = with lib; { From e62d70a79026881c31407324731235604852c34d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 03:37:56 +0100 Subject: [PATCH 590/673] python3Packages.pandas: Disable failing test with numpy 1.24 --- pkgs/development/python-modules/pandas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 72e053c8a56a..a48d6b82d104 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -98,6 +98,8 @@ buildPythonPackage rec { "test_rolling_var_numerical_issues" # Requires mathplotlib "test_subset_for_boolean_cols" + # DeprecationWarning from numpy + "test_sort_values_sparse_no_warning" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" From 109aabe2e804de94ef9ba8f32c86005de3b69b59 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 1 Jan 2023 18:14:09 +0900 Subject: [PATCH 591/673] awsebcli: fixup, bump termcolor dependecy --- pkgs/tools/virtualization/awsebcli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index df6e76d63b8b..af784bce9817 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -52,7 +52,7 @@ with localPython.pkgs; buildPythonApplication rec { --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \ --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ - --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0" + --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.2.0" ''; buildInputs = [ From 7bd043148707030431c72d55d6839b73d210e4ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 16:01:14 +0100 Subject: [PATCH 592/673] python3Packages.sphinx: 5.1.1 -> 5.3.0 --- .../python-modules/sphinx/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 5a27f04bd0ee..d40416019b23 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -5,6 +5,9 @@ , fetchFromGitHub , fetchpatch +# nativeBuildInputs +, flit-core + # propagatedBuildInputs , babel , alabaster @@ -34,8 +37,8 @@ buildPythonPackage rec { pname = "sphinx"; - version = "5.1.1"; - format = "setuptools"; + version = "5.3.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -43,7 +46,7 @@ buildPythonPackage rec { owner = "sphinx-doc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dTgQNMRIn7ETm+1HgviOkWWOCmLX7Ez6DM9ChlI32mY="; + hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -52,13 +55,9 @@ buildPythonPackage rec { ''; }; - postPatch = '' - # remove impurity caused by date inclusion - # https://github.com/sphinx-doc/sphinx/blob/master/setup.cfg#L4-L6 - substituteInPlace setup.cfg \ - --replace "tag_build = .dev" "" \ - --replace "tag_date = true" "" - ''; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ babel From c3bf8d1f5b736f3d4c0c89a465e5d996037bcb5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 17:55:07 +0100 Subject: [PATCH 593/673] python3Packages.pyu2f: Disable tests failing with pyfakefs 5.0 --- .../python-modules/pyu2f/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index cf7b3eb2aeb0..41fbc08b0102 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -10,17 +10,29 @@ buildPythonPackage rec { pname = "pyu2f"; version = "0.1.5a"; + format = "setuptools"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; - checkInputs = [ mock pyfakefs pytestCheckHook ]; + checkInputs = [ + mock + pyfakefs + pytestCheckHook + ]; + + disabledTestPaths = [ + # API breakage with pyfakefs>=5.0 + "pyu2f/tests/hid/linux_test.py" + ]; meta = with lib; { description = "U2F host library for interacting with a U2F device over USB"; From fca5b85c63fcf52072567dcbe55edbc7118e7f36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 18:53:56 +0100 Subject: [PATCH 594/673] python3Packages.pypytools: Pass py into checkInputs --- pkgs/development/python-modules/pypytools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix index e88891172deb..1828ede0a921 100644 --- a/pkgs/development/python-modules/pypytools/default.nix +++ b/pkgs/development/python-modules/pypytools/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { checkInputs = [ freezegun numpy + py pytestCheckHook ]; From a25311986ed52dba824019dd2a6f16a9410653e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 23:15:32 +0100 Subject: [PATCH 595/673] python3Packages.getmac: Pass py into checkInputs --- pkgs/development/python-modules/getmac/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 79f85ad95674..730d9cc3eb33 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, py , pytest-benchmark , pytest-mock , pytestCheckHook @@ -19,6 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ + py pytestCheckHook pytest-benchmark pytest-mock From 5f65eb06cc642e90cdc942dc6a22fbaa31a855d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 16:57:45 +0100 Subject: [PATCH 596/673] python3Packages.pylint: 2.15.5 -> 2.15.9 https://github.com/PyCQA/pylint/releases/tag/v2.15.6 https://github.com/PyCQA/pylint/releases/tag/v2.15.7 https://github.com/PyCQA/pylint/releases/tag/v2.15.8 https://github.com/PyCQA/pylint/releases/tag/v2.15.9 --- pkgs/development/python-modules/pylint/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index a8a0229f8621..60204d70ca64 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -16,6 +16,7 @@ , tomlkit , typing-extensions , gitpython +, py , pytest-timeout , pytest-xdist , pytestCheckHook @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.15.5"; + version = "2.15.9"; format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - hash = "sha256-dchzwMaUhHB1TqcaMZO9tCZ4KA5I1T+tdkGOxikm5AY="; + hash = "sha256-T+om5rrG0Gjyr05L5X4j82/S11Q7JBUDNOm4gVEQ494="; }; patches = [ @@ -75,6 +76,7 @@ buildPythonPackage rec { checkInputs = [ gitpython # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt + py pytest-timeout pytest-xdist pytestCheckHook From abbc2c7810ad587726a577459006452a0f4babf9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 17:54:43 +0100 Subject: [PATCH 597/673] python3Packages.simpy: Pass py into checkInputs and reformat --- .../python-modules/simpy/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index ff139523e1f4..6d805c68a850 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -1,9 +1,16 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools-scm +{ buildPythonPackage +, fetchPypi +, isPy27 +, lib +, setuptools +, setuptools-scm +, py , pytestCheckHook }: buildPythonPackage rec { pname = "simpy"; version = "4.0.1"; + format = "setuptools"; disabled = isPy27; @@ -12,11 +19,18 @@ buildPythonPackage rec { sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + py + pytestCheckHook + ]; meta = with lib; { homepage = "https://simpy.readthedocs.io/en/${version}/"; From b36007dd92daaada88cd0679d1c368f62f12cb9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 18:12:36 +0100 Subject: [PATCH 598/673] python310Packages.snowflake-connector-python: Relax dep constraints --- .../snowflake-connector-python/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 880eab4629c6..f0299b231b06 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; version = "2.9.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,6 +30,12 @@ buildPythonPackage rec { hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "charset_normalizer>=2,<3" "charset_normalizer" \ + --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" + ''; + propagatedBuildInputs = [ asn1crypto certifi @@ -47,12 +53,6 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" \ - --replace "charset-normalizer~=2.0.0" "charset_normalizer>=2" - ''; - # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; From 3262365f473356076ef85a3f152257552ec2e263 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 18:26:58 +0100 Subject: [PATCH 599/673] python3Packages.trio-asyncio: Ignore TrioDeprecationWarning --- pkgs/development/python-modules/trio-asyncio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 25caa3e965fb..2cbd32b910e8 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -40,8 +40,9 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/python-trio/trio-asyncio/issues/112 - "-W" - "ignore::DeprecationWarning" + "-W" "ignore::DeprecationWarning" + # trio.MultiError is deprecated since Trio 0.22.0; use BaseExceptionGroup (on Python 3.11 and later) or exceptiongroup.BaseExceptionGroup (earlier versions) instead (https://github.com/python-trio/trio/issues/2211) + "-W" "ignore::trio.TrioDeprecationWarning" ]; disabledTestPaths = [ From 38aece2b446b011549fd7f8b0bd95c0c29ea8ffa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 18:31:04 +0100 Subject: [PATCH 600/673] python3Packages.extractcode: Disable failing test --- pkgs/development/python-modules/extractcode/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 0a8db8611921..2134c10f6154 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -58,6 +58,8 @@ buildPythonPackage rec { "test_get_extractor_qcow2" # WARNING patch:patch.py:450 inconsistent line ends in patch hunks "test_patch_info_patch_patches_windows_plugin_explorer_patch" + # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]] + "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch" ]; pythonImportsCheck = [ From eb46de5e35ba04a419ce2f7f9454dfbbc0baf911 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 18:37:50 +0100 Subject: [PATCH 601/673] python3Packages.quantities: Disable failing test --- pkgs/development/python-modules/quantities/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 48cc70d5f2af..23ed3bb47414 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -23,10 +23,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # Tests don't work with current numpy - # https://github.com/python-quantities/python-quantities/pull/195 - "test_arctan2" - "test_fix" + # test fails with numpy 1.24 + "test_mul" ]; pythonImportsCheck = [ "quantities" ]; From 15c22385d9c8a0fde6adf127bcdc23f331836946 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 18:42:25 +0100 Subject: [PATCH 602/673] python3Packages.meinheld: Relax greenlet constraint --- pkgs/development/python-modules/meinheld/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 0fced5f3e71e..c33aae4d20c4 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patchPhase = '' # Allow greenlet-1.0.0. # See https://github.com/mopemope/meinheld/pull/123 - substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5,<2.0.0" + substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5" ''; propagatedBuildInputs = [ greenlet ]; @@ -20,6 +20,10 @@ buildPythonPackage rec { # No tests doCheck = false; + pythonImportsCheck = [ + "meinheld" + ]; + meta = with lib; { description = "High performance asynchronous Python WSGI Web Server"; homepage = "https://meinheld.org/"; From 5fa62858e0fb3be3f8ed325f0322cc1a31b5c595 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 20:53:47 +0100 Subject: [PATCH 603/673] python3packages.starlette: 0.20.4 -> 0.23.1 https://github.com/encode/starlette/releases/tag/0.21.0 https://github.com/encode/starlette/releases/tag/0.22.0 https://github.com/encode/starlette/releases/tag/0.23.0 https://github.com/encode/starlette/releases/tag/0.23.1 --- .../python-modules/starlette/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 91ea2a8bdd01..d23d83f7cf76 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -2,7 +2,10 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch +, hatchling + +# runtime +, ApplicationServices , aiofiles , anyio , contextlib2 @@ -10,20 +13,22 @@ , jinja2 , python-multipart , pyyaml +, typing-extensions + +# tests , requests , aiosqlite , databases +, httpx , pytestCheckHook , pythonOlder , trio -, typing-extensions -, ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.20.4"; - format = "setuptools"; + version = "0.23.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -31,15 +36,11 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vP2TJPn9lRGnLGkO8lUmnsoT6rSnhuWDD3WqNk76SM0="; + hash = "sha256-LcFrdaRgFBqcdylCzNlewj/papsg/sZ1FMVxBDLvQWI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/encode/starlette/commit/ab70211f0e1fb7390668bf4891eeceda8d9723a0.diff"; - excludes = [ "requirements.txt" ]; # conflicts - hash = "sha256-UHf4c4YUWp/1I1vD8J0hMewdlfkmluA+FyGf9ZsSv3Y="; - }) + nativeBuildInputs = [ + hatchling ]; postPatch = '' @@ -66,12 +67,14 @@ buildPythonPackage rec { checkInputs = [ aiosqlite databases + httpx pytestCheckHook trio typing-extensions ]; pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" "-W" "ignore::trio.TrioDeprecationWarning" ]; @@ -86,6 +89,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/encode/starlette/releases/tag/${version}"; homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; From f5336d2318adfb0e0f83d064e30ed0b17efc7208 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 21:04:20 +0100 Subject: [PATCH 604/673] python3Packages.fastapi: Disable failing test --- pkgs/development/python-modules/fastapi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 5cfdeb6f4e9a..ed9e9c5aa216 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -84,6 +84,8 @@ buildPythonPackage rec { "test_head" "test_options" "test_trace" + # Unexpected number of warnings caught + "test_warn_duplicate_operation_id" ]; pythonImportsCheck = [ From 257d72ba07e674420a2658ba54f8db0720326791 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 21:34:40 +0100 Subject: [PATCH 605/673] python3Packages.celery: Fix billiard 4.1 compat --- pkgs/development/python-modules/celery/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 67c3c58794d5..80b58dc69be6 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -38,10 +38,15 @@ buildPythonPackage rec { patches = [ (fetchpatch { - name = "billiard-4.0-comat.patch"; + name = "billiard-4.0-compat.patch"; url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch"; hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto="; }) + (fetchpatch { + name = "billiard-4.1-compat.patch"; + url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch"; + hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE="; + }) ]; postPatch = '' From 9d7973e52fc8be01407af368cef1618d1beffc5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 21:43:46 +0100 Subject: [PATCH 606/673] python3Packages.rply: Fix tests, refactor --- .../python-modules/rply/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 33f8547496db..e05c08640ed9 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -1,21 +1,34 @@ -{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, appdirs +, py +, pytestCheckHook +}: buildPythonPackage rec { pname = "rply"; version = "0.7.7"; + format = "setuptools"; src = fetchFromGitHub { owner = "alex"; repo = "rply"; rev = "v${version}"; - sha256 = "1qv37hn7hhxd388znri76g0zjxsbwhxhcaic94dvw9pq4l60vqp6"; + hash = "sha256-5uINDCX4Jr4bSSwqBjvkS3f5wTMnZvsRGq1DeCw8Y+M="; }; - propagatedBuildInputs = [ appdirs ]; + propagatedBuildInputs = [ + appdirs + ]; - checkInputs = [ pytest ]; - checkPhase = '' - HOME=$(mktemp -d) py.test tests + checkInputs = [ + py + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) ''; meta = with lib; { From 4244d1bd35db13895496ef93b12707fdb30dabe7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 21:44:46 +0100 Subject: [PATCH 607/673] python3Packages.smbus-cffi: Pass py into checkInputs --- pkgs/development/python-modules/smbus-cffi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix index ffb22d1c4b42..79f177b1f945 100644 --- a/pkgs/development/python-modules/smbus-cffi/default.nix +++ b/pkgs/development/python-modules/smbus-cffi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , cffi +, py , pytestCheckHook , pyserial , fetchpatch @@ -37,7 +38,7 @@ buildPythonPackage rec { # requires hardware access pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ]; - checkInputs = [ pytestCheckHook pyserial ]; + checkInputs = [ py pytestCheckHook pyserial ]; meta = with lib; { description = "Python module for SMBus access through Linux I2C /dev interface"; From 9f4bff5a35f5592cb601766c03bfe8a4fedeaa0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 21:56:42 +0100 Subject: [PATCH 608/673] python3Packages.cucumber-tag-expressions: Fix tests --- .../cucumber-tag-expressions/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index f286cd4a7f02..b2494e9c17f5 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }: +{ lib +, fetchPypi +, buildPythonPackage +, py +, pytestCheckHook +, pytest-html + }: buildPythonPackage rec { pname = "cucumber-tag-expressions"; @@ -9,11 +15,14 @@ buildPythonPackage rec { sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; - checkInputs = [ pytest pytest-html ]; - checkPhase = "pytest tests/*/*.py"; + checkInputs = [ + py + pytestCheckHook + pytest-html + ]; meta = with lib; { - homepage = "https://github.com/cucumber/tag-expressions-python"; + homepage = "https://github.com/cucumber/tag-expressions"; description = "Provides tag-expression parser for cucumber/behave"; license = licenses.mit; maintainers = with maintainers; [ maxxk ]; From 1b9872b497c326435fa25082a250f4c3542b897c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 22:03:57 +0100 Subject: [PATCH 609/673] python3Packages.matrix-nio: Pass py into checkInputs --- pkgs/development/python-modules/matrix-nio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 45689c045168..a364b032ed9a 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -18,6 +18,7 @@ , jsonschema , peewee , poetry-core +, py , pycryptodome , pytest-aiohttp , pytest-benchmark @@ -73,6 +74,7 @@ buildPythonPackage rec { aioresponses faker hypothesis + py pytest-aiohttp pytest-benchmark pytestCheckHook From f6d5846ee01e99aa32d70f64e085599049f9b1c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 22:27:44 +0100 Subject: [PATCH 610/673] protobuf3_21: 3.21.8 -> 3.21.12 https://github.com/protocolbuffers/protobuf/blob/v21.12/CHANGES.txt --- pkgs/development/libraries/protobuf/3.21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index 6ba9ca31aba6..f5797ea7f9fb 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ { callPackage, abseil-cpp, ... }: callPackage ./generic-v3-cmake.nix { - version = "3.21.8"; - sha256 = "sha256-cSNHX18CvMmydpYWqfe6WWk9rGxIlFfY/85rfSyznU4="; + version = "3.21.12"; + sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; } From 8aa83fea9045f13c39eafe9e8a11e4f61cfee29c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Jan 2023 23:49:01 +0100 Subject: [PATCH 611/673] python3Packages.setuptools-gettext: init at 0.1.1 --- .../setuptools-gettext/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/setuptools-gettext/default.nix diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix new file mode 100644 index 000000000000..f8b5d45bbc7f --- /dev/null +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "setuptools-gettext"; + version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "breezy-team"; + repo = "setuptools-gettext"; + rev = "refs/tags/v${version}"; + hash = "sha256-MifsEuWNTEDJa9RfIbM/EDMJg0cmHXX6oJxNskKEbY4="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "setuptools_gettext" + ]; + + meta = with lib; { + changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/v${version}"; + description = "setuptools plugin for building mo files"; + homepage = "https://github.com/breezy-team/setuptools-gettext"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d273ffd0c60..7798d2e68ce1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10285,6 +10285,8 @@ self: super: with self; { setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { }; + setuptools-gettext = callPackage ../development/python-modules/setuptools-gettext { }; + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; From d5c2dae9776f79495601ea4457c20e7be4731fab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 00:15:55 +0100 Subject: [PATCH 612/673] python3Packages.cli-helpers: reformat --- .../python-modules/cli-helpers/default.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 02b6c6fccda7..7d7930b4f8b8 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -1,37 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , backports_csv , configobj , mock -, pytest +, pytestCheckHook +, pygments , tabulate , terminaltables , wcwidth }: buildPythonPackage rec { - pname = "cli_helpers"; + pname = "cli-helpers"; version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; + pname = "cli_helpers"; + inherit version; + hash = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; }; propagatedBuildInputs = [ configobj - terminaltables tabulate - wcwidth - ] ++ (lib.optionals isPy27 [ backports_csv ]); + ] ++ tabulate.optional-dependencies.widechars; - # namespace collision between backport.csv and backports.configparser - doCheck = !isPy27; + passthru.optional-dependencies = { + styles = [ pygments ]; + }; - checkInputs = [ pytest mock ]; - - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + mock + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { description = "Python helpers for common CLI tasks"; From ff9f36a499fbd3f9a0798f68d6fb0dd0f448bbf9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 01:25:28 +0100 Subject: [PATCH 613/673] python3Packages.ical: Pass py into checkInputs --- pkgs/development/python-modules/ical/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 5ec01565e2d1..66e64270ad85 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , freezegun , tzdata +, py , pyparsing , pydantic , pytest-asyncio @@ -38,6 +39,7 @@ buildPythonPackage rec { checkInputs = [ freezegun + py pytest-asyncio pytest-benchmark pytest-golden From ac88e1c2aa901cb79e10d0e318ffc62a7300c82b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 01:46:16 +0100 Subject: [PATCH 614/673] python3Packages.executor: reformat --- .../python-modules/executor/default.nix | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 610d9b0b096c..b54860cc8632 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -1,8 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytestCheckHook, mock, virtualenv }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, coloredlogs +, humanfriendly +, property-manager +, fasteners +, six +, pytestCheckHook +, mock +, virtualenv +}: buildPythonPackage rec { pname = "executor"; version = "23.2"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { @@ -12,9 +25,19 @@ buildPythonPackage rec { sha256 = "1mr0662c5l5zx0wjapcprp8p2xawfd0im3616df5sgv79fqzwfqs"; }; - propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; + propagatedBuildInputs = [ + coloredlogs + humanfriendly + property-manager + fasteners + six + ]; - checkInputs = [ pytestCheckHook mock virtualenv ]; + checkInputs = [ + pytestCheckHook + mock + virtualenv + ]; # ignore impure tests disabledTests = [ @@ -28,6 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/xolox/python-executor/blob/${version}/CHANGELOG.rst"; description = "Programmer friendly subprocess wrapper"; homepage = "https://github.com/xolox/python-executor"; license = licenses.mit; From 856b1ac78b033bec0feedbe949c1c5056fa0b23e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 01:51:42 +0100 Subject: [PATCH 615/673] python3Packages.pytest-doctestplus: Propagate setuptools --- .../development/python-modules/pytest-doctestplus/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 9f722ca92836..531e21fc4b50 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -5,13 +5,14 @@ , pytest , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pytest-doctestplus"; version = "0.12.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging + setuptools ]; checkInputs = [ From 510de5b6f97d690a3e9a708ce6a608794e155daa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 02:01:33 +0100 Subject: [PATCH 616/673] borgbackup: Pass py into checkInputs --- pkgs/tools/backup/borgbackup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 9bc3dfefd4ae..84083c0db2d8 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -77,6 +77,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ e2fsprogs + py python-dateutil pytest-benchmark pytest-xdist From 348c4d480c80c4f41da39b6886702c141e697f54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 02:24:13 +0100 Subject: [PATCH 617/673] python3Packages.asyncclick: Ignore TrioDeprecationWarning --- pkgs/development/python-modules/asyncclick/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index f9b12e553420..3d16f7bfa48c 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { trio ]; + pytestFlagsArray = [ + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # RuntimeWarning: coroutine 'Context.invoke' was never awaited "test_context_invoke_type" From fe6201630f43c65ede2b0dc78bd34bc5c35921dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 04:08:18 +0100 Subject: [PATCH 618/673] python3Packages.numpy: 1.23.3 -> 1.23.5 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 6f13a90e2ec3..3a73b1bf3d55 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.23.3"; + version = "1.23.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-Ub9JwM0dUr4KJAqmbzRYr8S5XYmT0tBPDZH6YMEK9s0="; + hash = "sha256-Gxdm1vOXwYFT1AAV3fx53bcVyrrcBNLSKNTlqLxN7Ro="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From bed58295659c8b96b3c4e6286737862fc3370ea5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 04:10:05 +0100 Subject: [PATCH 619/673] python3Packages.mrjob: init at 0.7.4 Dependency for upgrading approvaltests. --- .../python-modules/mrjob/default.nix | 81 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 83 insertions(+) create mode 100644 pkgs/development/python-modules/mrjob/default.nix diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix new file mode 100644 index 000000000000..f8029f9db6c8 --- /dev/null +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# propagates +, pyyaml + +# optionals +, boto3 +, botocore +, google-cloud-dataproc +, google-cloud-logging +, google-cloud-storage +, python-rapidjson +, simplejson +, ujson + + +# tests +, pyspark +, unittestCheckHook +, warcio +}: + +buildPythonPackage rec { + pname = "mrjob"; + version = "0.7.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Yelp"; + repo = "mrjob"; + rev = "refs/tags/v${version}"; + hash = "sha256-Yp4yUx6tkyGB622I9y+AWK2AkIDVGKQPMM+LtB/M3uo="; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + passthru.optional-dependencies = { + aws = [ + boto3 + botocore + ]; + google = [ + google-cloud-dataproc + google-cloud-logging + google-cloud-storage + ]; + rapidjson = [ + python-rapidjson + ]; + simplejson = [ + simplejson + ]; + ujson = [ + ujson + ]; + }; + + doCheck = false; # failing tests + + checkInputs = [ + pyspark + unittestCheckHook + warcio + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + unittestFlagsArray = [ + "-v" + ]; + + meta = with lib; { + changelog = "https://github.com/Yelp/mrjob/blob/v${version}/CHANGES.txt"; + description = "Run MapReduce jobs on Hadoop or Amazon Web Services"; + homepage = "https://github.com/Yelp/mrjob"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7798d2e68ce1..e3e041e8fb2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5968,6 +5968,8 @@ self: super: with self; { mpyq = callPackage ../development/python-modules/mpyq { }; + mrjob = callPackage ../development/python-modules/mrjob { }; + mrkd = callPackage ../development/python-modules/mrkd { }; ms-active-directory = callPackage ../development/python-modules/ms-active-directory { }; From 5eb7ef5549c4732b2773f55b131a1741e2af122b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 04:37:57 +0100 Subject: [PATCH 620/673] sumo: Unpin python37 --- pkgs/applications/science/networking/sumo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 7c5794eb8e83..92f64fbfb916 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -1,7 +1,7 @@ { lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, - python37Packages, stdenv, swig, xercesc, xorg, zlib }: + python3Packages, stdenv, swig, xercesc, xorg, zlib }: stdenv.mkDerivation rec { pname = "sumo"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libxcrypt openscenegraph proj - python37Packages.setuptools + python3Packages.setuptools xercesc zlib python3 From 50544dcce4f5c06acd944805aa02c8e0673d5819 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 04:52:38 +0100 Subject: [PATCH 621/673] python311Full: init --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b15f4a7b84a6..1f52831643b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16303,6 +16303,12 @@ with pkgs; bluezSupport = true; x11Support = true; }; + python311Full = python310.override { + self = python311Full; + pythonAttr = "python311Full"; + bluezSupport = true; + x11Support = true; + }; pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; From 3df6d8d54d4a39f4e80efe8bc86fbf7dcd750081 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 05:26:58 +0100 Subject: [PATCH 622/673] aflplusplus: unpin python37 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f52831643b9..776adbe300c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1246,7 +1246,7 @@ with pkgs; aflplusplus = callPackage ../tools/security/aflplusplus { clang = clang_9; llvm = llvm_9; - python = python37; + python = python3; wine = null; }; From 303517701e38ae80d52b633e4cfd0566d683ce1d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 05:35:53 +0100 Subject: [PATCH 623/673] python3Package.wand: Pass py into checkInputs --- pkgs/development/python-modules/wand/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index 396642b0c13a..b0e943b433d4 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , imagemagickBig +, py , pytestCheckHook }: @@ -22,6 +23,7 @@ buildPythonPackage rec { ''; checkInputs = [ + py pytestCheckHook ]; From 98d9e9f75d42f9946c0f534493fbcbda265fa951 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 05:43:45 +0100 Subject: [PATCH 624/673] cq-editor: Unpin python37Packages THe package doesn't build anyway, so I won't invest any time fixing it. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 776adbe300c4..81eda4102acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28322,9 +28322,7 @@ with pkgs; cplay-ng = callPackage ../applications/audio/cplay-ng { }; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { - python3Packages = python37Packages; - }; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; cqrlog = callPackage ../applications/radio/cqrlog { hamlib = hamlib_4; From 5185f467f396f3b1e9f4d3f5825bf649e219fa8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 05:48:56 +0100 Subject: [PATCH 625/673] python3Packages.mixpanel: 4.5.0 -> 4.10.0 --- .../python-modules/mixpanel/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index fac1afe2c97b..692333e4daae 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -1,40 +1,41 @@ { buildPythonPackage , fetchFromGitHub -, isPy37 , lib # Python Dependencies -, mock -, pytest , six +, urllib3 +, requests + +# tests +, pytestCheckHook +, responses }: buildPythonPackage rec { pname = "mixpanel"; - version = "4.5.0"; - disabled = !isPy37; + version = "4.10.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mixpanel"; repo = "mixpanel-python"; - rev = version; - sha256 = "1hlc717wcn71i37ngsfb3c605rlyjhsn3v6b5bplq00373r4d39z"; + rev = "refs/tags/v${version}"; + hash = "sha256-jV2NLEc23uaI5Q7ZXDwGaZV9iAKQLMAETRTw8epZwQA="; }; propagatedBuildInputs = [ + requests six + urllib3 ]; checkInputs = [ - mock - pytest + pytestCheckHook + responses ]; - checkPhase = '' - py.test - ''; - meta = with lib; { homepage = "https://github.com/mixpanel/mixpanel-python"; description = "Official Mixpanel Python library"; From e75f5e8efa13917e6aefed0a4e8451c5205a0259 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 06:09:33 +0100 Subject: [PATCH 626/673] python37: drop The package set hasn't been working for a long time now, due to infinite recursions, that nobody was going to fix. The release is going to go EOL in 2023/06 and we don't want to ship it in NixOS 23.05 anyway. --- pkgs/common-updater/scripts/mark-broken | 1 - ...hardcoded-path-checking-for-rpmbuild.patch | 30 ----- .../python/cpython/3.7/no-ldconfig.patch | 108 ------------------ .../python/cpython/3.7/profile-task.patch | 21 ---- .../interpreters/python/cpython/default.nix | 12 -- .../interpreters/python/default.nix | 13 --- pkgs/top-level/all-packages.nix | 9 +- 7 files changed, 1 insertion(+), 193 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/profile-task.patch diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken index 73308bf8b39a..7035bee18604 100755 --- a/pkgs/common-updater/scripts/mark-broken +++ b/pkgs/common-updater/scripts/mark-broken @@ -48,7 +48,6 @@ denyFileList=( # to be conditionally disabled denyAttrList=( python27Packages - python37Packages linuxPackages_ rubyPackages_ ) diff --git a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch b/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch deleted file mode 100644 index bb3d992612d3..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a612c481f6116955d420db5ae1fe4c1eb93eb2f2 Mon Sep 17 00:00:00 2001 -From: Marcin Niemira -Date: Sun, 9 Jun 2019 07:05:06 +1000 -Subject: [PATCH] bpo-11122: fix hardcoded path checking for rpmbuild in - bdist_rpm.py (GH-10594) (cherry picked from commit - 45a14942c969ed508b35abd5e116cb18f84ce5b4) - -Co-authored-by: Marcin Niemira ---- - Lib/distutils/command/bdist_rpm.py | 5 +---- - .../next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst | 1 + - 2 files changed, 2 insertions(+), 4 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst - -diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py -index 20ca7ac6dcffa..74381cc69a6ce 100644 ---- a/Lib/distutils/command/bdist_rpm.py -+++ b/Lib/distutils/command/bdist_rpm.py -@@ -309,10 +309,7 @@ def run(self): - - # build package - log.info("building RPMs") -- rpm_cmd = ['rpm'] -- if os.path.exists('/usr/bin/rpmbuild') or \ -- os.path.exists('/bin/rpmbuild'): -- rpm_cmd = ['rpmbuild'] -+ rpm_cmd = ['rpmbuild'] - - if self.source_only: # what kind of RPMs? - rpm_cmd.append('-bs') diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch deleted file mode 100644 index 4324fc5ea61f..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch +++ /dev/null @@ -1,108 +0,0 @@ -From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Mon, 28 Aug 2017 09:24:06 +0200 -Subject: [PATCH] Don't use ldconfig - ---- - Lib/ctypes/util.py | 78 ++-------------------------------------------- - 1 file changed, 2 insertions(+), 76 deletions(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e..79635a8 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -100,54 +100,7 @@ elif os.name == "posix": - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -- -+ return None - - if sys.platform == "sunos5": - # use /usr/ccs/bin/dump on solaris -@@ -268,34 +221,7 @@ elif os.name == "posix": - else: - - def _findSoname_ldconfig(name): -- import struct -- if struct.calcsize('l') == 4: -- machine = os.uname().machine + '-32' -- else: -- machine = os.uname().machine + '-64' -- mach_map = { -- 'x86_64-64': 'libc6,x86-64', -- 'ppc64-64': 'libc6,64bit', -- 'sparc64-64': 'libc6,64bit', -- 's390x-64': 'libc6,64bit', -- 'ia64-64': 'libc6,IA-64', -- } -- abi_type = mach_map.get(machine, 'libc6') -- -- # XXX assuming GLIBC's ldconfig (with option -p) -- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' -- regex = os.fsencode(regex % (re.escape(name), abi_type)) -- try: -- with subprocess.Popen(['/sbin/ldconfig', '-p'], -- stdin=subprocess.DEVNULL, -- stderr=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: -- res = re.search(regex, p.stdout.read()) -- if res: -- return os.fsdecode(res.group(1)) -- except OSError: -- pass -+ return None - - def _findLib_ld(name): - # See issue #9998 for why this is needed --- -2.30.0 - diff --git a/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch deleted file mode 100644 index df55da3a4132..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch +++ /dev/null @@ -1,21 +0,0 @@ -Backport from CPython 3.8 of a good list of tests to run for PGO. - -Upstream commit: - https://github.com/python/cpython/commit/4e16a4a31 - -Upstream discussion: - https://bugs.python.org/issue36044 - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 00fdd21ce..713dc1e53 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -259,7 +259,7 @@ TCLTK_LIBS= - # The task to run while instrumented when building the profile-opt target. - # We exclude unittests with -x that take a rediculious amount of time to - # run in the instrumented training build or do not provide much value. --PROFILE_TASK=-m test.regrtest --pgo -+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c - - # report files for gcov / lcov coverage report - COVERAGE_INFO= $(abs_builddir)/coverage.info diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 388802fca8c6..ffc89039146b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -240,23 +240,11 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch - ] ++ optionals isPy37 [ - # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7. - # See: https://bugs.python.org/issue11122 - ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch - # The workaround is for unittests on Win64, which we don't support. - # It does break aarch64-darwin, which we do support. See: - # * https://bugs.python.org/issue35523 - # * https://github.com/python/cpython/commit/e6b247c8e524 - ./3.7/no-win64-workaround.patch ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonAtLeast "3.11") [ ./3.11/darwin-libutil.patch - ] ++ optionals (pythonOlder "3.8") [ - # Backport from CPython 3.8 of a good list of tests to run for PGO. - ./3.7/profile-task.patch ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 18282bc6d26c..b697062fbecf 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -151,19 +151,6 @@ in { inherit passthruFun; }; - python37 = callPackage ./cpython { - self = __splicedPackages.python37; - sourceVersion = { - major = "3"; - minor = "7"; - patch = "16"; - suffix = ""; - }; - sha256 = "sha256-gzjwwiIthH6QTJVTaRVdwb7u7YBujV7wSwDvR4cji/0="; - inherit (darwin) configd; - inherit passthruFun; - }; - python38 = callPackage ./cpython { self = __splicedPackages.python38; sourceVersion = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81eda4102acb..58d88b021bc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16279,12 +16279,6 @@ with pkgs; bluezSupport = true; x11Support = true; }; - python37Full = python37.override { - self = python37Full; - pythonAttr = "python37Full"; - bluezSupport = true; - x11Support = true; - }; python38Full = python38.override { self = python38Full; pythonAttr = "python38Full"; @@ -16311,13 +16305,12 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; + inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs; - python37Packages = python37.pkgs; python38Packages = python38.pkgs; python39Packages = python39.pkgs; python310Packages = recurseIntoAttrs python310.pkgs; From 4e7b8905ba4a86a5c98dde02836f14725fe8b08e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 06:14:11 +0100 Subject: [PATCH 627/673] pre-commit: Add pytest-forked It was provided through pytest-xdist, which isn't the case after the 3.0 release. --- pkgs/tools/misc/pre-commit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 06efbbfff449..e694106a0eaf 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { go nodejs pytest-env + pytest-forked pytest-xdist pytestCheckHook re-assert From c98f8fbbd11a2a97e7e68766e0b9116b5ddcb42c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 06:23:22 +0100 Subject: [PATCH 628/673] commitizen: fix hash, relax deps, fix tests --- .../version-management/commitizen/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 0ca00c0923b2..69b6c1bdcd16 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -7,6 +7,7 @@ , lib , packaging , poetry-core +, py , pytest-freezegun , pytest-mock , pytest-regressions @@ -29,7 +30,7 @@ buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-Fri5WdLfDCn3NOtCGneKnAN+eOkLAJgPYBR+WBmc/bo="; + hash = "sha256-W+k+hqH0TKQAXf1Em6A1/VdqzJkhYp99I3lbqH6iDDc="; deepClone = true; }; @@ -37,6 +38,11 @@ buildPythonApplication rec { nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' + ''; + propagatedBuildInputs = [ termcolor questionary @@ -54,6 +60,7 @@ buildPythonApplication rec { checkInputs = [ pre-commit + py pytestCheckHook pytest-freezegun pytest-mock @@ -81,6 +88,8 @@ buildPythonApplication rec { "test_bump_pre_commit_changelog" "test_bump_pre_commit_changelog_fails_always" "test_get_commits_with_signature" + # fatal: not a git repository (or any of the parent directories): .git + "test_commitizen_debug_excepthook" ]; passthru.updateScript = nix-update-script { }; From 10a157b2ea64367d5810b7fbb231a38a7e915bb6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 06:49:10 +0100 Subject: [PATCH 629/673] python3Packages.pyshark: Pass py into checkInputs --- pkgs/development/python-modules/pyshark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index b33a1bd9f385..f3d2589d62e6 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ pytestCheckHook wireshark-cli ]; + checkInputs = [ py pytestCheckHook wireshark-cli ]; pythonImportsCheck = [ "pyshark" ]; From ca3f9b732663411712efadab930878ec9d09a885 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 15:48:28 +0100 Subject: [PATCH 630/673] rich-cli: Relax textual constraint --- pkgs/misc/rich-cli/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 68996e4e457c..86e7e3048e74 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -29,7 +29,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'rich = "^12.4.0"' 'rich = "*"' + --replace 'rich = "^12.4.0"' 'rich = "*"' \ + --replace 'textual = "^0.1.18"' 'textual = "*"' ''; pythonImportsCheck = [ From a974783a79428959d54d552d15882d6e24adb536 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 16:04:57 +0100 Subject: [PATCH 631/673] python3Packages.logical-unification: Pass py into checkInputs --- pkgs/development/python-modules/logical-unification/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index b89fcb25339e..0762d3986cce 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , toolz , multipledispatch +, py , pytestCheckHook , pytest-html , pytest-benchmark @@ -25,6 +26,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html pytest-benchmark # Needed for the `--benchmark-skip` flag From be2dded1f08d4a2febb51636b22647ae55d7b495 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 16:05:20 +0100 Subject: [PATCH 632/673] python3Packages.parametrize-from-file: Relax more-itertools constraint --- .../python-modules/parametrize-from-file/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index cacc75f3eb2c..bcdca9cf6470 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "parametrize-from-file"; version = "0.17.0"; + format = "flit"; src = fetchPypi { inherit version; @@ -23,18 +24,19 @@ buildPythonPackage rec { sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; }; - format = "flit"; - pythonImportsCheck = [ "parametrize_from_file" ]; - # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml + + substituteInPlace pyproject.toml \ + --replace "more_itertools~=8.10" "more_itertools" ''; checkInputs = [ numpy pytestCheckHook ]; + propagatedBuildInputs = [ contextlib2 decopatch @@ -45,6 +47,8 @@ buildPythonPackage rec { toml ]; + pythonImportsCheck = [ "parametrize_from_file" ]; + meta = with lib; { description = "Read unit test parameters from config files"; homepage = "https://github.com/kalekundert/parametrize_from_file"; From 9fa4837c2498f16d3abd94e35f27d420175dda0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 16:06:17 +0100 Subject: [PATCH 633/673] python3Packages.cons: Pass py into checkInputs --- pkgs/development/python-modules/cons/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix index 2977051d87b2..03017a536155 100644 --- a/pkgs/development/python-modules/cons/default.nix +++ b/pkgs/development/python-modules/cons/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , logical-unification +, py , pytestCheckHook , pytest-html }: @@ -22,6 +23,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html ]; From 70bc1fbeb74b0d8e2754ad7808756bad32c9b315 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 16:07:06 +0100 Subject: [PATCH 634/673] python3Packages.etuples: Pass py into checkInputs --- pkgs/development/python-modules/etuples/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix index 31a3c9198c7d..d2785519bf84 100644 --- a/pkgs/development/python-modules/etuples/default.nix +++ b/pkgs/development/python-modules/etuples/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cons , multipledispatch +, py , pytestCheckHook , pytest-html }: @@ -24,6 +25,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html ]; From f89b878da594fd6ca5179f92753a472d7bbe3ee5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 16:11:58 +0100 Subject: [PATCH 635/673] python3Packages.minikanren: Pass py into checkInputs --- pkgs/development/python-modules/minikanren/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix index 7452148e8e47..929a9be81a9f 100644 --- a/pkgs/development/python-modules/minikanren/default.nix +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -6,6 +6,7 @@ , multipledispatch , etuples , logical-unification +, py , pytestCheckHook , pytest-html }: @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html ]; From afa8c47666496f2aa813e599bb7545e4c9ff2ab0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 16:30:51 +0100 Subject: [PATCH 636/673] python3Packages.python-http-client: Disable failing test --- .../python-modules/python-http-client/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix index 78a3b018c7ea..b108de64dd21 100644 --- a/pkgs/development/python-modules/python-http-client/default.nix +++ b/pkgs/development/python-modules/python-http-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - pname = "python_http_client"; + pname = "python-http-client"; version = "3.3.7"; format = "setuptools"; @@ -25,6 +25,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # checks date in license file and subsequently fails after new years + "test_daterange" + ]; + pythonImportsCheck = [ "python_http_client" ]; From 8fdb3b675cc993f3b12b22f9d74d30f60467a6b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 16:40:38 +0100 Subject: [PATCH 637/673] python3Packages.pyliblo: Disable for python>=3.11 Uses removed functions in the inspect module and last development happened in 2015. --- pkgs/development/python-modules/pyliblo/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 64f8e62c2862..321507c3ce6e 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchurl , isPyPy +, pythonAtLeast , liblo , cython }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pyliblo"; version = "0.10.0"; - disabled = isPyPy; + disabled = isPyPy || pythonAtLeast "3.11"; src = fetchurl { url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; From b86abf8880439b9dc059bbb79540767e1177060a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 17:42:22 +0100 Subject: [PATCH 638/673] python3Packages.sanic: Update disabled tests, cleanup --- .../python-modules/sanic/default.nix | 55 ++++++++----------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 36c20604852c..22d6d1777193 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -9,13 +9,12 @@ , httptools , multidict , pytest-asyncio -, pytest-benchmark -, pytest-sugar -, pytestCheckHook + ,pytestCheckHook , pythonOlder , pythonAtLeast , sanic-routing , sanic-testing +, setuptools , ujson , uvicorn , uvloop @@ -26,7 +25,7 @@ buildPythonPackage rec { pname = "sanic"; version = "22.12.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,6 +36,10 @@ buildPythonPackage rec { hash = "sha256-Vj780rP5rJ+YsMWlb3BR9LTKT/nTt0C2H3J0X9sysj8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aioquic @@ -76,44 +79,34 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" + "-vvv" ]; disabledTests = [ # Require networking "test_full_message" - # Fails to parse cmdline arguments - "test_dev" - "test_auto_reload" - "test_host_port_ipv6_loopback" + # Server mode mismatch (debug vs production) "test_num_workers" - "test_debug" - "test_access_logs" - "test_noisy_exceptions" - # OSError: foo - "test_bad_headers" - "test_create_server_trigger_events" - "test_json_body_requests" - "test_missing_startup_raises_exception" - "test_no_body_requests" - "test_oserror_warning" - "test_running_multiple_offset_warning" - "test_streaming_body_requests" - "test_trigger_before_events_create_server" - "test_keep_alive_connection_context" # Racy tests "test_keep_alive_client_timeout" "test_keep_alive_server_timeout" "test_zero_downtime" - # TLS tests - "test_missing_sni" - "test_no_matching_cert" - "test_wildcards" - # They thtow execptions + # sanic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory "test_load_app_simple" - "worker/test_loader.py" - # broke with ujson 5.4 upgrade - # https://github.com/sanic-org/sanic/pull/2504 - "test_json_response_json" + # create defunct python processes + "test_reloader_live" + "test_reloader_live_with_dir" + "test_reload_listeners" + # crash the python interpreter + "test_host_port_localhost" + "test_host_port" + "test_server_run" + # NoneType object is not subscriptable + "test_serve_app_implicit" + # AssertionError: assert [] == ['Restarting a process', 'Begin restart termination', 'Starting a process'] + "test_default_reload_shutdown_order" + # App not found. + "test_input_is_dir" ]; disabledTestPaths = [ From 4fbd48d2dcf7cda16feeb654f302e43d8b0c654d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 18:34:00 +0100 Subject: [PATCH 639/673] python3Packages.qutip: Pass ipython into checkInputs and expose ipython extra. --- pkgs/development/python-modules/qutip/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 1b8c1b8bf382..1a96fc947b45 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -6,6 +6,7 @@ , cython , doCheck ? true , fetchFromGitHub +, ipython , matplotlib , numpy , packaging @@ -43,7 +44,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-rerunfailures - ] ++ passthru.optional-dependencies.graphics; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Disabling OpenMP support on Darwin. setupPyGlobalFlags = lib.optionals (!stdenv.isDarwin) [ @@ -75,6 +76,9 @@ buildPythonPackage rec { graphics = [ matplotlib ]; + ipython = [ + ipython + ]; semidefinite = [ cvxpy cvxopt From 915fd5f93cd3ffbf0eb3f629b3dd2edfed56f5c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 22:33:31 +0100 Subject: [PATCH 640/673] python3Packages.sqlalchemy: 1.4.45 -> 1.4.46 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_46 --- 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 989d0380f7a4..a517b3583687 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.45"; # TODO: check python3Packages.fastapi when updating to >= 1.4.42 + version = "1.4.46"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/WmFCGAJOj9p/v4KtW0EHt/f4YUQtT2aLq7LovFfp5U="; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; nativeBuildInputs = lib.optionals (!isPyPy) [ From 0cee035e0706d9a34deeea0e3060e474442d929d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 22:47:03 +0100 Subject: [PATCH 641/673] python3Packages.pyunifiprotect: Fix version, fix tests --- pkgs/development/python-modules/pyunifiprotect/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 9d5a28994986..9cf127b506dc 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -10,6 +10,7 @@ , packaging , pillow , poetry-core +, py , pydantic , pyjwt , pytest-aiohttp @@ -22,6 +23,7 @@ , pythonOlder , pytz , setuptools +, setuptools-scm , termcolor , typer , ffmpeg @@ -46,8 +48,11 @@ buildPythonPackage rec { --replace "--cov=pyunifiprotect --cov-append" "" ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -74,6 +79,7 @@ buildPythonPackage rec { checkInputs = [ ffmpeg # Required for command ffprobe + py pytest-aiohttp pytest-asyncio pytest-benchmark From 6d0a0fda793828a3f51f281751c1ffe91c6b3d5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 22:54:24 +0100 Subject: [PATCH 642/673] python3Packages.pynndescent: Fix skbuild 1.2.0 compat --- .../python-modules/pynndescent/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 725a2dbcf43b..18775d0facf5 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , importlib-metadata , joblib , llvmlite @@ -23,6 +24,18 @@ buildPythonPackage rec { hash = "sha256-p8VSVpv2BKEB/VS7odJ8EjieBllF3uOmd3pRjGOkbys="; }; + patches = [ + # Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207 + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch"; + hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch"; + hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y="; + }) + ]; + propagatedBuildInputs = [ joblib llvmlite From 4469b2ad1a1b4f2884e53906f0a8cca351eba87f Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 4 Jan 2023 00:35:10 +0100 Subject: [PATCH 643/673] python3Packages.chia-rs: fix build --- .../python-modules/chia-rs/Cargo.lock | 937 ++++++++++++++++-- .../python-modules/chia-rs/default.nix | 5 + .../python-modules/chia-rs/fix-build.patch | 12 + 3 files changed, 853 insertions(+), 101 deletions(-) create mode 100644 pkgs/development/python-modules/chia-rs/fix-build.patch diff --git a/pkgs/development/python-modules/chia-rs/Cargo.lock b/pkgs/development/python-modules/chia-rs/Cargo.lock index 96fc3236f142..ad3755638df3 100644 --- a/pkgs/development/python-modules/chia-rs/Cargo.lock +++ b/pkgs/development/python-modules/chia-rs/Cargo.lock @@ -2,6 +2,38 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anyhow" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" + +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -16,9 +48,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -36,10 +68,19 @@ dependencies = [ ] [[package]] -name = "bls12_381" -version = "0.5.0" +name = "block-buffer" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bls12_381" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62250ece575fa9b22068b3a8d59586f01d426dd7785522efd97632959e71c986" dependencies = [ "ff", "group", @@ -49,10 +90,27 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.10.0" +name = "bls12_381_plus" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "c7c681aa947677ec0c5ccfa6f14c0dd039ddbaa7b12952bf146bd5226a5f9880" +dependencies = [ + "digest 0.9.0", + "ff", + "group", + "heapless", + "pairing", + "rand_core", + "serde", + "subtle", + "zeroize", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byteorder" @@ -60,6 +118,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cfg-if" version = "1.0.0" @@ -68,31 +132,76 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chia" -version = "0.1.5" +version = "0.1.15" dependencies = [ + "chia-protocol", + "clvm-utils", "clvmr", "hex", "num-traits", "pyo3", - "serde", +] + +[[package]] +name = "chia-bls" +version = "0.1.15" +dependencies = [ + "anyhow", + "bls12_381_plus", + "criterion", + "group", + "hex", + "hkdf", + "num-bigint", + "rand", + "sha2 0.9.9", + "tiny-bip39", +] + +[[package]] +name = "chia-protocol" +version = "0.1.15" +dependencies = [ + "chia_py_streamable_macro", + "chia_streamable_macro", + "clvmr", + "hex", + "pyo3", + "sha2 0.10.2", +] + +[[package]] +name = "chia_py_streamable_macro" +version = "0.1.2" +dependencies = [ + "quote", + "syn", ] [[package]] name = "chia_rs" -version = "0.1.5" +version = "0.1.16" dependencies = [ "chia", + "chia-protocol", + "chia_py_streamable_macro", + "chia_streamable_macro", "clvmr", "hex", - "py_streamable", "pyo3", - "serde", - "sha2", +] + +[[package]] +name = "chia_streamable_macro" +version = "0.2.3" +dependencies = [ + "quote", + "syn", ] [[package]] name = "chia_wasm" -version = "0.1.5" +version = "0.1.15" dependencies = [ "chia", "wasm-bindgen", @@ -100,10 +209,65 @@ dependencies = [ ] [[package]] -name = "clvmr" -version = "0.1.20" +name = "ciborium" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18d68c7f9e8e08ea66a6673bec83100bd53103a9d504fe279147bd0a79b260c" +checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" + +[[package]] +name = "ciborium-ll" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "bitflags", + "clap_lex", + "indexmap", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clvm-utils" +version = "0.1.15" +dependencies = [ + "clvmr", +] + +[[package]] +name = "clvmr" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5e907612d322d0d7def6b0ecb3ad681f6af2db106bcfabe4153746c60ef9e4" dependencies = [ "bls12_381", "hex", @@ -111,10 +275,7 @@ dependencies = [ "num-bigint", "num-integer", "num-traits", - "pyo3", - "sha2", - "wasm-bindgen", - "wasm-bindgen-test", + "sha2 0.10.2", ] [[package]] @@ -129,18 +290,123 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.1.5" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] [[package]] -name = "ctor" -version = "0.1.22" +name = "criterion" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap", + "criterion-plot", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", @@ -156,10 +422,27 @@ dependencies = [ ] [[package]] -name = "ff" -version = "0.10.1" +name = "digest" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", + "subtle", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "bitvec", "rand_core", @@ -168,25 +451,36 @@ dependencies = [ [[package]] name = "funty" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", ] [[package]] -name = "ghost" -version = "0.1.5" +name = "getrandom" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93490550b1782c589a350f2211fff2e34682e25fed17ef53fc4fa8fe184975e" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" dependencies = [ "proc-macro2", "quote", @@ -195,9 +489,9 @@ dependencies = [ [[package]] name = "group" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" +checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" dependencies = [ "byteorder", "ff", @@ -205,12 +499,94 @@ dependencies = [ "subtle", ] +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin", + "stable_deref_trait", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +dependencies = [ + "digest 0.9.0", + "hmac 0.11.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + [[package]] name = "indoc" version = "0.3.6" @@ -265,6 +641,21 @@ dependencies = [ "syn", ] +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + [[package]] name = "js-sys" version = "0.3.52" @@ -282,15 +673,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -306,10 +697,19 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.0" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -318,9 +718,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -328,18 +728,34 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "once_cell" -version = "1.13.0" +name = "num_cpus" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -348,10 +764,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "pairing" -version = "0.20.0" +name = "os_str_bytes" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "pairing" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" dependencies = [ "group", ] @@ -369,9 +791,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -400,6 +822,49 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "plotters" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" + +[[package]] +name = "plotters-svg" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -408,21 +873,13 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.42" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] -[[package]] -name = "py_streamable" -version = "0.1.0" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "pyo3" version = "0.15.1" @@ -474,24 +931,70 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] [[package]] name = "redox_syscall" @@ -503,10 +1006,55 @@ dependencies = [ ] [[package]] -name = "scoped-tls" -version = "1.0.0" +name = "regex" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -515,19 +1063,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "serde" -version = "1.0.140" +name = "semver" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + +[[package]] +name = "serde" +version = "1.0.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", @@ -535,23 +1089,60 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.9.5" +name = "serde_json" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ - "block-buffer", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] [[package]] -name = "smallvec" -version = "1.9.0" +name = "sha2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "spin" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "subtle" @@ -561,15 +1152,27 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + [[package]] name = "tap" version = "1.0.1" @@ -577,22 +1180,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "typenum" -version = "1.15.0" +name = "textwrap" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiny-bip39" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" +dependencies = [ + "anyhow", + "hmac 0.12.1", + "once_cell", + "pbkdf2", + "rand", + "rustc-hash", + "sha2 0.10.2", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unindent" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44" +checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" [[package]] name = "version_check" @@ -600,6 +1288,23 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.75" @@ -716,6 +1421,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -724,9 +1438,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "wyz" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "zeroize" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix index 0e52842dce9e..36c62153b8b8 100644 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ b/pkgs/development/python-modules/chia-rs/default.nix @@ -16,6 +16,11 @@ buildPythonPackage rec { sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8="; }; + patches = [ + # undo a hack from upstream that confuses our build hook + ./fix-build.patch + ]; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; diff --git a/pkgs/development/python-modules/chia-rs/fix-build.patch b/pkgs/development/python-modules/chia-rs/fix-build.patch new file mode 100644 index 000000000000..cf793f78a744 --- /dev/null +++ b/pkgs/development/python-modules/chia-rs/fix-build.patch @@ -0,0 +1,12 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -1,8 +1,5 @@ +-# the "wheel" crate is excluded from the workspace because pyo3 has problems with +-# "cargo test" and "cargo bench" + [workspace] +-members = ["wasm", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] +-exclude = ["wheel"] ++members = ["wasm", "wheel", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] + + [package] + name = "chia" From ac5bf82d8e4df5f861f1928de5c1fbb9bf5aa785 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 4 Jan 2023 00:20:37 +0100 Subject: [PATCH 644/673] python3Packages.blspy: 1.0.13 -> 1.0.16 --- pkgs/development/python-modules/blspy/default.nix | 4 ++-- .../blspy/dont_fetch_dependencies.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index d4122dddc8bc..01200a2fae82 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.13"; + version = "1.0.16"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-feuHVtBgjzGBjY1eSKh47feTT8prdkSwvs993lJSSiI="; + hash = "sha256-XABdS6CCUJpZ9N1Vra078V0HoDU32u1l3yz96ZKHwFc="; }; patches = [ diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index 3184e3f0ea8e..6acc6f878f51 100644 --- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6922167..23d8da6 100644 +index 7922652..d85b058 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH @@ -10,7 +10,7 @@ index 6922167..23d8da6 100644 - # Latest commit at the moment this was added here - # Anchored to libsodium v1.0.18 - GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 -+ URL @sodium_src@ ++ URL /nix/store/2nj48a8vb7rzxhwaigdcpa0yyax7yrv7-source ) set(SODIUM_PCH "on" CACHE STRING "") set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") @@ -30,12 +30,12 @@ index 6922167..23d8da6 100644 relic - GIT_REPOSITORY https://github.com/Chia-Network/relic.git - GIT_TAG ${RELIC_GIT_TAG} -+ SOURCE_DIR @relic_src@ ++ SOURCE_DIR /nix/store/6r9v1cmmy535q2y0pk0bkjh3ppyzb2ch-source ) # Relic related options diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt -index 5a8c381..d9aa940 100644 +index 2e331c3..d9aa940 100644 --- a/python-bindings/CMakeLists.txt +++ b/python-bindings/CMakeLists.txt @@ -1,8 +1,7 @@ @@ -43,13 +43,13 @@ index 5a8c381..d9aa940 100644 FetchContent_Declare( pybind11 - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11 relic) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 449164a..15a955e 100644 +index 3164f7f..15a955e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,8 +37,7 @@ install(FILES $ DESTINATION lib) From f7498f56e134402fb97701edce38b83cc46307ad Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 4 Jan 2023 00:23:00 +0100 Subject: [PATCH 645/673] python3Packages.chiapos: 1.0.10 -> 1.0.11 --- .../python-modules/chiapos/dont_fetch_dependencies.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index 05bd212e9a6c..86dfad747d85 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d7862b..c2d06a1 100644 +index d1dd25d..96abc65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake) @@ -7,7 +7,7 @@ index 5d7862b..c2d06a1 100644 FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.7.1 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) From 6946d7b09ca041f82b5e1906c1ee6a75e8ab3bdf Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 4 Jan 2023 00:23:50 +0100 Subject: [PATCH 646/673] python3Packages.chiavdf: 1.0.7 -> 1.0.8 --- .../python-modules/chiavdf/dont_fetch_dependencies.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch index 9b49db81fcf5..1bcea2e68b31 100644 --- a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c975128..a9f6910 100644 +index fb92c4d..9fa52ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,8 +31,7 @@ include(FetchContent) @@ -7,7 +7,7 @@ index c975128..a9f6910 100644 FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) From fa7dc79e26575ea267a8946447d5c53888c6a16f Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 4 Jan 2023 00:24:56 +0100 Subject: [PATCH 647/673] python3Packages.clvm-tools-rs: 0.1.19 -> 0.1.25 --- pkgs/development/python-modules/clvm-tools-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/clvm-tools-rs/default.nix b/pkgs/development/python-modules/clvm-tools-rs/default.nix index 3d88084169a1..0e82989caadb 100644 --- a/pkgs/development/python-modules/clvm-tools-rs/default.nix +++ b/pkgs/development/python-modules/clvm-tools-rs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "clvm-tools-rs"; - version = "0.1.19"; + version = "0.1.25"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_tools_rs"; rev = version; - sha256 = "sha256-LQbFBZBLUAjyqIAWIn+N8tUrBMskRoKvMMg5gfTyVU8="; + sha256 = "sha256-s4AeXoLOtEIxCSnW5CWVZoZrAJ+wKQPklEehPAvnHMw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-LcDWpMM+PUElsXO82H6QVOp338+NduC/j3pXQKSni3I="; + sha256 = "sha256-4SjSpEMu6NAPn50u7iyAznTw4AL4+KmBvppMV4+w6Jk="; }; nativeBuildInputs = with rustPlatform; [ From 87208cc09e19cee4a8d65e47de43f86258e9b5ca Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 4 Jan 2023 00:25:45 +0100 Subject: [PATCH 648/673] python3Packages.clvm-tools: 0.4.5 -> 0.4.6 --- pkgs/development/python-modules/clvm-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix index 7de885cc7384..4d4f3631595c 100644 --- a/pkgs/development/python-modules/clvm-tools/default.nix +++ b/pkgs/development/python-modules/clvm-tools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clvm_tools"; - version = "0.4.5"; + version = "0.4.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_tools"; rev = version; - sha256 = "sha256-7FUZh9w6AM+7l7Br9V/ovS/1H62BLoas5gCrbeMvBAc="; + sha256 = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U="; }; nativeBuildInputs = [ From 301620319bb54cbe41084095859ac04f4a4e3b1a Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 4 Jan 2023 00:27:15 +0100 Subject: [PATCH 649/673] chia: 1.6.0 -> 1.6.2 --- .../applications/blockchains/chia/default.nix | 10 +++------ .../blockchains/chia/dont_lock_in_store.patch | 21 ------------------- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/blockchains/chia/dont_lock_in_store.patch diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 33ce321cb4c6..bae0fc7988d9 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,21 +6,16 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg="; + hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8="; }; - patches = [ - # chia tries to put lock files in the python modules directory - ./dont_lock_in_store.patch - ]; - postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" @@ -59,6 +54,7 @@ let chia = python3Packages.buildPythonApplication rec { fasteners filelock keyrings-cryptfile + psutil pyyaml setproctitle setuptools # needs pkg_resources at runtime diff --git a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch b/pkgs/applications/blockchains/chia/dont_lock_in_store.patch deleted file mode 100644 index f923b11801a1..000000000000 --- a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/chia/wallet/puzzles/load_clvm.py -+++ b/chia/wallet/puzzles/load_clvm.py -@@ -82,18 +82,6 @@ def load_serialized_clvm(clvm_filename, package_or_requirement=__name__) -> Seri - """ - hex_filename = f"{clvm_filename}.hex" - -- try: -- if pkg_resources.resource_exists(package_or_requirement, clvm_filename): -- # Establish whether the size is zero on entry -- full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename)) -- output = full_path.parent / hex_filename -- compile_clvm(full_path, output, search_paths=[full_path.parent]) -- -- except NotImplementedError: -- # pyinstaller doesn't support `pkg_resources.resource_exists` -- # so we just fall through to loading the hex clvm -- pass -- - clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8") - assert len(clvm_hex.strip()) != 0 - clvm_blob = bytes.fromhex(clvm_hex) From 94a295ea7bc5410cf7bea6af2c35aa2719c34556 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 00:48:47 +0100 Subject: [PATCH 650/673] python3Packages.flask-restx: Add py to checkInputs --- pkgs/development/python-modules/flask-restx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 6f7c83010eb1..f68b41e45b69 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -10,6 +10,7 @@ , faker , mock , blinker +, py , pytest-flask , pytest-mock , pytest-benchmark @@ -43,6 +44,7 @@ buildPythonPackage rec { blinker faker mock + py pytest-benchmark pytest-flask pytest-mock From 5790ed9ff54b736749232f13f40ce7a5c3086906 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 01:59:54 +0100 Subject: [PATCH 651/673] python3Packages.setuptools-scm: set format in passthru test --- pkgs/development/python-modules/setuptools-scm/tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/setuptools-scm/tests.nix b/pkgs/development/python-modules/setuptools-scm/tests.nix index b90797abf7eb..c81323b27fa4 100644 --- a/pkgs/development/python-modules/setuptools-scm/tests.nix +++ b/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "setuptools-scm-tests"; inherit (setuptools-scm) version; + format = "other"; src = setuptools-scm.src; From 5a0ee9d54d29751a043ea0326694ea37f69d1c36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 02:03:36 +0100 Subject: [PATCH 652/673] home-assistant: pin pymodbus at 2.5.3 --- pkgs/servers/home-assistant/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9b7f66f4a020..d8ca4527dda2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -117,6 +117,16 @@ let }; }); + pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { + version = "2.5.3"; + src = fetchFromGitHub { + owner = "riptideio"; + repo = "pymodbus"; + rev= "refs/tags/v${version}"; + hash = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; From 0c72b4a513a642157fe426efc9d75de3f9fd50d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 02:24:36 +0100 Subject: [PATCH 653/673] python3Packages.gipc: relax gevent constraint, enable tests --- .../python-modules/gipc/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 85d17ee3ab8a..84743d8606c3 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,19 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , gevent +, pytestCheckHook }: buildPythonPackage rec { pname = "gipc"; version = "1.4.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo="; + src = fetchFromGitHub { + owner = "jgehrcke"; + repo = "gipc"; + rev = "refs/tags/${version}"; + hash = "sha256-T5TqLanODyzJGyjDZz+75bbz3THxoobYnfJFQxAB76E="; }; - propagatedBuildInputs = [ gevent ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "gevent>=1.5,<=21.12.0" "gevent>=1.5" + ''; + + propagatedBuildInputs = [ + gevent + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "gevent-cooperative child processes and IPC"; From 62adfb854793ac10dc7ae209e672b34bae148d28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 02:48:02 +0100 Subject: [PATCH 654/673] fixup! python3Packages.gremlinpython: 3.6.0 -> 3.6.1 --- pkgs/development/python-modules/gremlinpython/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index 2248bc806b06..b62b73283097 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -6,7 +6,6 @@ , importlib-metadata , isodate , nest-asyncio -, six , pytestCheckHook , mock , pyhamcrest @@ -31,19 +30,20 @@ buildPythonPackage rec { sed -i '/pytest-runner/d' setup.py substituteInPlace setup.py \ - --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' + --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \ + --replace 'importlib-metadata<5.0.0' 'importlib-metadata' ''; # setup-requires requirements nativeBuildInputs = [ importlib-metadata ]; + propagatedBuildInputs = [ aenum aiohttp isodate nest-asyncio - six ]; checkInputs = [ From 556b0dbafd0c1534fbf7ad55b201613dc896a96b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 03:06:48 +0100 Subject: [PATCH 655/673] catt: Fix duplicate hashes --- pkgs/applications/video/catt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 4a19121f34ad..7e1157fc4a67 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -13,7 +13,7 @@ let owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU="; }; }); @@ -29,7 +29,7 @@ let version = "9.2.0"; src = oldAttrs.src.override { inherit version; - sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d"; + hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo="; }; }); }; From 17ca33ffcc611f21daff4e646864bdd54a035ae3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 03:07:06 +0100 Subject: [PATCH 656/673] conan: Fix duplicate hash --- pkgs/development/tools/build-managers/conan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index a72106ace3c4..803476e3f98c 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -25,7 +25,7 @@ let newPython = python3.override { version = "1.5.0"; src = oldAttrs.src.override { inherit version; - sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f"; + hash = "sha256-Dlh1auOPvY/DAg1UutuOrhfFudy+04ixe7Vbilko35I="; }; }); }; From 355841cf36059e22a8636d9363240b260f3d736f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 15:24:04 +0100 Subject: [PATCH 657/673] python3Packages.pytoolconfig: init at 1.2.4 --- .../python-modules/pytoolconfig/default.nix | 99 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 101 insertions(+) create mode 100644 pkgs/development/python-modules/pytoolconfig/default.nix diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix new file mode 100644 index 000000000000..c3d1d66f7bc6 --- /dev/null +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -0,0 +1,99 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonOlder + +# build +, pdm-pep517 + +# docs +, docutils +, sphinxHook +, sphinx-rtd-theme +, sphinx-autodoc-typehints + +# runtime +, tomli +, packaging + +# optionals +, pydantic +, platformdirs +, sphinx +, tabulate + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytoolconfig"; + version = "1.2.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bagel897"; + repo = "pytoolconfig"; + rev = "refs/tags/v${version}"; + hash = "sha256-UdBPp9Ur3+hYn2CBY91jK1hT/GHyA8qbQ3w0OuLBrFU="; + }; + + outputs = [ + "out" + "doc" + ]; + + PDM_PEP517_SCM_VERSION = version; + + nativeBuildInputs = [ + pdm-pep517 + + # docs + docutils + sphinx-autodoc-typehints + sphinx-rtd-theme + sphinxHook + ] ++ passthru.optional-dependencies.doc; + + patches = [ + (fetchpatch { + # Fix documentation build + url = "https://github.com/bagel897/pytoolconfig/commit/c8a010842d738242d6bb8deb28ecd62342a60e03.patch"; + hash = "sha256-hYcPjQeHYGtSPy363RVS5YgQ+obJQuC+Q9ZuOGvKRAY="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "packaging>=22.0" "packaging" + ''; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + passthru.optional-dependencies = { + validation = [ pydantic ]; + global = [ platformdirs ]; + doc = [ sphinx tabulate ]; + }; + + pythonImportsCheck = [ + "pytoolconfig" + ]; + + checkInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + meta = with lib; { + changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; + description = "Python tool configuration"; + homepage = "https://github.com/bagel897/pytoolconfig"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3e041e8fb2e..868b6ff76c12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8461,6 +8461,8 @@ self: super: with self; { pypykatz = callPackage ../development/python-modules/pypykatz { }; + pytoolconfig = callPackage ../development/python-modules/pytoolconfig { }; + pypytools = callPackage ../development/python-modules/pypytools { }; pyqldb = callPackage ../development/python-modules/pyqldb { }; From 0d39ee269923df9021ba42bed67f0bf77f9d775a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 15:53:10 +0100 Subject: [PATCH 658/673] python3Packages.cherryp: Disable failing tests --- pkgs/development/python-modules/cherrypy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index b94f30a2c758..c438e9e12cf4 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -78,6 +78,9 @@ buildPythonPackage rec { "test_antistampede" "test_file_stream" + "test_basic_request" + "test_3_Redirect" + "test_4_File_deletion" ] ++ lib.optionals stdenv.isDarwin [ "test_block" ]; From 4ce2a8eb26813da8c3d3cab64dcb9367556cc60a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 16:40:03 +0100 Subject: [PATCH 659/673] python3Packages.rope: 0.18.0 -> 1.6.0 --- .../python-modules/rope/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 21d5886efe21..89772638ae39 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,28 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, pytoolconfig +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { pname = "rope"; - version = "0.18.0"; + version = "1.6.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04"; + hash = "sha256-kxrqFUNlVWp9qsAcvOzgycEYdVv/98ZaskK2lYUWfso="; }; - patches = [ - # Python 3.9 ast changes - (fetchpatch { - url = "https://github.com/python-rope/rope/pull/333.patch"; - excludes = [ ".github/workflows/main.yml" ]; - sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0"; - }) + nativeBuildInputs = [ + setuptools ]; - checkInputs = [ nose ]; - checkPhase = '' - # tracked upstream here https://github.com/python-rope/rope/issues/247 - NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest - ''; + propagatedBuildInputs = [ + pytoolconfig + ] ++ pytoolconfig.optional-dependencies.global; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_search_submodule" + "test_get_package_source_pytest" + "test_get_modname_folder" + ]; meta = with lib; { description = "Python refactoring library"; From 7ecacc518fd046f877cb400639836ea28be44429 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 16:47:52 +0100 Subject: [PATCH 660/673] python3Packages.pyproject-hooks: init at 1.0.0 --- .../pyproject-hooks/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/pyproject-hooks/default.nix diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix new file mode 100644 index 000000000000..dd882531105b --- /dev/null +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, pytestCheckHook +, pythonOlder +, setuptools +, testpath +, tomli +}: + +buildPythonPackage rec { + pname = "pyproject-hooks"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi rec { + pname = "pyproject_hooks"; + inherit version; + hash = "sha256-8nGymLl/WVXVP7ErcsH7GUjCLBprcLMVxUztrKAmTvU="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + checkInputs = [ + pytestCheckHook + setuptools + testpath + ]; + + disabledTests = [ + # fail to import setuptools + "test_setup_py" + "test_issue_104" + ]; + + pythonImportsCheck = [ + "pyproject_hooks" + ]; + + meta = with lib; { + description = "Low-level library for calling build-backends in `pyproject.toml`-based project "; + homepage = "https://github.com/pypa/pyproject-hooks"; + changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 868b6ff76c12..a2e0a7d2f030 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6967,6 +6967,8 @@ self: super: with self; { pyproject-api = callPackage ../development/python-modules/pyproject-api { }; + pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { }; + pypsrp = callPackage ../development/python-modules/pypsrp { }; phpserialize = callPackage ../development/python-modules/phpserialize { }; From f3ed60d37bc13ad8a767ca0998d7ab9041633945 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 16:50:02 +0100 Subject: [PATCH 661/673] python3Packages.installer: 0.5.1 -> 0.6.0 Diff: https://github.com/pradyunsg/installer/compare/0.5.1...0.6.0 --- pkgs/development/python-modules/installer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index 8749ea16132d..e442e0d48d3f 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "installer"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; repo = pname; rev = version; - sha256 = "sha256-vhZYUhUcD5fnjkyEqFMvggVGH9Ri8iNgqRgSBQTOCtM="; + sha256 = "sha256-IXznSrc/4LopgZDGFSC6cAOCbts+siKpdl5SvN1FFvA="; }; nativeBuildInputs = [ flit-core ]; From 0ad81bc718d197c4eae6e5a6a085c51cc6e5f3b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 16:50:56 +0100 Subject: [PATCH 662/673] pdm: 2.1.5 -> 2.3.4 https://github.com/pdm-project/pdm/releases/tag/2.2.0 https://github.com/pdm-project/pdm/releases/tag/2.2.1 https://github.com/pdm-project/pdm/releases/tag/2.3.0 https://github.com/pdm-project/pdm/releases/tag/2.3.1 https://github.com/pdm-project/pdm/releases/tag/2.3.2 https://github.com/pdm-project/pdm/releases/tag/2.3.3 https://github.com/pdm-project/pdm/releases/tag/2.3.4 --- pkgs/tools/package-management/pdm/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 5b98582a1dff..9af953d2365e 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -8,12 +8,12 @@ let # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 packageOverrides = self: super: { resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec { - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; - rev = version; - sha256 = "sha256-QDHEdVET7HN2ZCKxNUMofabR+rxJy0erWhNQn94D7eI="; + rev = "/refs/tags/${version}"; + hash = "sha256-xzu8sMNMihJ80vezMdGkOT5Etx08qy3T/TkEn5EAY48="; }; }); }; @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.1.5"; + version = "2.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-W+5B1JfOyTpJaT+le1zxyDNwGATrErxNNHw+x5VdfOc="; + hash = "sha256-zaSNM5Ey4oI2MtUPYBHG0PCMgJdasVatwkjaRBrT1RQ="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonApplication rec { pep517 pip platformdirs + pyproject-hooks python-dotenv requests-toolbelt resolvelib From 658b24a851f77c46bb11d8f515ee6962003f0462 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 17:05:51 +0100 Subject: [PATCH 663/673] python3Packages.cramjam: 2.4.0 -> 2.6.2.post1 --- .../python-modules/cramjam/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index a88cc233ad56..b132a0d02a7b 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -5,9 +5,11 @@ , stdenv , libiconv , brotli +, hypothesis , lz4 , memory_profiler , numpy +, py , pytest-benchmark , pytestCheckHook , python-snappy @@ -16,39 +18,52 @@ buildPythonPackage rec { pname = "cramjam"; - version = "2.4.0"; + version = "2.6.2.post1"; format = "pyproject"; src = fetchFromGitHub { owner = "milesgranger"; repo = "pyrus-cramjam"; - rev = "v${version}"; - sha256 = "sha256-00KvbiTf8PxYWljLKTRZmPIAbb+PnBleDM4p0AzZhHw="; + rev = "refs/tags/v${version}"; + hash = "sha256-KU1JVNEQJadXNiIWTvI33N2NSq994xoKxcAGGezFjaI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-4y/jeEZjVUbaXtBx5l3Hrbnj3iNYX089K4xexRP+5v0="; + hash = "sha256-w1bEf+etLgR/YOyLmC3lFtO9fqAx8z2aul/XIKUQb5k="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; checkInputs = [ brotli + hypothesis lz4 memory_profiler numpy + py pytest-benchmark pytestCheckHook python-snappy zstd ]; - pytestFlagsArray = [ "--benchmark-disable" ]; - pythonImportsCheck = [ "cramjam" ]; + + pytestFlagsArray = [ + "--benchmark-disable" + ]; + + disabledTestPaths = [ + "benchmarks/test_bench.py" + ]; + + pythonImportsCheck = [ + "cramjam" + ]; meta = with lib; { description = "Thin Python bindings to de/compression algorithms in Rust"; From be0230a9d6e85994b9b34b3b0fac8f773751c037 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 18:13:11 +0100 Subject: [PATCH 664/673] python3Packages.authcaptureproxy: Remove outdated postPatch hook --- .../python-modules/authcaptureproxy/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index d4a71d639c73..63bc42c5c4b2 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -25,14 +25,6 @@ buildPythonPackage rec { sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; }; - postPatch = '' - # https://github.com/alandtse/auth_capture_proxy/issues/14 - # https://github.com/alandtse/auth_capture_proxy/issues/15 - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'importlib-metadata = "^3.4.0"' 'importlib-metadata = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; From f411d20ab6c79309a8fbd5b23800f07e66d0ff59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 18:19:27 +0100 Subject: [PATCH 665/673] python3Packages.sqlalchemy-i18n: Propgate six --- pkgs/development/python-modules/sqlalchemy-i18n/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 83d813b3dbd9..a17e7ada4522 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , sqlalchemy , sqlalchemy-utils +, six }: buildPythonPackage rec { @@ -17,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy sqlalchemy-utils + six ]; # tests require running a postgresql server From 998f4d139c26ca2ae809dbe0f8f218f0a33e1304 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 18:40:31 +0100 Subject: [PATCH 666/673] python3Packages.hatch-jupyter-builder: init at 0.8.2 --- .../hatch-jupyter-builder/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/hatch-jupyter-builder/default.nix diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix new file mode 100644 index 000000000000..de962e6b9585 --- /dev/null +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch +, pytest-mock +, pytestCheckHook +, tomli +, twine +}: + +buildPythonPackage rec { + pname = "hatch-jupyter-builder"; + version = "0.8.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "hatch-jupyter-builder"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ns5jrVfTAA7NuvUok3/13nIpXSSVZ6WRkgHyTuxkSKA="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + checkInputs = [ + hatch + pytest-mock + pytestCheckHook + tomli + twine + ]; + + disabledTests = [ + # tests pip install, which unsuprisingly fails + "test_hatch_build" + ]; + + meta = with lib; { + changelog = "https://github.com/jupyterlab/hatch-jupyter-builder/releases/tag/v${version}"; + description = "hatch plugin to help build Jupyter packages"; + homepage = "https://github.com/jupyterlab/hatch-jupyter-builder"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2e0a7d2f030..e376a310a0c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4187,6 +4187,8 @@ self: super: with self; { hatch-fancy-pypi-readme = callPackage ../development/python-modules/hatch-fancy-pypi-readme { }; + hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { }; From d41ca8be7b46794b80e9a0b9cf665be2267f0063 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 23:49:54 +0100 Subject: [PATCH 667/673] python3Packages.rfc3986-validator: init at 0.1.1 --- .../rfc3986-validator/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/rfc3986-validator/default.nix diff --git a/pkgs/development/python-modules/rfc3986-validator/default.nix b/pkgs/development/python-modules/rfc3986-validator/default.nix new file mode 100644 index 000000000000..793eb2f9fe22 --- /dev/null +++ b/pkgs/development/python-modules/rfc3986-validator/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, rfc3987 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rfc3986-validator"; + version = "0.1.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "rfc3986_validator"; + inherit version; + hash = "sha256-PUS955IbO57Drk463KNwQ47M68Z2RWRJsUXVM7JA0FU="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + + checkInputs = [ + hypothesis + pytestCheckHook + rfc3987 + ]; + + meta = with lib; { + description = "Pure python rfc3986 validator"; + homepage = "https://github.com/naimetti/rfc3986-validator"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e376a310a0c5..ad19b0a27071 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9876,6 +9876,8 @@ self: super: with self; { rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + rfc3986-validator = callPackage ../development/python-modules/rfc3986-validator { }; + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; rfc6555 = callPackage ../development/python-modules/rfc6555 { }; From 456cf812715ba11af7c7374171358b1cb2c7c619 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 23:53:12 +0100 Subject: [PATCH 668/673] python3Packages.jsonschema: Expose optional-dependencies --- .../python-modules/jsonschema/default.nix | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 833a76399edd..7ac7a40d32b0 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -11,6 +11,17 @@ , pythonOlder , twisted , typing-extensions + +# optionals +, fqdn +, idna +, isoduration +, jsonpointer +, rfc3339-validator +, rfc3986-validator +, rfc3987 +, uri-template +, webcolors }: buildPythonPackage rec { @@ -45,6 +56,29 @@ buildPythonPackage rec { importlib-resources ]; + passthru.optional-dependencies = { + format = [ + fqdn + idna + isoduration + jsonpointer + rfc3339-validator + rfc3987 + uri-template + webcolors + ]; + format-nongpl = [ + fqdn + idna + isoduration + jsonpointer + rfc3339-validator + rfc3986-validator + uri-template + webcolors + ]; + }; + checkInputs = [ twisted ]; From 77c31a20189bb222218af762ef2f1e1840ac0b7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Jan 2023 00:09:29 +0100 Subject: [PATCH 669/673] python3Packages.jupyter-events: init at 0.5.0 --- .../python-modules/jupyter-events/default.nix | 73 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/jupyter-events/default.nix diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix new file mode 100644 index 000000000000..0bdf4dbf5f78 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling + +# runtime +, jsonschema +, python-json-logger +, pyyaml +, traitlets + +# optionals +, click +, rich + +# tests +, pytest-asyncio +, pytest-console-scripts +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jupyter-events"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter_events"; + rev = "refs/tags/v${version}"; + hash = "sha256-ak5JNMitxMvXaHPmjMhB58y8Fy8N1oLtqNMNZ9lgpnM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + jsonschema + python-json-logger + pyyaml + traitlets + ] + ++ jsonschema.optional-dependencies.format + ++ jsonschema.optional-dependencies.format-nongpl; + + passthru.optional-dependencies = { + cli = [ + click + rich + ]; + }; + + checkInputs = [ + pytest-asyncio + pytest-console-scripts + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = '' + export PATH="$out/bin:$PATH" + ''; + + meta = with lib; { + changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; + description = "Configurable event system for Jupyter applications and extensions"; + homepage = "https://github.com/jupyter/jupyter_events"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad19b0a27071..cb4fe047eddd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4936,6 +4936,8 @@ self: super: with self; { jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyter-events = callPackage ../development/python-modules/jupyter-events { }; + jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { }; jupyter_server = callPackage ../development/python-modules/jupyter_server { }; From 6bf557fc682235614949ca833205d5b4de7774d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Jan 2023 00:25:47 +0100 Subject: [PATCH 670/673] python3Packages.jupyter-core: rename from jupyter_core --- pkgs/applications/editors/jupyter-kernels/octave/default.nix | 2 +- pkgs/applications/science/math/sage/sagelib.nix | 4 ++-- pkgs/development/python-modules/ilua/default.nix | 4 ++-- pkgs/development/python-modules/jupyter-client/default.nix | 4 ++-- .../python-modules/{jupyter_core => jupyter-core}/default.nix | 2 +- .../tests_respect_pythonpath.patch | 0 pkgs/development/python-modules/metakernel/default.nix | 4 ++-- pkgs/development/python-modules/nbclassic/default.nix | 4 ++-- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- pkgs/development/python-modules/nbformat/default.nix | 4 ++-- pkgs/development/python-modules/notebook/default.nix | 4 ++-- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- pkgs/development/python-modules/vega/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 15 files changed, 24 insertions(+), 23 deletions(-) rename pkgs/development/python-modules/{jupyter_core => jupyter-core}/default.nix (97%) rename pkgs/development/python-modules/{jupyter_core => jupyter-core}/tests_respect_pythonpath.patch (100%) diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index c5265aa255c2..cb814ddbc95a 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -20,7 +20,7 @@ in rec { launcher = runCommand "octave-kernel-launcher" { inherit octave; - python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel ps.metakernel kernel ]); nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 8f864d136928..143e5a2a22b3 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -49,7 +49,7 @@ , boost , singular , pip -, jupyter_core +, jupyter-core , sage-setup , libhomfly , libbraiding @@ -87,7 +87,7 @@ buildPythonPackage rec { nativeBuildInputs = [ iml perl - jupyter_core + jupyter-core pkg-config sage-setup pip # needed to query installed packages diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix index 5b5c129c2749..28bc7524fa9e 100644 --- a/pkgs/development/python-modules/ilua/default.nix +++ b/pkgs/development/python-modules/ilua/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , jupyter_console -, jupyter_core +, jupyter-core , pygments , termcolor , txzmq @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jupyter_console - jupyter_core + jupyter-core pygments termcolor txzmq diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 11c41677b5ac..23a1f35d2de8 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , entrypoints -, jupyter_core +, jupyter-core , hatchling , nest-asyncio , python-dateutil @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints - jupyter_core + jupyter-core nest-asyncio python-dateutil pyzmq diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix similarity index 97% rename from pkgs/development/python-modules/jupyter_core/default.nix rename to pkgs/development/python-modules/jupyter-core/default.nix index 1e540ff6a584..761db23a5ef8 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - pname = "jupyter_core"; + pname = "jupyter-core"; version = "5.1.1"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch similarity index 100% rename from pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch rename to pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index b7cecc3ba3da..748de6f67541 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -4,7 +4,7 @@ , hatchling , ipykernel , jedi -, jupyter_core +, jupyter-core , pexpect , pythonOlder }: @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel jedi - jupyter_core + jupyter-core pexpect ]; diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 7065191b1ad1..294898fc4a62 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -6,7 +6,7 @@ , ipython_genutils , jinja2 , jupyter-client -, jupyter_core +, jupyter-core , jupyter_server , nbconvert , nbformat @@ -42,7 +42,7 @@ buildPythonPackage rec { ipython_genutils jinja2 jupyter-client - jupyter_core + jupyter-core jupyter_server nbconvert nbformat diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 7f994b4682d8..79386e02740b 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -9,7 +9,7 @@ , importlib-metadata , ipywidgets , jinja2 -, jupyter_core +, jupyter-core , jupyterlab-pygments , lib , markupsafe @@ -66,7 +66,7 @@ in buildPythonPackage rec { bleach defusedxml jinja2 - jupyter_core + jupyter-core jupyterlab-pygments markupsafe mistune diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index c9c66ca33a64..a9dae6b06348 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -6,7 +6,7 @@ , hatch-nodejs-version , fastjsonschema , jsonschema -, jupyter_core +, jupyter-core , traitlets , pep440 , pytestCheckHook @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fastjsonschema jsonschema - jupyter_core + jupyter-core traitlets ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 4e16aa3bdd0f..33e2886606f8 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -12,7 +12,7 @@ , tornado , ipython_genutils , traitlets -, jupyter_core +, jupyter-core , jupyter-client , nbformat , nbconvert @@ -41,7 +41,7 @@ buildPythonPackage rec { ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); propagatedBuildInputs = [ - jinja2 tornado ipython_genutils traitlets jupyter_core send2trash + jinja2 tornado ipython_genutils traitlets jupyter-core send2trash jupyter-client nbformat nbconvert ipykernel terminado requests pexpect prometheus-client argon2-cffi ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 5c618b418931..6eb47d0fd5f1 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , ipykernel -, jupyter_core +, jupyter-core , jupyter-client , pygments , pyqt5 @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel - jupyter_core + jupyter-core jupyter-client pygments pyqt5 diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 9bc875963163..989a26c11d98 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage , fetchPypi, pythonOlder -, jupyter_core, pandas, ipywidgets, jupyter }: +, jupyter-core, pandas, ipywidgets, jupyter }: buildPythonPackage rec { pname = "vega"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80="; }; - propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; + propagatedBuildInputs = [ jupyter jupyter-core pandas ipywidgets ]; # currently, recommonmark is broken on python3 doCheck = false; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 697b6bca59bc..d69cabc379ea 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -107,6 +107,7 @@ mapAliases ({ itanium_demangler = itanium-demangler; # added 2022-1017 jinja2_time = jinja2-time; # added 2022-11-07 jupyter_client = jupyter-client; # added 2021-10-15 + jupyter_core = jupyter-core; # added 2023-01-05 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb4fe047eddd..f4f81c61ca9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4934,7 +4934,7 @@ self: super: with self; { jupyter_console = callPackage ../development/python-modules/jupyter_console { }; - jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyter-core = callPackage ../development/python-modules/jupyter-core { }; jupyter-events = callPackage ../development/python-modules/jupyter-events { }; From d97e53aeb0b677964a0b34a5f70ddb4010da6466 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Jan 2023 00:42:20 +0100 Subject: [PATCH 671/673] python3Packages.pytest-jupyter: init at 0.6.2 --- .../python-modules/pytest-jupyter/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-jupyter/default.nix diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix new file mode 100644 index 000000000000..39a9e7500e61 --- /dev/null +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling +, pytest + +# runtime +, jupyter-core + +# optionals +, jupyter-client +, ipykernel +, jupyter_server +, nbformat + +# tests +, pytest-timeout +, pytestCheckHook +}: + +let self = buildPythonPackage rec { + pname = "pytest-jupyter"; + version = "0.6.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "pytest-jupyter"; + rev = "refs/tags/v${version}"; + hash = "sha256-kY4QHrlj0opEBywe4SpwE4Ck6l6JIzEosx6uuXh+yCQ="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + jupyter-core + ]; + + passthru.optional-dependencies = rec { + client = [ + jupyter-client + ipykernel + ]; + server = [ + jupyter_server + nbformat + ] ++ client; + }; + + doCheck = false; # infinite recursion with jupyter-server + + checkInputs = [ + pytest-timeout + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + passthru.tests = { + check = self.overridePythonAttrs (_: { doCheck = false; }); + }; + + meta = with lib; { + changelog = "https://github.com/jupyter-server/pytest-jupyter/releases/tag/v${version}"; + description = "pytest plugin for testing Jupyter core libraries and extensions"; + homepage = "https://github.com/jupyter-server/pytest-jupyter"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4f81c61ca9b..abc96c8a36a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8935,6 +8935,8 @@ self: super: with self; { pytest-json-report = callPackage ../development/python-modules/pytest-json-report { }; + pytest-jupyter = callPackage ../development/python-modules/pytest-jupyter { }; + pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; From fdc2e9f4ce2eb72432e19d7784c072a15f6d65ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Jan 2023 00:44:53 +0100 Subject: [PATCH 672/673] python3Packages.jupyter-server-terminals: init at 0.4.3 --- .../jupyter-server-terminals/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/jupyter-server-terminals/default.nix diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix new file mode 100644 index 000000000000..dfd6dc3164e5 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling + +# runtime +, terminado + +# tests +, pytest-jupyter +, pytest-timeout +, pytestCheckHook +}: + +let self = buildPythonPackage rec { + pname = "jupyter-server-terminals"; + version = "0.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "jupyter_server_terminals"; + rev = "refs/tags/v${version}"; + hash = "sha256-swFMuKP/JIHJJ0zr3Dqv71Ne4WaP7GbzeNQ2tzEBpRU="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + terminado + ]; + + doCheck = false; # infinite recursion + + checkInputs = [ + pytest-jupyter + pytest-timeout + pytestCheckHook + ] ++ pytest-jupyter.optional-dependencies.server; + + passthru.tests = { + check = self.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + changelog = "https://github.com/jupyter-server/jupyter_server_terminals/releases/tag/v${version}"; + description = "A Jupyter Server Extension Providing Support for Terminals"; + homepage = "https://github.com/jupyter-server/jupyter_server_terminals"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abc96c8a36a5..26a7b67e2ed9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4942,6 +4942,9 @@ self: super: with self; { jupyter_server = callPackage ../development/python-modules/jupyter_server { }; + jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { }; + + jupyterhub = callPackage ../development/python-modules/jupyterhub { }; jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; From ea3e3d0d4be7da7283c812f8e5ed65cf648e9947 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Jan 2023 00:48:20 +0100 Subject: [PATCH 673/673] python3Packages.jupyter-server: Rename from jupyter_server --- pkgs/development/python-modules/jupyter-lsp/default.nix | 4 ++-- .../python-modules/jupyter-server-mathjax/default.nix | 4 ++-- .../{jupyter_server => jupyter-server}/default.nix | 5 +++-- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- .../development/python-modules/jupyterlab_server/default.nix | 4 ++-- pkgs/development/python-modules/nbclassic/default.nix | 4 ++-- pkgs/development/python-modules/notebook-shim/default.nix | 4 ++-- pkgs/development/python-modules/pytest-jupyter/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 10 files changed, 19 insertions(+), 17 deletions(-) rename pkgs/development/python-modules/{jupyter_server => jupyter-server}/default.nix (96%) diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index ffcde4a5b216..342e0233eb76 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonPackage , fetchPypi -, jupyter_server +, jupyter-server }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jupyter_server + jupyter-server ]; # tests require network doCheck = false; diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 73797f8fd0d8..b6201769f86b 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , jupyter-packaging -, jupyter_server +, jupyter-server , pytest-tornasync , pytestCheckHook }: @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jupyter_server + jupyter-server ]; checkInputs = [ diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix similarity index 96% rename from pkgs/development/python-modules/jupyter_server/default.nix rename to pkgs/development/python-modules/jupyter-server/default.nix index 7d948f7b52f1..5af8bbe7e248 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -34,13 +34,14 @@ }: buildPythonPackage rec { - pname = "jupyter_server"; + pname = "jupyter-server"; version = "2.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "jupyter_server"; + inherit version; hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8="; }; diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 666de2d89395..6fac2db61bd6 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , git -, jupyter_server +, jupyter-server , jupyter-packaging , jupyterlab , nbdime @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jupyter_server + jupyter-server nbdime git nbformat diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index b891d9e0e7ea..1aeeef157283 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -8,7 +8,7 @@ , pytestCheckHook , json5 , babel -, jupyter_server +, jupyter-server , tomli , openapi-core , pytest-timeout @@ -38,7 +38,7 @@ buildPythonPackage rec { jsonschema json5 babel - jupyter_server + jupyter-server tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 294898fc4a62..b2554c3f473a 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -7,7 +7,7 @@ , jinja2 , jupyter-client , jupyter-core -, jupyter_server +, jupyter-server , nbconvert , nbformat , nest-asyncio @@ -43,7 +43,7 @@ buildPythonPackage rec { jinja2 jupyter-client jupyter-core - jupyter_server + jupyter-server nbconvert nbformat nest-asyncio diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 4f606a415709..2ca5d0e44fa7 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, jupyter_server +, jupyter-server , pytestCheckHook , pytest-tornasync }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; }; - propagatedBuildInputs = [ jupyter_server ]; + propagatedBuildInputs = [ jupyter-server ]; preCheck = '' mv notebook_shim/conftest.py notebook_shim/tests diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 39a9e7500e61..def50bf46d65 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -12,7 +12,7 @@ # optionals , jupyter-client , ipykernel -, jupyter_server +, jupyter-server , nbformat # tests @@ -50,7 +50,7 @@ let self = buildPythonPackage rec { ipykernel ]; server = [ - jupyter_server + jupyter-server nbformat ] ++ client; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d69cabc379ea..ed7a8427484a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ jinja2_time = jinja2-time; # added 2022-11-07 jupyter_client = jupyter-client; # added 2021-10-15 jupyter_core = jupyter-core; # added 2023-01-05 + jupyter_server = jupyter-server; # added 2023-01-05 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26a7b67e2ed9..30ab7f4a0581 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4940,7 +4940,7 @@ self: super: with self; { jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { }; - jupyter_server = callPackage ../development/python-modules/jupyter_server { }; + jupyter-server = callPackage ../development/python-modules/jupyter-server { }; jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { };