From ba918de42906991dd65088294953f3dd0ea58fa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 03:41:57 +0200 Subject: [PATCH 001/314] python3Packages.setuptools: 60.8.2 -> 61.2.0 --- .../python-modules/setuptools/default.nix | 4 +- .../setuptools/setuptools-distutils-C++.patch | 72 +++++-------------- 2 files changed, 20 insertions(+), 56 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 6b18422cc18a..1d9592022d16 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 = "60.8.2"; + version = "61.2.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "1mqpmbn58rx3g24dm6wnllx0xs97ampn2yga3qypqgwnh1nk477i"; + hash = "sha256-Cgz3uA8U7A1lOZNuj1EYZVViZ3aL6VjcAno8GYQUufk="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch index a14e514fda7e..43601d8b6eb1 100644 --- a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch +++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -1,6 +1,3 @@ -Based on pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch, -adapted to apply to setuptools 60.x's bundled distutils. - diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py index c5c86d8f..b879e447 100644 --- a/setuptools/_distutils/cygwinccompiler.py @@ -57,7 +54,7 @@ index c5c86d8f..b879e447 100644 # Maybe we should also append -mthreads, but then the finished # dlls need another dll (mingwm10.dll see Mingw32 docs) diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index 4a77a431..1ad85181 100644 +index 9fad3835..889e2595 100644 --- a/setuptools/_distutils/sysconfig.py +++ b/setuptools/_distutils/sysconfig.py @@ -216,9 +216,11 @@ def customize_compiler(compiler): @@ -124,10 +121,10 @@ index 4a77a431..1ad85181 100644 if 'RANLIB' in os.environ and compiler.executables.get('ranlib', None): diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py -index a07e5988..576ef490 100644 +index 715408f5..6125a1eb 100644 --- a/setuptools/_distutils/unixccompiler.py +++ b/setuptools/_distutils/unixccompiler.py -@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): +@@ -110,14 +110,17 @@ class UnixCCompiler(CCompiler): # are pretty generic; they will probably have to be set by an outsider # (eg. using information discovered by the sysconfig about building # Python extensions). @@ -153,21 +150,17 @@ index a07e5988..576ef490 100644 } if sys.platform[:6] == "darwin": -@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler): - +@@ -169,9 +172,15 @@ class UnixCCompiler(CCompiler): def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) + compiler_so = compiler_fixup( + self.compiler_so, cc_args + extra_postargs) ++ compiler_so_cxx = compiler_fixup( ++ self.compiler_so_cxx, cc_args + extra_postargs) try: - self.spawn(compiler_so + cc_args + [src, '-o', obj] + - extra_postargs) + if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ self.spawn(compiler_so_cxx + cc_args + [ src, '-o', obj] + + extra_postargs) + else: + self.spawn(compiler_so + cc_args + [src, '-o', obj] + @@ -175,42 +168,13 @@ index a07e5988..576ef490 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler): - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i += 1 -- -- if os.path.basename(linker[i]) == 'ld_so_aix': -- # AIX platforms prefix the compiler with the ld_so_aix -- # script, so we need to adjust our linker index -- offset = 1 -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] - else: -- offset = 0 -- -- linker[i+offset] = self.compiler_cxx[i] -+ linker = self.linker_so[:] +@@ -233,7 +242,8 @@ class UnixCCompiler(CCompiler): + # building an executable or linker_so (with shared options) + # when building a shared library. + building_exe = target_desc == CCompiler.EXECUTABLE +- linker = (self.linker_exe if building_exe else self.linker_so)[:] ++ linker = (self.linker_exe if building_exe else (self.linker_so_cxx if ++ target_lang == "c++" else self.linker_so))[:] - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) + if target_lang == "c++" and self.compiler_cxx: + env, linker_ne = _split_env(linker) From c15748820bcc2d803869fdd577accd313f449ad8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 03:49:34 +0200 Subject: [PATCH 002/314] python3Packages.pytest: 7.0.1 -> 7.1.1 --- pkgs/development/python-modules/pytest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 109e91828588..38b94f270461 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.0.1"; + version = "7.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-4wkFoMEx09lLiWJKHMWv7D4LovvbFRhn2ODr1JhQ8XE="; + sha256 = "sha256-hBEyyu9rGtF6mv3kbcT2z6WaBflVWq5RUfc73yggymM="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -86,7 +86,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.0.1/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.1.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" From 309be9de6af0b5a43a8c296841cd67e497c927f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 03:51:41 +0200 Subject: [PATCH 003/314] python3Packages.pip: 22.0.3 -> 22.0.4 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index a4370fbaae57..239c91fb88ac 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.0.3"; + version = "22.0.4"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-Wu2QQfb0pehPLLa+za32C4jH1arkBKKc3jlAMRkDV5Q="; + sha256 = "sha256-gtDaopeFVpVFXpBtHDzBuZuXUrJciSSIppYXBx1anu4="; name = "${pname}-${version}-source"; }; From 0fb66db12e2af9f664986881a3b91c5b37de24ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 05:58:10 +0200 Subject: [PATCH 004/314] python3Packages.pytest-mock: pytest7 compatibility --- pkgs/development/python-modules/pytest-mock/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 94db409be918..837dec7c96d6 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pytest , pytest-asyncio @@ -16,6 +17,14 @@ buildPythonPackage rec { hash = "sha256-URK9ksyfGG7pbhqS78hJaepJSTnDrq05xQ9CHEzGlTQ="; }; + patches = [ + (fetchpatch { + # pytest7 compatbilitya + url = "https://github.com/pytest-dev/pytest-mock/commit/0577f1ad051fb8d0da94ea22dcb02346d74064b2.patch"; + hash = "sha256-eim4v7U8Mjigr462bXI0pKH/M0ANBzSRc0lT4RpbZ0w="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ From 343530760e835d29d3cd568cd82398875328a1da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 06:08:17 +0200 Subject: [PATCH 005/314] python3Packages.hypothesis: 6.38.0 -> 6.40.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 c928a13950ca..8eaa808563e6 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.38.0"; + version = "6.40.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "sha256-JLAM9gBf/Lh+UO7audy6V2jEPg5Cn4DR7moQV7VBwGc="; + hash = "sha256-6BC3CTotkMhguueH4NJM8VjbrYhofHqtZEUytcllMwQ="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From 1c0f606d0147346547927d4e04262e73aa04da8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 20:27:42 +0200 Subject: [PATCH 006/314] python3Packages.ndg-httpsclient: add missing pyasn1 dependency --- .../python-modules/ndg-httpsclient/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 0082b8e8db23..39429950b71c 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pyasn1 , pyopenssl }: @@ -8,8 +9,6 @@ buildPythonPackage rec { version = "0.5.1"; pname = "ndg-httpsclient"; - propagatedBuildInputs = [ pyopenssl ]; - src = fetchFromGitHub { owner = "cedadev"; repo = "ndg_httpsclient"; @@ -17,6 +16,12 @@ buildPythonPackage rec { sha256 = "0lhsgs4am4xyjssng5p0vkfwqncczj1dpa0vss4lrhzq86mnn5rz"; }; + + propagatedBuildInputs = [ + pyasn1 + pyopenssl + ]; + # uses networking doCheck = false; From 27b9ca3056c33b0ae9f0a360154ec52dcf869656 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Mar 2022 14:29:51 +0100 Subject: [PATCH 007/314] python3Packages.markupsafe: 2.1.0 -> 2.1.1 https://markupsafe.palletsprojects.com/en/2.1.x/changes/#version-2-1-1 --- pkgs/development/python-modules/markupsafe/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index b0f876ef3e8d..0c36299b1f12 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -7,13 +7,15 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.1.0"; - disabled = pythonOlder "3.6"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "MarkupSafe"; inherit version; - sha256 = "sha256-gL6vY937xkoEUrhB2ANsoGEeBJZQ4gr8uIL108Jm1l8="; + sha256 = "sha256-f5EZfMnkj5idEuTm+8RklcRGY238gbnM9Quw7HS5HUs="; }; checkInputs = [ From 07ceba0d6caa2a1ebfcd9b3ea622a42b7a889d39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Mar 2022 16:02:34 +0100 Subject: [PATCH 008/314] python3Packages.jinja2: 3.0.3 -> 3.1.1 https://github.com/pallets/jinja/releases/tag/3.1.0 https://github.com/pallets/jinja/releases/tag/3.1.1 --- pkgs/development/python-modules/jinja2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 7c9971b0c454..29b08df8e0fe 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "3.0.3"; - disabled = pythonOlder "3.6"; + version = "3.1.1"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"; + sha256 = "sha256-ZAvtS7UBy9FxlLPKzh3CEm9bYZzwaKcmuYGSoP3nSuk="; }; propagatedBuildInputs = [ From 967705f708cdace1986a5b23e7977950e82f5549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 16:49:35 +0200 Subject: [PATCH 009/314] python39Packages.click: 8.0.4 -> 8.1.0 --- pkgs/development/python-modules/click/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 5156ad1048fb..38110b27d786 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchPypi , importlib-metadata -, locale , pytestCheckHook # large-rebuild downstream dependencies @@ -17,18 +16,14 @@ buildPythonPackage rec { pname = "click"; - version = "8.0.4"; + version = "8.1.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hFjXsSh8X7EoyQ4jOBz5nc3nS+r2x/9jhM6E1v4JCts="; + sha256 = "sha256-l3whNHPHZl06oJK0H/EgYyJ3UcQdexcWUBPhAGnMXNI="; }; - postPatch = '' - substituteInPlace src/click/_unicodefun.py \ - --replace '"locale"' "'${locale}/bin/locale'" - ''; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; From 68de5c37ce4e70bcbbae2f9aeacbc3af1b91bd43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 29 Mar 2022 16:02:21 +0200 Subject: [PATCH 010/314] python3Packages.typer: patch for click 8.1.0 compat In 8.1.0 click removed the deprecated `get_terminal_size` function in favor of letting downstream projects import it from shutil. https://github.com/pallets/click/pull/2130 https://github.com/tiangolo/typer/pull/375 --- pkgs/development/python-modules/typer/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 17008eafc1ba..1f0bdb39202c 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , fetchPypi , click , pytestCheckHook @@ -25,6 +26,16 @@ buildPythonPackage rec { sha256 = "1pgm0zsylbmz1r96q4n3rfi0h3pn4jss2yfs83z0yxa90nmsxhv3"; }; + patches = [ + (fetchpatch { + # use get_terminal_size from shutil; click 8.1.0 compat + # https://github.com/tiangolo/typer/pull/375 + name = "typer-click-8.1-compat.patch"; + url = "https://github.com/tiangolo/typer/commit/b6efa2f8f40291fd80cf146b617e0ba305f6af3c.patch"; + hash = "sha256-m0EWpBUt5njoPsn043b30WdAQELYNn2ycHXBxZCYXZE="; + }) + ]; + propagatedBuildInputs = [ click ]; From a82860d6715bc35ff7eebd73ceb91b1ff571dc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 00:13:51 +0200 Subject: [PATCH 011/314] python39Packages.mock: remove no longer required dependencies, enable and fix tests, update homepage --- .../python-modules/mock/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 72e40d750ed1..464a6ae969d7 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -1,31 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, funcsigs -, six -, pbr +, fetchpatch , python +, pythonOlder , pytest }: buildPythonPackage rec { pname = "mock"; version = "4.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc"; }; - propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; - - # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. - # Mock upstream has a decoration to disable the failing test and make - # everything pass, but it is not yet released. The commit: - # https://github.com/testing-cabal/mock/commit/73bfd51b7185#diff-354f30a63fb0907d4ad57269548329e3L12 - #doCheck = !(python.isPyPy && python.isPy27); - doCheck = false; # Infinite recursion pytest + patches = [ + (fetchpatch { + url = "https://github.com/testing-cabal/mock/commit/f3e3d82aab0ede7e25273806dc0505574d85eae2.patch"; + sha256 = "sha256-wPrv1/WeICZHn31UqFlICFsny2knvn3+Xg8BZoaGbwQ="; + }) + ]; checkPhase = '' ${python.interpreter} -m unittest discover @@ -37,8 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mock objects for Python"; - homepage = "http://python-mock.sourceforge.net/"; + homepage = "https://github.com/testing-cabal/mock"; license = licenses.bsd2; }; - } From 77802b42c192e29465083e4eae4f17969631a116 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:15 +0200 Subject: [PATCH 012/314] python3Packages.aesara: 2.4.0 -> 2.5.3 --- pkgs/development/python-modules/aesara/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 3e2e9cb2cf37..58a39422a3a3 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.4.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "aesara-devs"; repo = "aesara"; - rev = "38d7a813646c1e350170c46bafade0e7d0e2427c"; - sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; + rev = "refs/tags/rel-${version}"; + sha256 = "sha256-20nc70gNdcGjtGxv2WxmYxmswNH8v7yGLkToP2iazjc="; }; nativeBuildInputs = [ From fe7a6d8a89fb8d396d79ebe01deb6f96f41b8548 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:15 +0200 Subject: [PATCH 013/314] python3Packages.afdko: 3.8.0 -> 3.8.1 --- pkgs/development/python-modules/afdko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 381e00cba466..bbf8d555b5ef 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.8.0"; + version = "3.8.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1404jdwyv16mri5jh6qly63nli2iw9yq2nn37h8iqvlbawfbjj0p"; + sha256 = "sha256-BaSpw7TiBymCvoP0/z1zynWKQJH/PjbbGf85ZI9LOZw="; }; format = "pyproject"; From 0bb8dcb5db187f781574ff320183db97f552b8a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:15 +0200 Subject: [PATCH 014/314] python3Packages.aiobotocore: 2.1.2 -> 2.2.0 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 01066c127be5..df800eb47552 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.1.2"; + version = "2.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AP1/Q8wEhNjtJ0/QvkkqoWp/6medvqlqYCu3IspMLSI="; + sha256 = "sha256-cTV5OcMCJnDXu5SDMZQUekTr/OJLFkPk5E/twe5zSbo="; }; # relax version constraints: aiobotocore works with newer botocore versions From 4b3d577558fc1b2bf65bfb712a23f598c6267fcb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:16 +0200 Subject: [PATCH 015/314] python3Packages.aioftp: 0.20.1 -> 0.21.0 --- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 83c5e986f099..56ac63bfc5fe 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.20.1"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6p3n5tNNQrbwHqGRXYNL4+cf31Blx2e9elxX6/wxj/4="; + sha256 = "sha256-TwORfChymaB4k5Q3CAPjsPaTXiQdjyi7s2fCN5qTT5I="; }; propagatedBuildInputs = [ From c626f499bae6807ea0b0ea3450ad85bc3c6f0993 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:16 +0200 Subject: [PATCH 016/314] python3Packages.alembic: 1.7.6 -> 1.7.7 --- 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 a82cd5e258ae..1a7487a25f78 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.7.6"; + version = "1.7.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bAwF6XaKiW2AQ4fiCymYgP4BvFZIQkaw3/6AddbT2Ec="; + sha256 = "sha256-SWEkgXPq186KIe+z3jePE7g5jmYw+rDrJY3HSoryTFg="; }; propagatedBuildInputs = [ From 0a6fd872709117ab566db1736b3955b7692a95f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:16 +0200 Subject: [PATCH 017/314] python3Packages.amqp: 5.0.9 -> 5.1.0 --- pkgs/development/python-modules/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index c23c1d012da4..d226192164d0 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "amqp"; - version = "5.0.9"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Hl9wdCTlRAeMoZbnKuahSIfOdOAr0Sa+VLfAPJcb7xg="; + hash = "sha256-RGs+io68LOr9Qk/8qrHDU4MNSBYSVleO16ZUSOYB6+0="; }; propagatedBuildInputs = [ From 7101eaafb163925c08670092388eab323608c2da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:16 +0200 Subject: [PATCH 018/314] python3Packages.asn1crypto: 1.4.0 -> 1.5.1 --- pkgs/development/python-modules/asn1crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 989b974c64a6..3c59c4b7cd2f 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "1.4.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c"; + sha256 = "sha256-E644UCvmMhFav4oky+X02lLjtSMZkK/zESPIBTBsy5w="; }; # No tests included From cf4064a4165db96b8b4040aec30ecae625d272c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:02:16 +0200 Subject: [PATCH 019/314] python3Packages.astropy: 5.0.1 -> 5.0.3 --- 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 6a61dd1009c6..56d0cc766ad0 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.0.1"; + version = "5.0.3"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-Y4LN5qIFqgsWoNXmHAwBMevU8BdNbHPilk9L7hMqkCc="; + sha256 = "sha256-GxZOxV63HH8Pil8zVDOcWkLWEpg1ayFOT7n/JWqGgUc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 6ae7bd3fbf8411d6e7650626b7d87f3a06ff4d4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:03 +0200 Subject: [PATCH 020/314] python3Packages.astroquery: 0.4.5 -> 0.4.6 --- pkgs/development/python-modules/astroquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index a022c80b16b9..6c1d39a82b01 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b"; + sha256 = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4="; }; disabled = !isPy3k; From 83866fb742adfffae72b536d584ad16763da8f7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:03 +0200 Subject: [PATCH 021/314] python3Packages.atom: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 80e29932ee2d..7db9bda39ee9 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "4055fbdeeb692d3d52c6e3c628d7513fc71f147920cac7d0da05b6dbb5ec8c8d"; + sha256 = "sha256-LnLyNaljNocqAKr85VhIxZqU3KIPAPWnQpazcdoNrXE="; }; buildInputs = [ cppy ]; From 533432a661a4420eaca5bc5127cd8d6fed414f9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:03 +0200 Subject: [PATCH 022/314] python3Packages.autobahn: 22.2.2 -> 22.3.2 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 285630db32e9..49f18ebca498 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "22.2.2"; + version = "22.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YOH0xgKqzQUv/j1GrkC2t1+ChrPEaSLCE7UjFi5YwX4="; + sha256 = "sha256-WKiHx6GWuwjYtmJMs2lfSTqeXJ8A/TUNjW+Cm0f/kDY="; }; propagatedBuildInputs = [ From c514a8492cdd8db1ee15d4de3a5960e8daad15ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:04 +0200 Subject: [PATCH 023/314] python3Packages.azure-core: 1.22.1 -> 1.23.0 --- 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 fbff37fad374..b11a81d148b7 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.22.1"; + version = "1.23.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-S25AUmijO4cxB3lklc7D8vGx/+k1Ykzg+93/NtONOk0="; + sha256 = "sha256-pWpvcg0JSNPz5KJaX+Rt8vG3+GXDWNdOLOR9u0kmJgg="; }; propagatedBuildInputs = [ From d9430e997368b4eb5ad6f6cdbf7afa8111d3d971 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:04 +0200 Subject: [PATCH 024/314] python3Packages.azure-mgmt-msi: 1.0.0 -> 6.0.0 --- pkgs/development/python-modules/azure-mgmt-msi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index bf81b5e67c72..1f1a2dde3762 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "1.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0n4gbwk843z66hhpcp1kcrnwqkzygbbc2ma01r9asgfv4nmklvyl"; + sha256 = "sha256-RpmYeF6LRKqu0KrjNAFAaOGxyfPuK+TImOumP+FPX2w="; }; propagatedBuildInputs = [ From e27adbaa3f61c9749b62065144beb0cdeab2995e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 025/314] python3Packages.bitarray: 2.4.0 -> 2.4.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 be7f69fbd8dc..d5806d77112d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8SA+kC1R3zGRfXfuupw/540DKHOirXjHN+JkIPAIDlg="; + sha256 = "sha256-+uygP5eemSzHb3QGr365eVyxEbjYlpyJGgMr10l8h9o="; }; checkPhase = '' From 5f4d14bc97cd102faed38ea22c7b6e481040f6a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 026/314] python3Packages.bitstruct: 8.12.1 -> 8.13.0 --- pkgs/development/python-modules/bitstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 78b34dfbf17c..050e3f27bf71 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.12.1"; + version = "8.13.0"; src = fetchPypi { inherit pname version; - sha256 = "45b2b932ce6681f5c6ce8cba39abdd423b579b0568c76fa48b1e09c88368ede7"; + sha256 = "sha256-e4fZ5B/1UqjK4G6iNow3crbzECvatLZeeTvnWQ1p8Ds="; }; meta = with lib; { From 8a692adf5a5855c9467bb48dae3234e6186919cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 027/314] python3Packages.boto3: 1.21.12 -> 1.21.30 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index d1a104f6ae9b..d849d49b64f8 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.21.12"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.21.30"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-yS7CCmcHIbWhvAE7MFqE2yt/nHFmU7MFbOfi+9KhgO8="; + sha256 = "sha256-8K+PTvX+Y1PHlM08zmJ9Rpphi1is58p1pjz9cZ32Fc4="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From c0d930dadb82faa87d2d39e33132fd8bb7f5db7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 028/314] python3Packages.botocore: 1.24.12 -> 1.24.30 --- 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 0c69de1c0e08..f42c7ea70abf 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.24.12"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.24.30"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-AXSZmgSwouQkVxBgk6zps2+pR3KkQtm89gdQJj0dBz4="; + sha256 = "sha256-r0vcUe7svp/c2tvtmtWMXJE4DvMPNWACK7wu4dePCtY="; }; propagatedBuildInputs = [ From 901a75d2d9a894b228c3aa72df4f99c13ccb1530 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 029/314] python3Packages.boxx: 0.9.10 -> 0.9.11 --- pkgs/development/python-modules/boxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index dd521523179f..964bf2dd8127 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.9.10"; + version = "0.9.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Iw6jRhKAroqfWmbXhD7YTn4s8FrE/Iyd31EOP0tMdkQ="; + sha256 = "sha256-xB/bCSIzT0JF5ZPWqSn3P8soBJnzDTfCyan+iOrfWzw="; }; propagatedBuildInputs = [ From 744b46dd661bf8927118b80560ee8514788ebe30 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 030/314] buildbot: 3.4.1 -> 3.5.0 --- .../python-modules/buildbot/default.nix | 4 +- .../python-modules/buildbot/pkg.nix | 2 +- .../python-modules/buildbot/plugins.nix | 10 ++-- .../python-modules/buildbot/worker.nix | 48 ++++++++++++++++--- 4 files changed, 49 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 5190c1fa74f4..743c9f2c4b11 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ="; + sha256 = "sha256-woGHdCan5qTp00toNkWa821EgVQMrPK+OWXoqFcgIDQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index a35506c89b8d..a2cffd739d1a 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc="; + sha256 = "sha256-CYbMixfZZ1xypV0J7TW54n/fja9RGMlWiF7StJYFnqM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 5b64f4c51ab9..62aa51e053dc 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o="; + sha256 = "sha256-boa/MWi/HAhNU3/n96i0fuoQ+jT5I+dWoe1Zd7f/Yvs="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg="; + sha256 = "sha256-NUDTwgkQuasOlJxNTlvfIm99LNVCrRIdBmgeJnwkSU8="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI="; + sha256 = "sha256-EmiIDCG4iFIwFnwii8fjII7C7wsBifzeZeW7HyY04dE="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI="; + sha256 = "sha256-QcS8QJ17uzDvkynTczj05LojuIT6feGiQNCwCESbVLw="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc="; + sha256 = "sha256-U9ecRxpDowzjD4GsrW4FUHcbNaWeAFGKDlqMrbIoTrQ="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 97a3eec770bd..8c5319868ce5 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,5 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, - future, coreutils, nixosTests }: +{ lib +, buildPythonPackage +, fetchPypi +, buildbot + +# patch +, coreutils + +# propagates +, autobahn +, future +, msgpack +, twisted + +# tests +, mock +, parameterized +, psutil +, setuptoolsTrial + +# passthru +, nixosTests +}: buildPythonPackage (rec { pname = "buildbot-worker"; @@ -7,18 +28,31 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg="; + sha256 = "sha256-HZH3TdH5dhr3f6ev25O3SgPPNbiFGMmAp9DHwcb/2MA="; }; - propagatedBuildInputs = [ twisted future ]; - - checkInputs = [ setuptoolsTrial mock ]; - postPatch = '' substituteInPlace buildbot_worker/scripts/logwatcher.py \ --replace /usr/bin/tail "${coreutils}/bin/tail" ''; + nativeBuildInputs = [ + setuptoolsTrial + ]; + + propagatedBuildInputs = [ + autobahn + future + msgpack + twisted + ]; + + checkInputs = [ + mock + parameterized + psutil + ]; + passthru.tests = { smoke-test = nixosTests.buildbot; }; From 06c341ee28f39ed4c4acbcb6310b6d7ad847cd38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 031/314] python3Packages.ckcc-protocol: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/ckcc-protocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 670e4a3c9237..e2a8ebd97768 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.3.0"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM="; + sha256 = "sha256-5wsVg7GX/9UygzpGI6DwrkAvexgcOmJyuv8GXiPPWvk="; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; From 2316f499f4c1a75c01bf407fe31aac1a321f4cd8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:05 +0200 Subject: [PATCH 032/314] python3Packages.click: 8.1.0 -> 8.1.1 --- pkgs/development/python-modules/click/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 38110b27d786..b780fc017bac 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "click"; - version = "8.1.0"; + version = "8.1.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-l3whNHPHZl06oJK0H/EgYyJ3UcQdexcWUBPhAGnMXNI="; + sha256 = "sha256-erkA44FJyYcjduj5tZht3K9owPQTz3NnigvKVUfm+XY="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ From 1c5dfeb713a2e0f8b47cf9b559c31598ade9d692 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:06 +0200 Subject: [PATCH 033/314] python3Packages.click-log: 0.3.2 -> 0.4.0 --- pkgs/development/python-modules/click-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 3145d4775e39..c0b8c89ea648 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click-log"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124"; + sha256 = "sha256-OXD4VwrFRJEje82z2KtePu9sBX3yn4w9EVGlGpwjuXU="; }; propagatedBuildInputs = [ click ]; From 9444e74d04c69116530e6a1462a45af8a4a809f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:06 +0200 Subject: [PATCH 034/314] python3Packages.cppy: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/cppy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix index ceb30a2c235f..5b7e092c42a5 100644 --- a/pkgs/development/python-modules/cppy/default.nix +++ b/pkgs/development/python-modules/cppy/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cppy"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-leiGLk+CbD8qa3tlgzOxYvgMvp+UOqDQp6ay74UK7/w="; + sha256 = "sha256-g7Q78XsQhawVxd69tCFU8Ti5KCNLIURzWJgfadDW/hs="; }; nativeBuildInputs = [ From 7413e9a91c219d07a0f847bfdb709a939c269411 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:06 +0200 Subject: [PATCH 035/314] python3Packages.debtcollector: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/debtcollector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index 1915b64aca80..ced1929bcd7a 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "debtcollector"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G8A+LZAX3kgMQc8+Wg2MyV8bDI8TOSgbTsqKIqz3aiM="; + sha256 = "sha256-3J0a0/dFxD9LvtvKMPn/6JBajAKMmSbmEHeEfV6iV6s="; }; nativeBuildInputs = [ pbr ]; From a9e82fa16f606098717a3e9befed678625e4bed9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:06 +0200 Subject: [PATCH 036/314] python3Packages.django-modelcluster: 5.2 -> 6.0 --- .../python-modules/django_modelcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index fc0d0e0921b4..989f9f9981b0 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.2"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "e541a46a0a899ef4778a4708be22e71cac3efacc09a6ff44bc065c5c9194c054"; + sha256 = "sha256-zc/+9br103We4ExbYP+vGgyV/A8mXnYvPd+t3jOU5ds="; }; disabled = pythonOlder "3.5"; From a9659a42dd7b4fe28696de55f70870f9a41c401b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 037/314] python3Packages.docutils: 0.17.1 -> 0.18.1 --- pkgs/development/python-modules/docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 529a09d3f046..3cd680e062f0 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.17.1"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"; + sha256 = "sha256-Z5mHyvNhp1OdduWEy+3cMR467pN4d8hzRvMd68Y+nQY="; }; # Only Darwin needs LANG, but we could set it in general. From 5bf5d3e0e73e0fa7a6f8a67141e04019cb7df5cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 038/314] python3Packages.faker: 13.3.0 -> 13.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 728339621f89..7ca49a484342 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 = "13.3.0"; + version = "13.3.4"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-YYsUDHdHV4bb46VAmtU1Ict2dGq3pcd7mcZj8+8bG8I="; + hash = "sha256-GIlhBl+1x46mOfQhdvVRAPcskMOjF5rGyVXEvXErBRE="; }; propagatedBuildInputs = [ From 11ee62bd92b5fd6b2c6daaf4524599cb86d6afff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 039/314] python3Packages.falcon: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/falcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 5dba22d83912..7e6179fd5abf 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "falcon"; - version = "3.0.1"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xB2E2zJYgahw6LcSnV7P2XL6QyPPd7cRmh0qIZZu5oE="; + sha256 = "sha256-8nYL0YwWOTpvteVfNx9nkh7bcv6+aTqCs8XoIZXQh7c="; }; checkInputs = [ From e10363107553b59094db9137e3f021db12501a6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 040/314] python3Packages.findpython: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/findpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index ad35f379b906..877637344d49 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.1.3"; + version = "0.1.4"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-tVpBa5/PLShyG/vqHOsqbLZ6APmexLlKdtoix6IAKHA="; + hash = "sha256-TOGYRUaW7lOcp5kNTq3NBHHKXvA7XE7y+SWJGsZPgok="; }; nativeBuildInputs = [ From 3caf52bdc1141f4bd33e69abebaaa316e6e23186 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 041/314] python3Packages.Flask: 2.0.3 -> 2.1.1 --- pkgs/development/python-modules/flask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 6b49d2d2a6ee..86da25173ca5 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { - version = "2.0.3"; + version = "2.1.1"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + sha256 = "sha256-qMm9PlWOyZZG0Xepc5xB3x3tBilIC0yNKXVBLzyVGcg="; }; propagatedBuildInputs = [ From 648f6d8768079efa704582079726f96a89a76c92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 042/314] python3Packages.flask-login: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/flask-login/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 3c7058c1212d..62eb3287f8c7 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-login"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Login"; inherit version; - sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b"; + sha256 = "sha256-qoT8+0w88JyljAjoFre85z8TSboc8T0A2N/8WHLV/PY="; }; propagatedBuildInputs = [ From 717ce52f4a71d1dd153f1a0e32248d8cf4f032a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 043/314] python3Packages.flask-talisman: 0.8.1 -> 1.0.0 --- pkgs/development/python-modules/flask-talisman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-talisman/default.nix b/pkgs/development/python-modules/flask-talisman/default.nix index b57d58824705..82f3e09b4794 100644 --- a/pkgs/development/python-modules/flask-talisman/default.nix +++ b/pkgs/development/python-modules/flask-talisman/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "flask-talisman"; - version = "0.8.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "11gjgqkpj2yqydb0pfhjyx56iy4l9szgz33vg5d7bw8vqp02wl2x"; + sha256 = "sha256-IF0958Xs+tZnyEEj9fvlgLH2jNmhsFjXNTzANI4Vsb8="; }; buildInputs = [ From 9707ca6076b59669f021ef1ad41feb451efafe25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 044/314] python3Packages.GeoAlchemy2: 0.10.2 -> 0.11.1 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 15ba87400e33..8457d74a4811 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.10.2"; + version = "0.11.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3db833746e11bc802b754751ec94eaab81009a9ad8fe647d461fe76d1a47a3fd"; + sha256 = "sha256-+SoPrdtbdDhNu/PHAAQzNYzo4HoYD+HWwoQ+qgQ3/wg="; }; nativeBuildInputs = [ From c6e1c1d21d367ccfda665214fc3d6194dadb4f2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:07 +0200 Subject: [PATCH 045/314] python3Packages.google-api-core: 2.5.0 -> 2.7.1 --- pkgs/development/python-modules/google-api-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 468b2476de9b..b5a9bfea212f 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.5.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8zhjpnCWUXA7ixi2cJNRSDjHnysE0CqlASAwefJLgBg="; + sha256 = "sha256-sPpXflEvDI4GM4a5dHGLhhRYanmMWJTtNL7fJW2driQ="; }; propagatedBuildInputs = [ From a103a0073ee37ae4910b3323ba2068f3e24ac32b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:08 +0200 Subject: [PATCH 046/314] python3Packages.google-api-python-client: 2.39.0 -> 2.42.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 493bda2f9d5c..bce1897eac56 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.39.0"; + version = "2.42.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QBFpIV7K+1r7aD0/4OQ8BZ62Jccf6hkp8WQD3acqLcE="; + sha256 = "sha256-e/WLZltjXQattHeXqaT3NILnOeAu0DbNlg3HwYM2H2c="; }; propagatedBuildInputs = [ From 63d7b116b662019c225f27cb18e43f4a6e2cbc6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:08 +0200 Subject: [PATCH 047/314] python3Packages.google-cloud-bigquery: 2.34.2 -> 3.0.1 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 86ac3048e0ab..e6b2ba11f676 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.34.2"; + version = "3.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8="; + sha256 = "sha256-UmW6BEV44Ucdg/hUGSQk/kyDnB+Hsyx4q3AXTQe89hI="; }; propagatedBuildInputs = [ From b8ceeba7ef81fc7313d5026b6027ff282bdb472c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:08 +0200 Subject: [PATCH 048/314] python3Packages.grpcio-status: 1.44.0 -> 1.45.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index fc069dccbaf7..173353fc9f2f 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.44.0"; + version = "1.45.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rGE6t6RTgMv6PlKQItCzcxfYWPFyum5lwYiqc1VTk5g="; + sha256 = "sha256-S6rY6Ow8RHiOA4wk49fccCWeBroJ9ApbgXhThWO6Plo="; }; propagatedBuildInputs = [ From c0634534b06a039d2dcef7370dcd48465174a56a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:08 +0200 Subject: [PATCH 049/314] python3Packages.grpcio-tools: 1.44.0 -> 1.45.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index c428be643075..b3794e8b9d43 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.44.0"; + version = "1.45.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vjf0WOpRDJqPHKq7wrJY0S5V0YmlZ/Xtys6Q8n3A778="; + sha256 = "sha256-oBbPwh4NkbOwNtPU+WjR/eqGXfoDUkyx++yoRxn9RaI="; }; outputs = [ "out" "dev" ]; From 65f811314e6a97e5843dcde983b0765e1119ef28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:08 +0200 Subject: [PATCH 050/314] python3Packages.hidapi: 0.11.0.post2 -> 0.11.2 --- pkgs/development/python-modules/hidapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index cf54198b18b3..b77dcaaa9d37 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.11.0.post2"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "da815e0d1d4b2ef1ebbcc85034572105dca29627eb61881337aa39010f2ef8cb"; + sha256 = "sha256-yYS37C/C6ph81EzwaUflVXJJjtLUPGSJC0q1iymvcrw="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; From f8d5ca62cfb2ee481499d044d86669b73efe5ffa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:08 +0200 Subject: [PATCH 051/314] python3Packages.importlib-metadata: 4.11.2 -> 4.11.3 --- .../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 31181d9b1afe..26612ff924e6 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.11.2"; + version = "4.11.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-s2/6kl/jE5svb/EdaSX/1Pp7xHhwFl46wmCse0+R5qw="; + hash = "sha256-6kxZfr83FC+Ce485KZV54xaFwx06Q4tZ9GlAav0PJTk="; }; nativeBuildInputs = [ From b325b6fee0d46528d4ff4ac408e3344a2a245cad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 052/314] python3Packages.importlib-resources: 5.4.0 -> 5.6.0 --- .../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 b28932a74f05..869762bec85e 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.4.0"; + version = "5.6.0"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-11bi+F3U3iuom+CyHboqO77C6HGkKjoWcZJYoR+HUGs="; + sha256 = "sha256-G5MjjL8jtM3jQkDdgyHZnpvy60vJHAyZsohig+e6rYU="; }; nativeBuildInputs = [ From a282bc0c67153c25a96ae315974ceae0e9b00bf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 053/314] python3Packages.intbitset: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/intbitset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 798bdbbd2519..9cedf7c4d284 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "intbitset"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tDG3CAlTZvz9Pi2pLq0TEPhl3DyYuWQS1N6VNNNokEE="; + sha256 = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; }; checkInputs = [ From 0b00edb9f6d2a254f8b7c7d1c2ce4f5eaadc4e21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 054/314] python3Packages.intensity-normalization: 2.2.0 -> 2.2.3 --- .../python-modules/intensity-normalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 5e658953fc80..86bc21c488de 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.2.0"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "intensity_normalization"; inherit version; - sha256 = "sha256-0tc21NBj3Cajklk9mWbKfBzbSwjUrBWs/SlakjEHC1U="; + sha256 = "sha256-Yjd4hXmbT87xNKSqc6zkKNisOVhQzQAUZI5wBiI/UBk="; }; propagatedBuildInputs = [ From 8e107ec04e166725f373e194f750c2ca365fe3f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 055/314] python3Packages.ipykernel: 6.9.1 -> 6.10.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index fe67c73cbadd..499e23c3b64a 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.9.1"; + version = "6.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+VBwot/TFH+KsZ8Y7kZzMxCBN1hZN0XgfsGPsItAnx0="; + sha256 = "sha256-0cfZLa6l2bVaM+Uj1NF8Ca044N8XpODtL6XJfwfyALo="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 From 0e975adc51c4e7c4f2ad16d42955f00056b10096 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 056/314] python3Packages.ipython: 8.1.0 -> 8.2.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 24fd28a16f7c..4d2e54827fe9 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.1.0"; + version = "8.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QsI+kLLequYxJmiF3hZWpRehZz1+HbV+jrOku2zVzhs="; + sha256 = "sha256-cOXrEyysWUo0tfeZvSUliQCZBfBRBHKK6mpAPsJRncE="; }; buildInputs = [ From 541669b9b348181c846a20869590495a37ac8445 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 057/314] python3Packages.ipywidgets: 7.6.5 -> 7.7.0 --- 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 c324eea947da..b33ec2759b56 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.6.5"; + version = "7.7.0"; src = fetchPypi { inherit pname version; - sha256 = "00974f7cb4d5f8d494c19810fedb9fa9b64bffd3cda7c2be23c133a1ad3c99c5"; + sha256 = "sha256-q0pVloVaiLg3YZIcdocH1l5YRwaBObwXKd3+g0cDVCo="; }; # Tests are not distributed From 10919f3444ad7a8fc7d6c0eefbb6bb34e9c39041 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 058/314] python3Packages.islpy: 2022.1.1 -> 2022.1.2 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 67b547b724ea..b37a2b55b2dc 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2022.1.1"; + version = "2022.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eWNc1xxOqEmPdSC1Ha6tfM8ofgkudfOGjvp3ZyM4pxE="; + sha256 = "sha256-Z0LXmbQeCyBPP0mtnt+UFyi08tcfP9XLZUS8jzkrADo="; }; postConfigure = '' From f6ca96c797896ee7602e654ac44bc66b14348726 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 059/314] python3Packages.iterm2: 1.30 -> 2.1 --- 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 1cba03531b5b..1742fc08e1e4 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 = "1.30"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "148b32a593f3d932a33daad01fdaa4639918eca74a6e153d9729dd8b3cba3345"; + sha256 = "sha256-oEXDW+ar3S0gJn2DdaOyq6GDE9dJaghQEpPBCfTL2Kw="; }; propagatedBuildInputs = [ protobuf websockets ]; From 5c91b18076adc45032ae7a24669324acea57f791 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:09 +0200 Subject: [PATCH 060/314] python3Packages.itsdangerous: 2.1.0 -> 2.1.2 --- pkgs/development/python-modules/itsdangerous/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index c2050c6f79c0..99bdb965235c 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "itsdangerous"; - version = "2.1.0"; + version = "2.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2Ej8uLx9UHxFRrRIV06KRPxOorqE6/jXgykNU+gZkvU="; + sha256 = "sha256-XbvGizF+XkLzJ/kCF2NUXcP8O/4i5t65aq8fw4h0FWo="; }; checkInputs = [ From 177c6f04bf7fcbecdefe3e9a2a6b01ae31d18f9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 061/314] python3Packages.jmespath: 0.10.0 -> 1.0.0 --- pkgs/development/python-modules/jmespath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 3f74ae8d810e..18c2f46216f2 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jmespath"; - version = "0.10.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"; + sha256 = "sha256-pJDigO3R9X1t6IY2mS0Ftx6X1pomoZ8Fjs99MER0v14="; }; buildInputs = [ nose ]; From 85cfb2e9e403fc9d57b9dab28f041b9dbfe2ce97 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 062/314] python3Packages.josepy: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/josepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 036b60e9eca2..100228bf4f14 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25"; + sha256 = "sha256-iTHa84+KTIUnSg6LfLJa3f2NHyj5+4++0FPdUa7HXck="; }; propagatedBuildInputs = [ From cfe33ec7ad41517298f017f7d43842ea71a9df20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 063/314] python3Packages.jupyter_client: 7.1.2 -> 7.2.1 --- pkgs/development/python-modules/jupyter-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 23580f42bf57..2670fc163f6c 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.1.2"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TqYQM3Jsjlee21VibY7i5r8KgxWN3zdRuN1GssXNHpY="; + sha256 = "sha256-qhdyeekyBdBoHsDi4hDaAbIsWhRkpWq9RVrcrGTw3pE="; }; propagatedBuildInputs = [ From e062d2ae6a6ad116e292d0ad729c3a2938b45514 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 064/314] python3Packages.jupyter_console: 6.4.0 -> 6.4.3 --- pkgs/development/python-modules/jupyter_console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 9716fbe8e5d7..5a3176b462c6 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.4.0"; + version = "6.4.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "242248e1685039cd8bff2c2ecb7ce6c1546eb50ee3b08519729e6e881aec19c7"; + sha256 = "sha256-VfMmJrC+ZHqF4yF93Nsi22nvx56LQDuXceuezGlgGbU="; }; propagatedBuildInputs = [ From fb57e5f725cc05c7c71e2ae35ef032d8ba74527b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 065/314] python3Packages.jupyterlab-git: 0.34.2 -> 0.36.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 dc909f798daf..9f36e03d4885 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.34.2"; + version = "0.36.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-WNBhuHF3rhAWZED4di9B9Loq+shRzpJuaAOOcND1YEE="; + sha256 = "sha256-K+h1ra9PsqKlSSPnc1jgSODICv3FoEdwqBGYWQYs6wE="; }; nativeBuildInputs = [ From efcdb7966b0e69e00006fb3220a5144974eda384 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 066/314] python3Packages.jupyterlab_server: 2.10.3 -> 2.12.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 ed0fe4bca2d7..bcd06ebffb39 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.10.3"; + version = "2.12.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3fb84a5813d6d836ceda773fb2d4e9ef3c7944dbc1b45a8d59d98641a80de80a"; + sha256 = "sha256-AOD0tMOZ9Vk4Mj6hDPktkVKI/hJ1PjXRBp9soItyq78="; }; postPatch = '' From cbea6172572e7d5c700a34a5951a30ce291734b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 067/314] python3Packages.jupyter-packaging: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/jupyter-packaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index f3fd7747ff86..bb2837d28fc8 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.11.1"; + version = "0.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec"; + sha256 = "sha256-snRV1grck6e6ouC484a+gbkyu048ARYEbfntIwzT+qw="; }; propagatedBuildInputs = [ deprecation packaging tomlkit ]; From 86811be3e2303a0158aa52010a7df2475f61caa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:10 +0200 Subject: [PATCH 068/314] python3Packages.kivy-garden: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/kivy-garden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kivy-garden/default.nix b/pkgs/development/python-modules/kivy-garden/default.nix index edfad0c9b91d..97f55aa94b02 100644 --- a/pkgs/development/python-modules/kivy-garden/default.nix +++ b/pkgs/development/python-modules/kivy-garden/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "kivy-garden"; - version = "0.1.4"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "0wkcpr2zc1q5jb0bi7v2dgc0vs5h1y7j42mviyh764j2i0kz8mn2"; + sha256 = "sha256-K4N3N46HUB1dJx8z2U8ORMCJiEVyxk+JydYJsfhqJ0g="; }; propagatedBuildInputs = [ requests ]; From 9abc2f01cbe6213721e84697b73ca28a649857b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:11 +0200 Subject: [PATCH 069/314] python3Packages.limits: 2.3.3 -> 2.4.0 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 47738b23dc41..7cb622df047e 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "2.3.3"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1CcNKVkcxezqsZvgU0VaTmGbo5UGJQK94rVoGvfcG+g="; + sha256 = "sha256-jiK2PfJjECB6d7db1HRZnwpGE6fZFjZQ7TpCjpzHrjU="; }; propagatedBuildInputs = [ six ]; From 69b07e0c00b8fddc274f41f2cd5119fa35371953 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:11 +0200 Subject: [PATCH 070/314] python3Packages.mailchecker: 4.1.13 -> 4.1.14 --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index ab609b597a4e..c877f528ac97 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.13"; + version = "4.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4ez18K9ksVGjzspHHcw/Ja6hxoKTkYLBFn65m7VBWYk="; + hash = "sha256-58LwaVwYzjYlIB3sAkMDat1FX8wA7IiAYBwPZ0hMOdE="; }; # Module has no tests From 02fed6bda5c37a598f6c70c4c1247d7282a7d165 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:11 +0200 Subject: [PATCH 071/314] python3Packages.Mako: 1.1.6 -> 1.2.0 --- 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 4c16861823fd..9730ba788711 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.6"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2"; + sha256 = "sha256-mnx+kiuH2zaGIQz0nV12cDOkHUAQsoTnR2gskr3dizk="; }; propagatedBuildInputs = [ markupsafe ]; From 1b2e02eb5197c957c431f85b2f74c08e965cdf81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:11 +0200 Subject: [PATCH 072/314] python3Packages.marshmallow-sqlalchemy: 0.27.0 -> 0.28.0 --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 9887f42bd8f3..e7921a29f54a 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.27.0"; + version = "0.28.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1521b129564444648c523a38f6446c137f1aae5c9c7de1ec151d5ebf03fd407d"; + sha256 = "sha256-+2sGaG84/sLqDsU6XuSXkhlAnisiYPm8keS0MQXRl4I="; }; propagatedBuildInputs = [ From 422d3bba01fb11492a323066ecc5dd15130ca517 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:11 +0200 Subject: [PATCH 073/314] python3Packages.mccabe: 0.6.1 -> 0.7.0 --- pkgs/development/python-modules/mccabe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index f20cb18b4885..8225da409444 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mccabe"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; + sha256 = "sha256-NI4CQMM7YLvfTlIxku+RnyjLLD19XHeU90AJKQ8jYyU="; }; buildInputs = [ pytest pytest-runner ]; From fc3ee8a65705404c1ddc0c45494b45cab227930c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:11 +0200 Subject: [PATCH 074/314] python3Packages.metakernel: 0.28.2 -> 0.29.0 --- pkgs/development/python-modules/metakernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index f94ddb12ac5d..417b4d914e63 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.28.2"; + version = "0.29.0"; src = fetchPypi { inherit pname version; - sha256 = "8811a4497444495639ef000902f4c6e8a7e2c57da1d47a8a24bcc9083548b389"; + sha256 = "sha256-+B8ywp7q42g8H+BPFK+D1VyLfyqgnrYIN3ai/mdcwcA="; }; propagatedBuildInputs = [ ipykernel ]; From b9045e13bd12ba58480f0a0939fe11f76a9643de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:11 +0200 Subject: [PATCH 075/314] python3Packages.moto: 3.0.5 -> 3.1.3 --- pkgs/development/python-modules/moto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index f920a06488a3..857b580f980d 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "moto"; - version = "3.0.5"; + version = "3.1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hfLs4K0DBaoTo5E5zmSKs6/hwEyzKsHbjV5ekRfU0Q4="; + sha256 = "sha256-+kgVlfVhHZ/r2vCg0Skwe1433mh2w30DXO7+Rs59isA="; }; propagatedBuildInputs = [ From f2433e69ca2323afe7b49ea7373f7595ee9b193f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 076/314] python3Packages.mypy-boto3-s3: 1.21.7 -> 1.21.27.post1 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 4f33912d3dfe..ecc040f080bb 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.21.7"; + version = "1.21.27.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SWzL6AMXoZzYw3LwrBdvbe9JzLMudZioKZWo7HtHM8U="; + hash = "sha256-LPc7ejocoSEtVaSW2Iye9EQiMrY4YU91bYSa4F3NRlg="; }; propagatedBuildInputs = [ From abf1f342344bde35701aa6d37b861fca9ef2e2ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 077/314] python3Packages.nbclient: 0.5.11 -> 0.5.13 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 52478ad4fd62..1b2071e7f0c5 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.11"; + version = "0.5.13"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dRUWmS80tYFyutVO7x5L9+T0Rg1Y4lXKGk5clklHYAc="; + sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g="; }; inherit doCheck; From bbb4844da0fa55bcf7dfa0d1dde03ed2e7a371c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 078/314] python3Packages.nbconvert: 6.4.2 -> 6.4.5 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 8604698cc2a2..224b4113136c 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.4.2"; + version = "6.4.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6ygD2xj2+szmvzsBtoT+R5B5lL0VbRXqzN8BHj1/gWQ="; + sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4="; }; # Add $out/share/jupyter to the list of paths that are used to search for From 3b9a5d6bffbea9fcd1e5d5c2e9754ffb40dcbed3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 079/314] python3Packages.nbformat: 5.1.3 -> 5.2.0 --- 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 a8e6993d6458..e110934fdd13 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.1.3"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8"; + sha256 = "sha256-k98LnGciHTj7lwxI9tNhgZpsOIKZoO8xcbu5Eu3+EyQ="; }; LC_ALL="en_US.utf8"; From 6d43a144e7ab8f1d5360becfad5bd1a50658d8c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 080/314] python3Packages.netmiko: 3.4.0 -> 4.0.0 --- pkgs/development/python-modules/netmiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 0934439f7473..3081b5a6b7cd 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "3.4.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "14s9c6ws32swizcmfdqmlkkk2yqw6071ybq3w94fhkl6jzfvkbdc"; + sha256 = "sha256-fVhBkiO1JpqMIFl32xlwSjeCd7aObocXPAr069fKdmc="; }; buildInputs = [ setuptools ]; From de9747ea71b8c63d38d0ca76ef6c79b46b1a2061 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 081/314] python3Packages.networkx: 2.7 -> 2.7.1 --- pkgs/development/python-modules/networkx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index c876c0d549dd..140eb9bb24c9 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.7"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7/t9nNXDbh4NM/QqOu9brd5QMFNYJqNn1c9gihcK9RU="; + sha256 = "sha256-0RlLp1Pl7tB83s0dI8XNejx3IJm9jb0v6jZniM9N57o="; }; propagatedBuildInputs = [ decorator setuptools ]; From 8a7fdd4a86b0dadb3c34880f14516cf6765c160f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 082/314] python3Packages.notebook: 6.4.8 -> 6.4.10 --- 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 586257a4f8db..3ead3cf4fe20 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.8"; + version = "6.4.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-Hphcncb2eL3/+53GVzBrVGm/pi1z4D906N77920oQxI="; + sha256 = "sha256-JAina8YokoOo7s/KZ+KY7IPGfbUaTC4bcT3RgLs56Q4="; }; LC_ALL = "en_US.utf8"; From a765c9fed6082110e536f2c67b63b71022b77224 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:12 +0200 Subject: [PATCH 083/314] python3Packages.numpydoc: 1.2 -> 1.2.1 --- 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 ea092d01dd42..9d0c1b09e20b 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.2"; + version = "1.2.1"; disabled = isPy27; src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-DOwjN0DGsSWRMAXRboqZluBgUor8uLfK0/JwZinf1vc="; + sha256 = "sha256-fOgm7Q1Uw/3JCXmSqNc6TUWdxGhhE1HGjkRP7ESkWvY="; }; checkInputs = [ nose pytest ]; From 09e51fd4faa05a154e9002f664e694f5e757d196 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:13 +0200 Subject: [PATCH 084/314] python3Packages.nunavut: 1.7.3 -> 1.7.5 --- pkgs/development/python-modules/nunavut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 5b974c9b6af2..fef36f87ab39 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.7.3"; + version = "1.7.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Tj3zCKDM4IBH9BKonhW9gPFD+lE3Q570Lxfm6b/d5JU="; + sha256 = "sha256-4wZfj2C6aUNqHaA00KiiXbKOMf/XBSD0N2+9c++e0K8="; }; propagatedBuildInputs = [ From b5b10d8270ca03bd57ae351bfc68cf5f65dc67ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:13 +0200 Subject: [PATCH 085/314] python3Packages.ovh: 0.5.0 -> 1.0.0 --- pkgs/development/python-modules/ovh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 305b03b4d144..74f341038b18 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "ovh"; - version = "0.5.0"; + version = "1.0.0"; # Needs yanc doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "f74d190c4bff0953d76124cb8ed319a8a999138720e42957f0db481ef4746ae8"; + sha256 = "sha256-IQzwu0gwfPNPOLQLCO99KL5Hu2094Y+acQBFXVGzHhU="; }; meta = { From bb6f995600d7874310282ab394ca7e7a255021fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:13 +0200 Subject: [PATCH 086/314] python3Packages.pdm-pep517: 0.11.2 -> 0.12.1 --- 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 5649e092634c..51e46400d678 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.11.2"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4AC6tDUCwZHXGAiiYw3UTs4wGjGdJuACocrqOnMHzSA="; + sha256 = "sha256-w/ms/ceDJjVijpQjUyDg9sGcvNkm6wQcRU+xJGO8dQQ="; }; preCheck = '' From 847e04b03a0db1a13da2faf0d59139fe20ec2f9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:13 +0200 Subject: [PATCH 087/314] python3Packages.phik: 0.12.0 -> 0.12.2 --- pkgs/development/python-modules/phik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index a7cb6e7e838e..2919fb5c733a 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "phik"; - version = "0.12.0"; + version = "0.12.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "959fd40482246e3f643cdac5ea04135b2c11a487e917af7d4e75843f47183549"; + sha256 = "sha256-sGdOuCnSMpBDP3GNI2ASK+gEsXDMyAetnZqNHBOYVTM="; }; checkInputs = [ From 4bc65503c6959509200013f67c6076f52726107e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:13 +0200 Subject: [PATCH 088/314] python3Packages.phonemizer: 3.0.1 -> 3.1.1 --- pkgs/development/python-modules/phonemizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 29f7266b6910..88bb69e9952f 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { pname = "phonemizer"; - version = "3.0.1"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1b4ea53b8da9a156361dff1d0c04ac1a8e65e6966d1cb9a8147c200960b32296"; + sha256 = "sha256-PWVK0NLVa0Rx1xyUyQF2/RvUo3/geskn53FcEv0Jr0c="; }; postPatch = '' From 23955a0d8e0e06b108cd52f6e320ff926cc2bae1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 089/314] python3Packages.prettytable: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 25d22c2c5a2f..7c4afe4a7284 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Q8niMnLKJT0Diudv463eiXlOkuf8qy3fW5SzhkLvTyE="; + sha256 = "sha256-rn2WxkEAVD3GFmK0CijzsDwPlKUD7RIcb8ongsWBb4E="; }; nativeBuildInputs = [ setuptools-scm ]; From de6326df5b45d9abf8feac2e03715145ad284eba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 090/314] python3Packages.py4j: 0.10.9.3 -> 0.10.9.5 --- pkgs/development/python-modules/py4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index cf24d21e17f5..cdf8a3c49c37 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.3"; + version = "0.10.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0d92844da4cb747155b9563c44fc322c9a1562b3ef0979ae692dbde732d784dd"; + sha256 = "sha256-J2pKPFohVN8YYO8zA6knRg4C6XsEfcCkfBw/uMzjTbY="; }; # No tests in archive From a9d0243d362cfe66d000d60fd677aee49ff13e6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 091/314] python3Packages.pybids: 0.14.0 -> 0.15.0 --- 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 3ad29916575a..4640be0c436d 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.14.0"; + version = "0.15.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "73c4d03aad333f2a7cb4405abe96f55a33cffa4b5a2d23fad6ac5767c45562ef"; + sha256 = "sha256-Eq+4x7h1uR5QHXfgCEZl+7usc9CBFQClvV36Yyrqbd0="; }; propagatedBuildInputs = [ From 6f4b3f26378a30230160c9d3b06170f66e1548d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 092/314] python3Packages.pycountry: 22.1.10 -> 22.3.5 --- pkgs/development/python-modules/pycountry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 560c5a708122..3583826f69a3 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "22.1.10"; + version = "22.3.5"; src = fetchPypi { inherit pname version; - sha256 = "b9a6d9cdbf53f81ccdf73f6f5de01b0d8493cab2213a230af3e34458de85ea32"; + sha256 = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY="; }; checkInputs = [ From 721c228dbfd50eac9ca4c11392d4f2b8d97c24fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 093/314] python3Packages.pyfakefs: 4.5.5 -> 4.5.6 --- 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 63bf4483911a..c3c6513f331c 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.5.5"; + version = "4.5.6"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iIIe2MJjJxu2alRBmoJZGqEH+yz9pC3I8hWOC+CIWQc="; + sha256 = "sha256-kU17+ZRAbPvv7gtNRZGPYMFbQGr+k/gZSoBNpaRQqCI="; }; postPatch = '' From 5b0c4c40db17261ea547c65749556cf007556bc5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 094/314] python3Packages.pygit2: 1.9.0 -> 1.9.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 47654ff34c6a..2d4deb16276b 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xehYisrV4y+gWVWCVxBZ5rkOx8SHxYtOU8KADcveRMg="; + sha256 = "sha256-72R5w7YZKCUxawVjNtt36/9ueEmusfu4i3YAGsM3uck="; }; preConfigure = lib.optionalString stdenv.isDarwin '' From dc2efaa38269359e3a0fc8dfaf8252788a74d023 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 095/314] python3Packages.pykerberos: 1.2.3.dev0 -> 1.2.4 --- pkgs/development/python-modules/pykerberos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index fd4c0088b08c..67246ffbb1ab 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykerberos"; - version = "1.2.3.dev0"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "17zjiw6rqgfic32px86qls1i3z7anp15dgb3sprbdvywy98alryn"; + sha256 = "sha256-nXAevY/FlsmdMVXVukWBO9WQjSbvg7oK3SUO22IqvtQ="; }; nativeBuildInputs = [ krb5 ]; # for krb5-config From 5935e1b17a76bf2d225c6f1c1fd84a1b0cfc8bb2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:14 +0200 Subject: [PATCH 096/314] python3Packages.pymc3: 3.11.4 -> 3.11.5 --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 7c1e46647e39..54a12481e116 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.11.4"; + version = "3.11.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f"; + sha256 = "sha256-M0HLvZYpCROLfV6+TtfP7in0Cy/nyt64iLOda7wXE4w="; }; # No need for coverage stats in Nix builds From f1ccbe42a0fd75dc9671d0a99522fbe069b26f50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:15 +0200 Subject: [PATCH 097/314] python3Packages.pyramid_jinja2: 2.8 -> 2.10 --- pkgs/development/python-modules/pyramid_jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index d1eaf49e6bc2..455f4fb73b6c 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyramid_jinja2"; - version = "2.8"; + version = "2.10"; src = fetchPypi { inherit pname version; - sha256 = "81e0615cb3108f2a251ff3141ad0d698a5d03685819f3a836ea84787e8489502"; + sha256 = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI="; }; buildInputs = [ webtest ]; From 260eba1563b7a46044cbbdc40b4945f08360edb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:15 +0200 Subject: [PATCH 098/314] python3Packages.pyro-ppl: 1.8.0 -> 1.8.1 --- 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 f810cf6f37b6..d4837dd9fb14 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -2,12 +2,12 @@ , graphviz, networkx, six, opt-einsum, tqdm, pyro-api }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.8.1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "68e4ea30f219227dd88e55de2550d3f8c20a20adbdb67ad1e13b50868bb2ac0c"; + sha256 = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY="; }; propagatedBuildInputs = [ From 6431b4212322a875708aeee3851286d3cfb71329 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:15 +0200 Subject: [PATCH 099/314] python3Packages.pytest-check: 1.0.4 -> 1.0.5 --- 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 3498b9f8ab94..c690e01778b6 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.0.4"; + version = "1.0.5"; format = "flit"; src = fetchPypi { pname = "pytest_check"; inherit version; - sha256 = "c93eee5a98bcd28634a4ec657ab62c46d25fa384300811e5a925d9c4d98b9540"; + sha256 = "sha256-ucjbax3uPB5mFivQebgcCDKWy3Ex6YQVGcKKQIGKSHU="; }; buildInputs = [ pytest ]; From 1aac3b7fe887412c491961152ee0a8d644467103 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:15 +0200 Subject: [PATCH 100/314] python3Packages.pytest-metadata: 1.11.0 -> 2.0.1 --- .../python-modules/pytest-metadata/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 9f04cbe407d3..057eb06ab3e0 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,13 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm }: +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pythonOlder +, setuptools-scm +}: buildPythonPackage rec { pname = "pytest-metadata"; - version = "1.11.0"; + version = "2.0.1"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1"; + sha256 = "sha256-XNtq7qi6kQkYHPnxScijrhQw/35EUGqPhmr4qYykYwE="; }; nativeBuildInputs = [ setuptools-scm ]; From 2f312a42086351295c5ba379ad02ab2465afd60c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:15 +0200 Subject: [PATCH 101/314] python3Packages.pytest-testmon: 1.3.0 -> 1.3.1 --- 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 3a3970018652..d40aeb9cf645 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.3.0"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1Qyroq6Dv11EaCGRAj19bKQBfRz26XSh5TJY7xA/vBE="; + sha256 = "sha256-6gWWCtm/GHknhjLyRdVf42koeaSKzk5/V0173DELmj0="; }; propagatedBuildInputs = [ coverage ]; From 57916c3738ea4bc9094367406cd6064e8942b385 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:15 +0200 Subject: [PATCH 102/314] python3Packages.python-dotenv: 0.19.2 -> 0.20.0 --- pkgs/development/python-modules/python-dotenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 774ca6855aee..d1b5d632b302 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.19.2"; + version = "0.20.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"; + sha256 = "sha256-t+OwSllpPELDb5qxzCrMRvpd+MeOF4/DOo1M0FyNSY8="; }; propagatedBuildInputs = [ click ]; From 842bae26e3d0d001850bf6659041d1a044ce1dee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:15 +0200 Subject: [PATCH 103/314] python3Packages.python-logstash: 0.4.6 -> 0.4.8 --- pkgs/development/python-modules/python-logstash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/pkgs/development/python-modules/python-logstash/default.nix index 55d3c60cd448..7930dcd33e0a 100644 --- a/pkgs/development/python-modules/python-logstash/default.nix +++ b/pkgs/development/python-modules/python-logstash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-logstash"; - version = "0.4.6"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "13763yx0k655y0c8gxv7jj6cqp45zypx2fmnc56jnn9zz1fkx50h"; + sha256 = "sha256-0E4c4R7MEH5KTzuAf8V9loEelkpVQIGzu7RHMvdO9fk="; }; # no tests From 08c95bb961408bfb0e31f7cc3e56fbb0a6316d1a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:16 +0200 Subject: [PATCH 104/314] python3Packages.pytools: 2022.1 -> 2022.1.2 --- pkgs/development/python-modules/pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index f4710872cbe8..2ee74e64b065 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2022.1"; + version = "2022.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GXqs9uH11gxxW5JDh5Kst3Aq7Vnrv7FH+oTtp4DlT+4="; + sha256 = "sha256-XoJBAYgKJGNUdWNliAplu0FvaoyrZRO2j8u0j7oJD8s="; }; propagatedBuildInputs = [ From a91260459d092aa210d318420b270340a3b7ece5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:16 +0200 Subject: [PATCH 105/314] python3Packages.pytz: 2021.3 -> 2022.1 --- pkgs/development/python-modules/pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index f7f406e487cc..27b18845804f 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2021.3"; + version = "2022.1"; src = fetchPypi { inherit pname version; - sha256 = "acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"; + sha256 = "sha256-HnYOL+aoFjvAs9mhnE+ENCr6Cir/6/qoSwG5eKAuyqc="; }; checkPhase = '' From 569eb4071fd20d3db125d8adcf50d0d3f3d61305 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:16 +0200 Subject: [PATCH 106/314] python3Packages.PyWavelets: 1.2.0 -> 1.3.0 --- 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 cbd7681c63f9..a85a59ff4ab6 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.2.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6cbd69b047bb4e00873097472133425f5f08a4e6bc8b3f0ae709274d4d5e9a8d"; + sha256 = "sha256-y6qdYgUtna+Np2X8jnwww46iuOnhwYhBkT37SuxnHuU="; }; checkInputs = [ nose pytest ]; From a2e455fe31bd321c09befd50e0f902c296214eaf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:16 +0200 Subject: [PATCH 107/314] python3Packages.qtconsole: 5.2.2 -> 5.3.0 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 4cf9bd022dab..f9eecbe23a8e 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.2.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "8f9db97b27782184efd0a0f2d57ea3bd852d053747a2e442a9011329c082976d"; + sha256 = "sha256-jjUg/cdeRqvEzGz/7KFvomUnVBCbiug5+ijifR66ViU="; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From d4da0ea78887e36a0a5fa0e3fa6da073f743a802 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:16 +0200 Subject: [PATCH 108/314] python3Packages.readthedocs-sphinx-ext: 2.1.4 -> 2.1.5 --- .../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 74f1c05a2010..b71a675f6d8e 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.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "2ba023376057c6ba5d07b4fd016ec1d526f1b4fc5ad7a7ce7f0ed8a91dc54bbe"; + sha256 = "sha256-G/QuIOW3qUOJGnmM5cy5H9W6wiMLDBmdhTgMkhAHa3g="; }; propagatedBuildInputs = [ requests ]; From 097859aefb3296f5efaabda40937b02addacb129 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:16 +0200 Subject: [PATCH 109/314] python3Packages.redis: 4.1.4 -> 4.2.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 7cd59a5528a7..276068018ee0 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.1.4"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HZoM34n92T+EJhcz4k9Vp7vUE6myGf2vVuPnKMqaIwY="; + sha256 = "sha256-Z1jQHeyBrxkbmKNczjQCZ10RVFZYTDm1AKtIWl44a7s="; }; propagatedBuildInputs = [ From eab165be0cc4726073e816aa4b86422bbc37968c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:16 +0200 Subject: [PATCH 110/314] python3Packages.reportlab: 3.6.8 -> 3.6.9 --- 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 629f8d0ec750..5e74c6527ebf 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.8"; + version = "3.6.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3HZX/LC8PkhcPIaaRN3bUtcRNWoBpFZmS3vvgnIiyYI="; + sha256 = "sha256-XQzDaCRWrSExUPbb/+fUfqtzfYCeUXwxYQM3a+VI+4Q="; }; checkInputs = [ glibcLocales ]; From 79c72c6b7c981d3d27e5e10dd66ba53c58281ff7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 111/314] python3Packages.sagemaker: 2.77.1 -> 2.82.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 d18d939be606..dff960429fb1 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.77.1"; + version = "2.82.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RX3QcjGDWYaPC9lKz/nJSMTO3jeXxY7MW98fHYfcLq0="; + sha256 = "sha256-cQe4b5XpmaC9ZTanI9LKNTLw1HycxqaDCOuLfw/vBRY="; }; propagatedBuildInputs = [ From 5fb1e8b0adde907e539ae8eac642e86a540043ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 112/314] python3Packages.Shapely: 1.8.0 -> 1.8.1.post1 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 818cce6a5670..8d5d0d2aa4f5 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.8.0"; + version = "1.8.1.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "177g8wxsgnphhhn4634n6ca1qrk462ijqlznpj5ry6d49ghpwc7m"; + sha256 = "sha256-k/8G/wX74r6EO5PHsa2CkuVuZlugG0cI91rop1eXLp8="; }; nativeBuildInputs = [ From 7c0edf2fb2e6580fa7757bd9d7e08c386f15f598 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 113/314] python3Packages.spacy: 3.2.3 -> 3.2.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 5e3bc6aac8b7..41e6a8cc37c9 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.2.3"; + version = "3.2.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JdAz/Ae4+/yb3Te3cLilhtxBTb1gMShEmvMldqOJFnM="; + sha256 = "sha256-PkxvKY1UBEWC2soRQrCC7jiDG7PXu5MdLuYB6Ljc5k8="; }; propagatedBuildInputs = [ From d8a2c5ed4e247cd570da456027d099d0f101084d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 114/314] python3Packages.spacy-transformers: 1.1.4 -> 1.1.5 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index d203f8709c37..2a81a5bce083 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.4"; + version = "1.1.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G09bZiXTdEuukvKjPOYYTW/B19d406QSRDOU5ZflDDU="; + sha256 = "sha256-nxbmnFyHptbe5M7rQi2ECGoBpxUuutdCtY20eHsGDPI="; }; postPatch = '' From 65b32d790424e872940a3c8af8d887261010baf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 115/314] python3Packages.SPARQLWrapper: 1.8.5 -> 2.0.0 --- pkgs/development/python-modules/sparqlwrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index 41c11172d9bf..ecbbb920f0f4 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SPARQLWrapper"; - version = "1.8.5"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d6a66b5b8cda141660e07aeb00472db077a98d22cb588c973209c7336850fb3c"; + sha256 = "sha256-P+0+vMd2F6SnTSZEuG/Yjg8y5/cAOseyszTAJiAXMfE="; }; # break circular dependency loop From 61bacc8b9ff0ba4247ba6eacd19bd50d3f0acb18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 116/314] python3Packages.sphinx-jinja: 1.4.0 -> 2.0.1 --- .../python-modules/sphinx-jinja/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 7f5ea8c4241a..28d575752551 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -1,29 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pbr, sphinx, sphinx-testing, nose, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, sphinx }: buildPythonPackage rec { pname = "sphinx-jinja"; - version = "1.4.0"; + version = "2.0.1"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e6614d986c0289cb85b016c25eb8cb9781ceb841e70bee639c5123f39ad90b38"; + sha256 = "sha256-3lMY1InG1PaAqhIrp5kovE6t+kTTpTKS3ir+WI/+RAY="; }; - buildInputs = [ pbr ]; propagatedBuildInputs = [ sphinx ]; - checkInputs = [ sphinx-testing nose glibcLocales ]; + # upstream source is not updated to 2.0.X and pypi does not contain tests + doCheck = false; - checkPhase = lib.optionalString (!isPy27) '' - # prevent python from loading locally and breaking namespace - mv sphinxcontrib .sphinxcontrib - '' + '' - # Zip (epub) does not support files with epoch timestamp - LC_ALL="en_US.UTF-8" nosetests -e test_build_epub - ''; + pythonImportsCheck = [ "sphinx_jinja" ]; meta = with lib; { description = "Sphinx extension to include jinja templates in documentation"; + homepage = "https://github.com/tardyp/sphinx-jinja"; maintainers = with maintainers; [ ]; license = licenses.mit; }; From 1274d2441abc97802d5715a86c8ec980a3b3d74e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 117/314] python3Packages.spyder: 5.2.2 -> 5.3.0 --- 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 40e393b57d6c..c117cb4990f8 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.2.2"; + version = "5.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-3DIikQlsc7Ptagi8ddR5ia+u24dXeBdppRkIn/xp3bg="; + sha256 = "sha256-ggCFvYUdUm5fVSpTZoN/OhNPJAQOyehwrQprYTzprbc="; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From 20b5ce4527388c23d75dc34dbb1461f1e1a47897 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:17 +0200 Subject: [PATCH 118/314] python3Packages.spyder-kernels: 2.2.1 -> 2.3.0 --- 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 4ddacc911903..95d54e404471 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "574ee1bd03f7236b9f9dacae34936a0625cd67ccfe3df11fec69f26889a0b866"; + sha256 = "sha256-pdU20Oil53TX1hbBAqj6LWqkX9MwoLeZuY7vFYNW02w="; }; propagatedBuildInputs = [ From a2edb84e929fc9680638c1886544cfc9e92924d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:18 +0200 Subject: [PATCH 119/314] python3Packages.svg.path: 4.1 -> 5.1 --- .../python-modules/svg-path/default.nix | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index e01909fc93a8..fa436ff84463 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,13 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pillow +, pytestCheckHook +}: + buildPythonPackage rec { pname = "svg.path"; - version = "4.1"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "7e6847ba690ff620e20f152818d52e1685b993aacbc41b321f8fee3d1cb427db"; + sha256 = "sha256-CltSq7BGQNmC/3EI5N0wx4QDu0zZWMJLovCUdtXZIws="; }; + checkInputs = [ + pillow + pytestCheckHook + ]; + + disabledTests = [ + # generated image differs from example + "test_image" + ]; + + pythonImportsCheck = [ "svg.path" ]; + meta = with lib; { description = "SVG path objects and parser"; homepage = "https://github.com/regebro/svg.path"; From d6efbcc8694e964f64616b34b0651c9819169fdc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:18 +0200 Subject: [PATCH 120/314] python3Packages.sympy: 1.9 -> 1.10.1 --- pkgs/development/python-modules/sympy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 7d6206f04c80..17765a375298 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.9"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc"; + sha256 = "sha256-WTnu/9+eFSFyYBRjYmwCKiwn51z2J43o1AHVDJ1YeHs="; }; checkInputs = [ glibcLocales ]; From b53991eae43728801b9f1b5e8ebd0d66108cda78 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:18 +0200 Subject: [PATCH 121/314] python3Packages.terminado: 0.13.1 -> 0.13.3 --- 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 6a63fe537168..30673971a164 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.13.1"; + version = "0.13.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W4K1xumR8HBadvlh9DJip/seVbCTwW3Kg/FjhKfzm3s="; + sha256 = "sha256-lNHPq2NSWZP31cm0aaUKGNDN85Q1tZeFcVU53UHjbA0="; }; propagatedBuildInputs = [ ptyprocess tornado ]; From 0e971a63cd579470eb82b39d3298bf18b15a7eeb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:18 +0200 Subject: [PATCH 122/314] python3Packages.tifffile: 2022.2.9 -> 2022.3.25 --- 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 01294ff5007f..0faea93ebdeb 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.2.9"; + version = "2022.3.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ftp0EXZDaBuyyqaVtI854iQ7SIf3z5kdWt/9gT5cg3M="; + hash = "sha256-bZQ/LAGxo0pHbJY9EZVl+6EI9VngYUJsY6UVeEaVntk="; }; propagatedBuildInputs = [ From 47388bbd05ed056f4590999ee5b5f926857990b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:18 +0200 Subject: [PATCH 123/314] python3Packages.tomlkit: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/tomlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 22f3ffab2995..fbe6c7be4d12 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2ZlGxq7TOHyYuJ2R+57f+PkBv5JVkBCBJmqE+1YErc0="; + sha256 = "sha256-PFF4lOre9T6QctND035EJ7jwtiAKcLfJoZsuvR9TuVE="; }; propagatedBuildInputs = From 0810cf442241c054cf69e1c024d69ebae29c5538 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:18 +0200 Subject: [PATCH 124/314] python3Packages.torchinfo: 1.6.3 -> 1.6.5 --- 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 331729e25c58..da0544c299cd 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "torchinfo"; - version = "1.6.3"; + version = "1.6.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g1xhtdwygzPTTswP8iZ364ynBQE7D+aAsZ3d9EpyvIA="; + sha256 = "sha256-Vg/TXD+/VMIv1wHywaOuEj4MDTq90lUo99n+Nppu0uI="; }; propagatedBuildInputs = [ From 7fe434cded5b10e903b72f790244ed6b29c7ff55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:18 +0200 Subject: [PATCH 125/314] python3Packages.tpm2-pytss: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/tpm2-pytss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 5cd14c7704d8..77f778b00102 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { # Last version on github is 0.2.4, but it looks # like a mistake (it's missing commits from 0.1.9) - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Gx1nIXYuhTmQva9LmtTYvd1nyRH/pBQZ5bJ8OLcc1lo="; + sha256 = "sha256-O0d1b99/V8b3embg8veerTrJGSVb/prlPVb7qSHErdQ="; }; postPatch = '' substituteInPlace tpm2_pytss/config.py --replace \ From 9aa71ae0e85b1e5734fe038348759c9b683c8331 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 126/314] python3Packages.tqdm: 4.63.0 -> 4.63.1 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 2613a2b587d7..40b6b47a946d 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.63.0"; + version = "4.63.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HZg17ejjlLuMncv/vKAtcXIXETrcZ5I2hz7qrFvAs80="; + sha256 = "sha256-QjCkkRmkFsiMxH0NLTLV2Q8aKC1eSX1JgBlQcE5Jhj0="; }; nativeBuildInputs = [ From 5f1cd5fa50f2f9a25e240725a11d9ac39e844605 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 127/314] python3Packages.typer: 0.4.0 -> 0.4.1 --- .../development/python-modules/typer/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 1f0bdb39202c..6aa663b0cc20 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchpatch , fetchPypi +, flit-core , click , pytestCheckHook , shellingham @@ -17,23 +18,18 @@ buildPythonPackage rec { pname = "typer"; - version = "0.4.0"; + version = "0.4.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1pgm0zsylbmz1r96q4n3rfi0h3pn4jss2yfs83z0yxa90nmsxhv3"; + sha256 = "sha256-Vkau8Nk2ssdhoQOT8DhO5rXH/guz5c1xCxcTTKHZnP8="; }; - patches = [ - (fetchpatch { - # use get_terminal_size from shutil; click 8.1.0 compat - # https://github.com/tiangolo/typer/pull/375 - name = "typer-click-8.1-compat.patch"; - url = "https://github.com/tiangolo/typer/commit/b6efa2f8f40291fd80cf146b617e0ba305f6af3c.patch"; - hash = "sha256-m0EWpBUt5njoPsn043b30WdAQELYNn2ycHXBxZCYXZE="; - }) + nativeBuildInputs = [ + flit-core ]; propagatedBuildInputs = [ From 9873f0999392091e2fd7ad5f25ed0ee8720af1d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 128/314] python3Packages.tzdata: 2021.5 -> 2022.1 --- pkgs/development/python-modules/tzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index cfc46a658d34..ee8166abb946 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2021.5"; + version = "2022.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-aNvkGv0BuGeJS739VPoD9GjPpPAIa/tK3NjejyTz7iE="; + hash = "sha256-i1NqjsY9wHUTQrOYQZOjEY+Pyir+JXUrubf//TmFUtM="; }; checkInputs = [ From 99d7be1798fdff38cb018855d489acf29542ba32 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 129/314] python3Packages.uamqp: 1.5.1 -> 1.5.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 f3c8792e569c..a838f44eb957 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.5.1"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VevtbXtOTKQEqVYpNKFrDhvyDBJY+uQMhld6in+EroE="; + sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs="; }; nativeBuildInputs = [ From 76b51cbed9d1619f6ae14fa23483e1e29ad35769 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 130/314] python3Packages.ufo2ft: 2.25.3 -> 2.26.0 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 03ebd566b709..8f700107bceb 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.25.3"; + version = "2.26.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4OuEol+YorvOeK5bj33Po8V9KD0trcgTMXCTQ+J7q94="; + sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg="; }; patches = [ From 3bcbd9537843e4e664f43be405e643dcfc6484a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 131/314] python3Packages.urllib3: 1.26.8 -> 1.26.9 --- pkgs/development/python-modules/urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 4c1a61b09fc6..6d29a107f004 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.8"; + version = "1.26.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Dnwz2aY+fd/LhngKrIe+/C+930bFjbtIfghV987sKDw="; + hash = "sha256-qrrxZHeAal4d0ZqkH4wreVDdPHRjYtfjIj2+beasRI4="; }; propagatedBuildInputs = [ From 6f1348c46d1346331d6c06ae987bdc5c317bf7d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 132/314] python3Packages.virtualenv: 20.13.2 -> 20.14.0 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 126bf4e6c6c0..a739ab2fd6ce 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.13.2"; + version = "20.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AfX4B0TSSjdDzmGFgSNIjpHLLdHTvfkq2vG7o5/97fA="; + sha256 = "sha256-jltAIDcocSboHM3pQyuVqL5bGdNlhPZJVwYKNIjBHKg="; }; nativeBuildInputs = [ From bb089f7c2e501218fdd764c17012745c6bfee5f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:19 +0200 Subject: [PATCH 133/314] python3Packages.waitress: 2.0.0 -> 2.1.1 --- pkgs/development/python-modules/waitress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index aa09b0068d9a..e2cbe59ab286 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "2.0.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897"; + sha256 = "sha256-4uYFds8UoVOdp597fuHnmnHmTzZqC0fbVKFelx9XuxY="; }; doCheck = false; From f7510b2806ee22f0fa8ab4f1e3e272605097439c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 134/314] python3Packages.watchdog: 2.1.6 -> 2.1.7 --- pkgs/development/python-modules/watchdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 1bc471c7287f..9afd0f032fc3 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.6"; + version = "2.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o25132x2fL9G9hqRxws7pxgR36CspKMk2UB6Bqi3ouc="; + sha256 = "sha256-P9R4FTU76cRO68lMwo/iaysMW9iJ2vxKWny9+SQUNIA="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From d47d2c0bc3f427f3932c957fbc9c9728a6a96a77 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 135/314] python3Packages.watchgod: 0.7 -> 0.8.1 --- pkgs/development/python-modules/watchgod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchgod/default.nix b/pkgs/development/python-modules/watchgod/default.nix index 5bb842586422..a9e6a6ae099f 100644 --- a/pkgs/development/python-modules/watchgod/default.nix +++ b/pkgs/development/python-modules/watchgod/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "watchgod"; - version = "0.7"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0aagm0n5fkpzdsfgl0r21gkz5qaicgq3f4rqz2fdvsgbn1i0s528"; + sha256 = "sha256-wS0V8999EedAcE5FOYJ3918dePRq1Zyp11Bb/YuNMIY="; }; # no tests in release From 904134e694b6dc14cf0d0c764393e6e2a9f8690a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 136/314] python3Packages.websocket-client: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/websocket-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 37d926e50555..42d15476ff88 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.3.1"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YninUGU5VBgoP4h958O+r7OqaNraXKy+SyFOjSbaSZs="; + sha256 = "sha256-ULIdsAWPepU9Z8wERb5LlI1/wZbsvrgIPWjZRijkq/Y="; }; propagatedBuildInputs = [ From 7c557ca93e0f6494b8fac233820b55be096ea99e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 137/314] python3Packages.werkzeug: 2.0.3 -> 2.1.0 --- pkgs/development/python-modules/werkzeug/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 63c3ad1b420b..4c40b4df1f08 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.0.3"; + version = "2.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; + sha256 = "sha256-m1VGaj6Z4TsfBoamYRfTm9qFqZIWbgp5rt/PNYYyj3o="; }; propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ From 36d3f01a687e11c4653f61a677803526907f3293 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 138/314] python3Packages.widgetsnbextension: 3.5.2 -> 3.6.0 --- .../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 8f6cb6ad1867..5b4f535563c2 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.5.2"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e0731a60ba540cd19bbbefe771a9076dcd2dde90713a8f87f27f53f2d1db7727"; + sha256 = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; }; propagatedBuildInputs = [ notebook ]; From 81da4deedbb2e9f935a2a95a4e55fbd5624d34cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 139/314] python3Packages.zarr: 2.11.0 -> 2.11.1 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index c943f34c52ef..972bd527ad0f 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.11.0"; + version = "2.11.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-sIc74nr1aQc4+hWOp6gC6uRUkEwzmVBWGFrMWnQltFE="; + sha256 = "sha256-EbYo9C3sNuAUeHnovUcVJLWbI4CUubIePDW+eDmcEV4="; }; nativeBuildInputs = [ From 8d5f922a8a08114b048f15d5dfaad76eb593b7ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 140/314] python3Packages.ZODB: 5.6.0 -> 5.7.0 --- pkgs/development/python-modules/zodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index e4f1e403cd97..7c788f7a9f8f 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.6.0"; + version = "5.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; + sha256 = "sha256-+kC7wF7NoewkNc0MbdAqE7dphGBVikYENm9qCmhAHNM="; }; # remove broken test From 32612278f02defe2c57217cf025430e89381434c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 01:05:20 +0200 Subject: [PATCH 141/314] python3Packages.zope.testing: 4.9 -> 4.10 --- 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 ea2d531f7632..f8ea4e83b15c 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.9"; + version = "4.10"; src = fetchPypi { inherit pname version; - sha256 = "475cb847a7af9d547313ee93f5d0b8800bf627e6d0d9a51d11967984083cb54e"; + sha256 = "sha256-O25ZBsrd0UjCP+lY5qrj+tyKCKilP3R9l5HC2BNe5W4="; }; doCheck = !isPyPy; From 8681b42e8d2cddd8e2c4a309c4c030cb7005f170 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 02:04:11 +0200 Subject: [PATCH 142/314] python3Packages.sphinx: 4.4.0 -> 4.5.0 https://www.sphinx-doc.org/en/master/changes.html\#release-4-5-0-released-mar-28-2022 --- pkgs/development/python-modules/sphinx/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 7d79aaa457a3..020cf5c143a2 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -30,14 +30,16 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.4.0"; - disabled = pythonOlder "3.5"; + version = "4.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q4CqPO08AfR+CDB02al65A+FHRFUDUfFTba0u8YQx+8="; + sha256 = "sha256-Lw9yZWCQpt02SL/McWPcyFRfVhQHC0TejcYRbVw+VxY="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -46,6 +48,11 @@ buildPythonPackage rec { ''; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "docutils>=0.14,<0.18" "docutils>=0.14" + ''; + propagatedBuildInputs = [ Babel alabaster From d9ab8e2a4b1741a9c9edb4bd2018bd53b1b48e49 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 02:09:52 +0200 Subject: [PATCH 143/314] python3Packages.flake8: relax mccabe constraint --- pkgs/development/python-modules/flake8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index c707cb3caaa1..73dc7403b25f 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "pyflakes >= 2.3.0, < 2.4.0" "pyflakes >= 2.3.0, < 2.5.0" + --replace "mccabe>=0.6.0,<0.7.0" "mccabe>=0.7.0,<0.8.0" ''; propagatedBuildInputs = [ From 689b871d18fb9959da2d0a1a6677124168d55792 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 02:11:19 +0200 Subject: [PATCH 144/314] python3Packages.mccabe: disable broken tests --- .../python-modules/mccabe/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 8225da409444..f47e4e4d4b6e 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner }: +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, hypothesis +, hypothesmith +, python +}: buildPythonPackage rec { pname = "mccabe"; @@ -9,7 +16,12 @@ buildPythonPackage rec { sha256 = "sha256-NI4CQMM7YLvfTlIxku+RnyjLLD19XHeU90AJKQ8jYyU="; }; - buildInputs = [ pytest pytest-runner ]; + buildInputs = [ + pytest + ]; + + # https://github.com/PyCQA/mccabe/issues/93 + doCheck = false; meta = with lib; { description = "McCabe checker, plugin for flake8"; From 8a719a13e9ee3e13243ac8f936f923b9bfb2dfaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 02:24:41 +0200 Subject: [PATCH 145/314] python3Packages.ephemeral-port-reserve: init at 1.1.4 --- .../ephemeral-port-reserve/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/ephemeral-port-reserve/default.nix diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix new file mode 100644 index 000000000000..ff0eab1aa059 --- /dev/null +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +let + pname = "ephemeral-port-reserve"; + version = "1.1.4"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Yelp"; + repo = "ephemeral-port-reserve"; + rev = "v${version}"; + hash = "sha256-R6NRpfaT05PO/cTWgCakiGfCuCyucjVOXbAezn5x1cU="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ephemeral_port_reserve" + ]; + + meta = with lib; { + description = "Find an unused port, reliably"; + homepage = "https://github.com/Yelp/ephemeral-port-reserve/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 964e563d0bbf..5d43f789fed1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2662,6 +2662,8 @@ in { ephem = callPackage ../development/python-modules/ephem { }; + ephemeral-port-reserve = callPackage ../development/python-modules/ephemeral-port-reserve { }; + epson-projector = callPackage ../development/python-modules/epson-projector { }; eradicate = callPackage ../development/python-modules/eradicate { }; From e65e2be6a76f4511e659cfd06fa5b655ddff1326 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 02:28:50 +0200 Subject: [PATCH 146/314] python3Packages.werkzeug: fix tests --- pkgs/development/python-modules/werkzeug/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 4c40b4df1f08..f961d0359db4 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -5,6 +5,7 @@ , fetchPypi , watchdog , dataclasses +, ephemeral-port-reserve , pytest-timeout , pytest-xprocess , pytestCheckHook @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; checkInputs = [ + ephemeral-port-reserve pytest-timeout pytest-xprocess pytestCheckHook @@ -40,6 +42,11 @@ buildPythonPackage rec { "test_get_machine_id" ]; + disabledTestPaths = [ + # ConnectionRefusedError: [Errno 111] Connection refused + "tests/test_serving.py" + ]; + pytestFlagsArray = [ # don't run tests that are marked with filterwarnings, they fail with # warnings._OptionError: unknown warning category: 'pytest.PytestUnraisableExceptionWarning' From 477044d6adc2ad53ca59b5ee90e77b6bf06a63a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 02:29:17 +0200 Subject: [PATCH 147/314] python3Packages.watchgod: add missing anyio dependency --- pkgs/development/python-modules/watchgod/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/watchgod/default.nix b/pkgs/development/python-modules/watchgod/default.nix index a9e6a6ae099f..70e93f1a2090 100644 --- a/pkgs/development/python-modules/watchgod/default.nix +++ b/pkgs/development/python-modules/watchgod/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, anyio }: buildPythonPackage rec { @@ -12,6 +13,10 @@ buildPythonPackage rec { sha256 = "sha256-wS0V8999EedAcE5FOYJ3918dePRq1Zyp11Bb/YuNMIY="; }; + propagatedBuildInputs = [ + anyio + ]; + # no tests in release doCheck = false; From 6c4fb1151ef9d90e2e4a59b5caac71de0e0d3e4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 02:58:06 +0200 Subject: [PATCH 148/314] python3Packages.redis: add missing deps, set up extra-requires --- .../python-modules/redis/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 276068018ee0..85df20a32637 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -4,11 +4,18 @@ , pythonOlder # propagates -, cryptography +, async-timeout , deprecated -, hiredis , importlib-metadata , packaging +, typing-extensions + +# extras: hiredis +, hiredis + +# extras: ocsp +, cryptography +, pyopenssl , requests }: @@ -25,15 +32,25 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - cryptography + async-timeout deprecated - hiredis packaging - requests + typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + passthru.extras-require = { + hidredis = [ + hiredis + ]; + ocsp = [ + cryptography + pyopenssl + requests + ]; + }; + pythonImportsCheck = [ "redis" "redis.client" From 42027924a953f2e9d94387f99c8f780f1f5c0930 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 03:02:00 +0200 Subject: [PATCH 149/314] python3Packages.pylint: 2.12.2 -> 2.13.3 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index b52cb3e2f95c..20f6492a915f 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.12.2"; + version = "2.13.3"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-seBYBTB+8PLIovqxVohkoQEfDAZI1fehLgXuHeTx9Wo="; + sha256 = "sha256-m/wmds95+DGHHJvBHU+icFtXUmY7qI+Ga9YmSQagFoc="; }; nativeBuildInputs = [ From df3e27b5bbf3287ab7aa0df88f129b9dea61cdb6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 03:03:04 +0200 Subject: [PATCH 150/314] python3Packages.astroid: 2.9.3 -> 2.11.2 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index ab62a565ce67..c07f7e47a463 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.9.3"; # Check whether the version is compatible with pylint + version = "2.11.2"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6.2"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1x77faggk1dgxy48ng31xj9h6p51w312kvk5zqgvd5f19nvznxyi"; + sha256 = "sha256-adnvJCchsMWQxsIlenndUb6Mw1MgCNAanZcTmssmsEc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5769d201c12ff6dd9d7edb9d9148c466b47a04b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 03:18:47 +0200 Subject: [PATCH 151/314] python3Packages.asttokens: move astroid to check inputs, disable astroid tests --- pkgs/development/python-modules/asttokens/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 1e44ee8fa0e1..3d78ae7690b3 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -22,10 +22,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - astroid ]; checkInputs = [ + astroid pytestCheckHook ]; @@ -34,6 +34,11 @@ buildPythonPackage rec { "test_slices" ]; + disabledTestPaths = [ + # incompatible with astroid 2.11.0, pins <= 2.5.3 + "tests/test_astroid.py" + ]; + pythonImportsCheck = [ "asttokens" ]; meta = with lib; { From 1a80cfa0250212292729e1e1b84dac0948a51677 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 03:19:09 +0200 Subject: [PATCH 152/314] python3Packages.pylint: add missing deps, adjust pytest-xdist param --- pkgs/development/python-modules/pylint/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 20f6492a915f..4f6824381b24 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -5,12 +5,14 @@ , pythonOlder , installShellFiles , astroid +, dill , isort , GitPython , mccabe , platformdirs , toml , pytest-benchmark +, pytest-timeout , pytest-xdist , pytestCheckHook }: @@ -34,6 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ astroid + dill isort mccabe platformdirs @@ -49,6 +52,7 @@ buildPythonPackage rec { checkInputs = [ GitPython pytest-benchmark + pytest-timeout pytest-xdist pytestCheckHook ]; @@ -62,7 +66,7 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "-n auto" + "-n $NIX_BUILD_CORES" ]; disabledTestPaths = [ From 544c77ba0f6c1a5ba38342052367188fc4416d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 00:26:09 +0200 Subject: [PATCH 153/314] python39Packages.flask: fix build & add SuperSandro2000 as maintainer --- pkgs/development/python-modules/flask/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 86da25173ca5..997a28de1e9c 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -3,12 +3,13 @@ , fetchPypi , asgiref , click +, importlib-metadata , itsdangerous , jinja2 , python-dotenv , werkzeug -, setuptools , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -27,11 +28,7 @@ buildPythonPackage rec { itsdangerous jinja2 werkzeug - - # required for CLI subcommand autodiscovery - # see: https://github.com/pallets/flask/blob/fdac8a5404e3e3a316568107a293f134707c75bb/src/flask/cli.py#L498 - setuptools - ]; + ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; checkInputs = [ pytestCheckHook @@ -48,5 +45,6 @@ buildPythonPackage rec { Python web application frameworks. ''; license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From f20d368f2f14c204b80bad73a6cf51574b15518a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 31 Mar 2022 11:50:51 +0200 Subject: [PATCH 154/314] python310Packages.sparqlwrapper: normalize attr --- .../development/python-modules/nipype/neurdflib.nix | 4 ++-- .../python-modules/sparqlwrapper/default.nix | 13 +++++-------- pkgs/top-level/python-aliases.nix | 3 ++- pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix index 0a266ff7bf82..8095b0fb0401 100644 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/pkgs/development/python-modules/nipype/neurdflib.nix @@ -3,7 +3,7 @@ , fetchPypi , isodate , html5lib -, SPARQLWrapper +, sparqlwrapper , networkx , nose , python @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50"; }; - propagatedBuildInputs = [ isodate html5lib SPARQLWrapper ]; + propagatedBuildInputs = [ isodate html5lib sparqlwrapper ]; checkInputs = [ networkx nose ]; diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index ecbbb920f0f4..0660b8a403ce 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -1,31 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, six -, isodate -, pyparsing -, html5lib , keepalive }: buildPythonPackage rec { - pname = "SPARQLWrapper"; + pname = "sparqlwrapper"; version = "2.0.0"; src = fetchPypi { - inherit pname version; + pname = "SPARQLWrapper"; + inherit version; sha256 = "sha256-P+0+vMd2F6SnTSZEuG/Yjg8y5/cAOseyszTAJiAXMfE="; }; # break circular dependency loop patchPhase = '' - sed -i '/rdflib/d' requirements.txt + sed -i '/rdflib/d' setup.cfg ''; # Doesn't actually run tests doCheck = false; - propagatedBuildInputs = [ six isodate pyparsing html5lib keepalive ]; + propagatedBuildInputs = [ keepalive ]; meta = with lib; { description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7500cadda265..3b5f95c84b80 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -112,6 +112,7 @@ mapAliases ({ requests_oauthlib = requests-oauthlib; # added 2022-02-12 requests_toolbelt = requests-toolbelt; # added 2017-09-26 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 + ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 @@ -119,9 +120,9 @@ mapAliases ({ scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 - ROPGadget = ropgadget; # added 2021-07-06 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + SPARQLWrapper = sparqlwrapper; sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d43f789fed1..d94b33bfa215 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9475,7 +9475,7 @@ in { sparklines = callPackage ../development/python-modules/sparklines { }; - SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + sparqlwrapper = callPackage ../development/python-modules/sparqlwrapper { }; sparse = callPackage ../development/python-modules/sparse { }; From 588b2f12c2962bcb7316370fad174050b68bfda0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 14:52:21 +0200 Subject: [PATCH 155/314] python3Packages.ipykernel: 6.10.0 -> 6.11.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 499e23c3b64a..e406b2f3594b 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.10.0"; + version = "6.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0cfZLa6l2bVaM+Uj1NF8Ca044N8XpODtL6XJfwfyALo="; + sha256 = "sha256-ZxJgRTHJYQDzJkQMEcsCPaJoGfLzS6nRyg+xY0AYNOg="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 From ae347df8b2f1dfd65e610d72751a5d19540ccb9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 14:52:22 +0200 Subject: [PATCH 156/314] python3Packages.parsimonious: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/parsimonious/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 557e632f2eda..8f1ac75d92f0 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.8.1"; + version = "0.9.0"; pname = "parsimonious"; src = fetchPypi { inherit pname version; - sha256 = "3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b"; + sha256 = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME="; }; checkInputs = [ nose ]; From 388c6ceab8c526d37f4379c87e23b1b431eb3da2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 14:52:22 +0200 Subject: [PATCH 157/314] python3Packages.python-vagrant: 0.5.15 -> 1.0.0 --- pkgs/development/python-modules/python-vagrant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix index 92ba757667da..694df9918e19 100644 --- a/pkgs/development/python-modules/python-vagrant/default.nix +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "0.5.15"; + version = "1.0.0"; pname = "python-vagrant"; src = fetchPypi { inherit pname version; - sha256 = "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg"; + sha256 = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; }; # The tests try to connect to qemu From 8d4d00461cb6ed08d5ddc61e54723708043b6864 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 14:52:22 +0200 Subject: [PATCH 158/314] python3Packages.redis: 4.2.0 -> 4.2.1 --- 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 85df20a32637..b38975c9c6d6 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.2.0"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z1jQHeyBrxkbmKNczjQCZ10RVFZYTDm1AKtIWl44a7s="; + sha256 = "sha256-/kVROIEinb7mEGILnggXsfSMR7pjWHAyD9RKcSIEu90="; }; propagatedBuildInputs = [ From cd9f0575eb204d6d91e02bbd0d56811f70e3df57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 14:52:22 +0200 Subject: [PATCH 159/314] python3Packages.twine: 3.8.0 -> 4.0.0 --- .../python-modules/twine/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index d6fea5942117..6cfb7f360476 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -1,40 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , importlib-metadata , keyring , pkginfo -, pyblake2 , readme_renderer , requests , requests-toolbelt -, setuptools-scm -, tqdm -, colorama +, rich , rfc3986 +, setuptools-scm +, urllib3 }: buildPythonPackage rec { pname = "twine"; - version = "3.8.0"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jvpSZY4K53BoahO2dVaTKPH7qYN+XeGGe/5fRqmu/hk="; + sha256 = "sha256-gXqgwL3AKl6+MgUeFo4jxxoGCDNOYkx5MBHxINu8Bbc="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ importlib-metadata keyring pkginfo - pyblake2 readme_renderer requests requests-toolbelt - tqdm - colorama rfc3986 + rich + urllib3 ]; # Requires network From c838a3ac1e407d6890920f68ec9584abff5d566e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 15:49:20 +0200 Subject: [PATCH 160/314] python3Packages.pytest: prune deps, refactor --- .../python-modules/pytest/default.nix | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 38b94f270461..8c40c835feb0 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,47 +1,48 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy -, atomicwrites +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, isPyPy +, writeText + +# build +, setuptools-scm + +# propagates , attrs -, hypothesis , iniconfig -, more-itertools , packaging -, pathlib2 , pluggy , py -, pygments -, setuptools -, setuptools-scm -, six , tomli -, wcwidth -, writeText + +# tests +, hypothesis +, pygments }: buildPythonPackage rec { pname = "pytest"; version = "7.1.1"; - disabled = !isPy3k; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-hBEyyu9rGtF6mv3kbcT2z6WaBflVWq5RUfc73yggymM="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ - atomicwrites attrs iniconfig - more-itertools packaging pluggy py - setuptools - six tomli - wcwidth - ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + ]; checkInputs = [ hypothesis @@ -50,17 +51,13 @@ buildPythonPackage rec { doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 # test_missing_required_plugins will emit deprecation warning which is treated as error checkPhase = '' runHook preCheck $out/bin/py.test -x testing/ \ --ignore=testing/test_junitxml.py \ + --ignore=testing/test_argcomplete.py \ -k "not test_collect_pyargs_with_testpaths and not test_missing_required_plugins" # tests leave behind unreproducible pytest binaries in the output directory, remove: From 3b3bf22264994cd7b03ab4c0a6abe72bb5ea0b0f Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 31 Mar 2022 00:39:59 +0300 Subject: [PATCH 161/314] python39Packages.pytest-xdist: add pexpect to run more tests --- pkgs/development/python-modules/pytest-xdist/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index fa1b0f63fabc..1bdf899ec0c1 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -9,6 +9,7 @@ , pytest , pytest-forked , psutil +, pexpect }: buildPythonPackage rec { @@ -25,7 +26,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook filelock ]; + checkInputs = [ pytestCheckHook filelock pexpect ]; propagatedBuildInputs = [ execnet pytest-forked psutil ]; # access file system From 50402f8839f1a12bed6461a1ea3c232b24706c0c Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 31 Mar 2022 00:40:17 +0300 Subject: [PATCH 162/314] python39Packages.pytest-xdist: add hook to add flags many of our packages have pytest-xdist in their inputs however oftentimes the required flags aren't added to pytest flags since we dont use tox and other frameworks some examples of improvements (my pc has ryzen 9 5900x) hypothesis 11m:15s on hydra -> <1m on my pc hypothesmith 8m on my pc -> <1m on my pc the whole graph from pytest-xdist (tested by adding postPatch with true to xdist) time nix build ".#python3Packages.hypothesmith" 19m:57s -> 9m:13s --- pkgs/development/python-modules/pytest-xdist/default.nix | 8 ++++++++ .../development/python-modules/pytest-xdist/setup-hook.sh | 7 +++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-xdist/setup-hook.sh diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 1bdf899ec0c1..b17b6f2f763a 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -29,6 +29,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook filelock pexpect ]; propagatedBuildInputs = [ execnet pytest-forked psutil ]; + pytestFlagsArray = [ + # pytest can already use xdist at this point + "--numprocesses=$NIX_BUILD_CORES" + "--forked" + ]; + # access file system disabledTests = [ "test_distribution_rsyncdirs_example" @@ -41,6 +47,8 @@ buildPythonPackage rec { "test_internal_errors_propagate_to_controller" ]; + setupHook = ./setup-hook.sh; + meta = with lib; { description = "Pytest xdist plugin for distributed testing and loop-on-failing modes"; homepage = "https://github.com/pytest-dev/pytest-xdist"; diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh new file mode 100644 index 000000000000..8bba79ca3360 --- /dev/null +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -0,0 +1,7 @@ +pytestXdistHook() { + pytestFlagsArray+=("--numprocesses=$NIX_BUILD_CORES" "--forked" ) +} + +if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then + addEnvHooks "$hostOffset" pytestXdistHook +fi From 5cc1b54f4e54f93372a2c821764bdb351a54b5fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 16:23:01 +0200 Subject: [PATCH 163/314] python3Packages.purl: propagate six, add import check --- .../development/python-modules/purl/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index aa85ea3965ab..8c7b208df2fe 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, six , pytestCheckHook }: @@ -13,7 +16,17 @@ buildPythonPackage rec { sha256 = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc="; }; - checkInputs = [ pytestCheckHook]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "purl" + ]; meta = with lib; { description = "Immutable URL class for easy URL-building and manipulation"; From 4664f5465fbd3f8903be620db14d98132db28050 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 16:26:42 +0200 Subject: [PATCH 164/314] python3Packages.paho-mqtt: require six for tests --- pkgs/development/python-modules/paho-mqtt/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 341ef8321835..fb249acf6333 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -5,6 +5,7 @@ , isPy3k , pytestCheckHook , mock +, six }: buildPythonPackage rec { @@ -18,16 +19,9 @@ buildPythonPackage rec { sha256 = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pylama" "" \ - --replace "'pytest-runner'" "" - substituteInPlace setup.cfg \ - --replace "--pylama" "" - ''; - checkInputs = [ pytestCheckHook + six ] ++ lib.optional (!isPy3k) [ mock ]; From 58d0983f24bd4349317b324db5c3efb75d97c2d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 16:39:49 +0200 Subject: [PATCH 165/314] python3Packages.pymemcache: propagate six --- pkgs/development/python-modules/pymemcache/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index f2055ca9a791..81c05f4e97c2 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, six , future , mock , pytestCheckHook @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "pymemcache"; version = "3.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "pinterest"; @@ -17,6 +19,10 @@ buildPythonPackage rec { sha256 = "sha256-DKqfv5gf9gzbnEPQSzy2mAaVYJZL9jmTKyGWVzj40T4="; }; + propagatedBuildInputs = [ + six + ]; + checkInputs = [ future mock From a6bb82efd09aec63093a9d3d30e7af11dab3b272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 31 Mar 2022 16:27:27 +0200 Subject: [PATCH 166/314] python39Packages.rich: 11.2.0 -> 12.0.1 --- pkgs/development/python-modules/rich/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 3e7055d274ef..26f1248f3388 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pythonOlder , CommonMark -, colorama , dataclasses , poetry-core , pygments @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "rich"; - version = "11.2.0"; + version = "12.0.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,18 +20,18 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "19k8c8jnqj1v0ji8kkx3r2ny6wlpwy58ir7lyrh2qyjvzkw08i58"; + sha256 = "sha256-hx/Xot+LFzhyO17f1hRqsNCFTlKFEq87sFLvd1SGUfo="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ CommonMark - colorama pygments - typing-extensions ] ++ lib.optional (pythonOlder "3.7") [ dataclasses + ] ++ lib.optional (pythonOlder "3.9") [ + typing-extensions ]; checkInputs = [ From 11ffe5b562f8254fed6879f32dc8774303a444a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 17:22:42 +0200 Subject: [PATCH 167/314] python3Packages.reportlab: patch path to freetype headers --- pkgs/development/python-modules/reportlab/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 5e74c6527ebf..35289d3b5d4b 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi , freetype , pillow @@ -23,6 +24,9 @@ in buildPythonPackage rec { buildInputs = [ ft pillow ]; postPatch = '' + substituteInPlace setup.py \ + --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" + # Remove all the test files that require access to the internet to pass. rm tests/test_lib_utils.py rm tests/test_platypus_general.py From fc4a13d81dc2f60980f90850452cec3d25ea9964 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 17:24:20 +0200 Subject: [PATCH 168/314] python3Packages.sqlalchemy: 1.4.32 -> 1.4.33 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_33 --- 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 d379fc929428..f42794abcc2a 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.32"; + version = "1.4.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b90txZMdqrd4wrZbA99q5oN24CijCY62JNCQnZmYhbw="; + sha256 = "sha256-hHR9HMSCMoW4JTo0UTFipmTUmJIXRh4REJdEa5iAO/w="; }; propagatedBuildInputs = [ From d26c2ee239c92c4b98b0d429f36da51ee1125534 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 18:17:14 +0200 Subject: [PATCH 169/314] python3Packages.Mako: add babel extra, disable lingua tests --- .../python-modules/Mako/default.nix | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 9730ba788711..d7b350b9f96b 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -1,8 +1,16 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , isPyPy + +# propagates , markupsafe + +# extras: Babel +, Babel + +# tests , mock , pytestCheckHook }: @@ -11,13 +19,27 @@ buildPythonPackage rec { pname = "Mako"; version = "1.2.0"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; sha256 = "sha256-mnx+kiuH2zaGIQz0nV12cDOkHUAQsoTnR2gskr3dizk="; }; - propagatedBuildInputs = [ markupsafe ]; - checkInputs = [ pytestCheckHook markupsafe mock ]; + propagatedBuildInputs = [ + markupsafe + ]; + + passthru.extras-require = { + babel = [ + Babel + ]; + }; + + checkInputs = [ + pytestCheckHook + mock + ] ++ passthru.extras-require.babel; disabledTests = lib.optionals isPyPy [ # https://github.com/sqlalchemy/mako/issues/315 @@ -29,6 +51,11 @@ buildPythonPackage rec { "test_bytestring_passthru" ]; + disabledTestPaths = [ + # lingua dependency is not packaged + "test/ext/test_linguaplugin.py" + ]; + meta = with lib; { description = "Super-fast templating language"; homepage = "https://www.makotemplates.org/"; From 2bd4ecc64bb7f489cf10d84eb94162febe94623d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 18:22:03 +0200 Subject: [PATCH 170/314] python3Packages.service-identity: propagate six --- pkgs/development/python-modules/service_identity/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index d7c37e7c433b..8ac3b52d58c7 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -7,6 +7,7 @@ , ipaddress , pyasn1 , pyasn1-modules +, six , pytestCheckHook , pythonOlder }: @@ -28,6 +29,7 @@ buildPythonPackage rec { idna pyasn1 pyasn1-modules + six ] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ]; From 9d9c57830f22c1f825fce674ed6bbdfbad3ca84e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 22:33:54 +0200 Subject: [PATCH 171/314] python3Packages.astroid: disable test_mro_typing_extensions on python310 --- pkgs/development/python-modules/astroid/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index c07f7e47a463..539787403c6e 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , isPyPy , lazy-object-proxy @@ -45,6 +46,9 @@ buildPythonPackage rec { disabledTests = [ # assert (1, 1) == (1, 16) "test_end_lineno_string" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # AssertionError: Lists differ: ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'Protocol', 'object'] != ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'object'] + "test_mro_typing_extensions" ]; passthru.tests = { From 335b2147832100ff9162c804647bb0536f565681 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 22:37:52 +0200 Subject: [PATCH 172/314] python3Packages.beautifultable: add wcwidth dep, fix homepage --- pkgs/development/python-modules/beautifultable/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix index def8f207ee80..646cfe8af9a2 100644 --- a/pkgs/development/python-modules/beautifultable/default.nix +++ b/pkgs/development/python-modules/beautifultable/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, wcwidth , pytestCheckHook }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "12ci6jy8qmbphsvzvj98466nlhclfzs0a0pmbsv3mf5bfcdwvbh7"; }; + propagatedBuildInputs = [ + wcwidth + ]; + checkInputs = [ pytestCheckHook ]; @@ -25,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for printing visually appealing tables"; - homepage = "https://github.com/CERT-Polska/mwdblib"; + homepage = "https://github.com/pri22296/beautifultable"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 6342d865421d24fb3e910f2331044f8d047862e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 22:42:36 +0200 Subject: [PATCH 173/314] python3Packages.claripy: add six to check deps --- pkgs/development/python-modules/claripy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9816ff3782b3..b16505771492 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -8,6 +8,7 @@ , pysmt , pythonOlder , pytestCheckHook +, six , z3 }: @@ -36,6 +37,7 @@ buildPythonPackage rec { checkInputs = [ nose pytestCheckHook + six ]; postPatch = '' From 9d5a47f7392864adcc57007304b901ed758a4b4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 22:45:40 +0200 Subject: [PATCH 174/314] python3Packages.fasteners: add more-itertools to check deps --- pkgs/development/python-modules/fasteners/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index b1281c686d87..ef8a62bc8e8e 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , diskcache +, more-itertools , pytestCheckHook }: @@ -19,6 +20,7 @@ buildPythonPackage rec { checkInputs = [ diskcache + more-itertools pytestCheckHook ]; From a386ad87bd51945c72987452644496be8f3f6821 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 22:51:38 +0200 Subject: [PATCH 175/314] python3Packages.ush: add six to check deps --- pkgs/development/python-modules/ush/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index d7a90bcb9e8d..3e7773fb2fd9 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "ush"; @@ -11,7 +16,10 @@ buildPythonPackage rec { sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + six + ]; disabledTestPaths = [ # seems to be outdated? From 40b227e4d001a9d6fc35b21ef4b9126615abfb0a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 22:54:36 +0200 Subject: [PATCH 176/314] python3Packages.opentracing: add six to check deps, migrate to pytestCheckHook --- .../python-modules/opentracing/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index 381b0d76b144..bf7ec6a938ff 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -5,12 +5,15 @@ , futures ? null , gevent , mock -, pytest -, tornado }: +, pytestCheckHook +, tornado +, six +}: buildPythonPackage rec { pname = "opentracing"; version = "2.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -19,11 +22,13 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPy27 futures; - checkInputs = [ gevent mock pytest tornado ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ + gevent + mock + pytestCheckHook + six + tornado + ]; meta = with lib; { homepage = "https://github.com/opentracing/opentracing-python"; From 6436369a072e9526b1facc468374b359cdc21709 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:02:49 +0200 Subject: [PATCH 177/314] lookatme: fix tests --- pkgs/tools/misc/lookatme/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lookatme/default.nix b/pkgs/tools/misc/lookatme/default.nix index b046e1569044..7d2f7338ec24 100644 --- a/pkgs/tools/misc/lookatme/default.nix +++ b/pkgs/tools/misc/lookatme/default.nix @@ -37,7 +37,17 @@ buildPythonApplication rec { sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw="; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytest-mock + pytestCheckHook + six + ]; + + disabledTests = [ + # https://github.com/d0c-s4vage/lookatme/issues/126 + "test_sanity_check_that_errors_are_detected" + "test_styles_defaults" + ]; propagatedBuildInputs = [ click From f387a952172d051ce096c875cd9c711a6f415277 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:04:08 +0200 Subject: [PATCH 178/314] python3Packages.dictpath: add six to check deps --- pkgs/development/python-modules/dictpath/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix index 2809d859589e..5a648f7898f5 100644 --- a/pkgs/development/python-modules/dictpath/default.nix +++ b/pkgs/development/python-modules/dictpath/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, six }: buildPythonPackage rec { @@ -21,6 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; pythonImportsCheck = [ "dictpath" ]; From 4f53c6f7fde07c8e666ff25c8d61b273c0b10c49 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:08:39 +0200 Subject: [PATCH 179/314] python3Packages.nocasedict: propagate six, migrate to pytestCheckHook --- .../python-modules/nocasedict/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 982f2abe880d..d9140d591c81 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, six }: buildPythonPackage rec { @@ -11,8 +14,12 @@ buildPythonPackage rec { sha256 = "sha256-giC5e6BrCOst7e13TEBsd+DKDVNSrnEkn2+dHyoXvXs="; }; + propagatedBuildInputs = [ + six + ]; + checkInputs = [ - pytest + pytestCheckHook ]; pythonImportsCheck = [ From ff41191d8f85dc8ffe1dde9bb5c06270a904b506 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:12:37 +0200 Subject: [PATCH 180/314] python3Packages.parsimonious: fix build, use pytestCheckHook --- .../python-modules/parsimonious/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 8f1ac75d92f0..ccffbc5a2819 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -1,24 +1,33 @@ { lib , buildPythonPackage , fetchPypi -, nose -, six +, regex +, pytestCheckHook }: buildPythonPackage rec { - version = "0.9.0"; pname = "parsimonious"; + version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + regex + ]; - # performance tests tend to fail sometimes - NOSE_EXCLUDE = "test_benchmarks"; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "parsimonious" + "parsimonious.grammar" + "parsimonious.nodes" + ]; meta = with lib; { homepage = "https://github.com/erikrose/parsimonious"; From 7739dfcece87ed23edd5e4cb6d73cf12f159d18b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:14:45 +0200 Subject: [PATCH 181/314] python3Packages.validators: propagate six --- pkgs/development/python-modules/validators/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 29ec9cd73d73..f83fe801a2a2 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy27 , decorator +, six , pytestCheckHook }: @@ -18,6 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator + six ]; checkInputs = [ From 94fb150cac50760a4c2f931cd64c72b2ea3dcb06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:31:43 +0200 Subject: [PATCH 182/314] python3Packages.variants: add six to check deps --- pkgs/development/python-modules/variants/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index e23407ab06b3..2b5dccec558a 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -4,6 +4,7 @@ , pytest-runner , setuptools-scm , pytestCheckHook +, six , lib }: @@ -17,12 +18,12 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytest-runner setuptools-scm ]; checkInputs = [ pytestCheckHook + six ]; meta = with lib; { From bd8dac27b4a45e2b4c62b199c43af6353f5b0880 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:32:49 +0200 Subject: [PATCH 183/314] python3Packages.python-registry: add six to check deps --- pkgs/development/python-modules/python-registry/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix index fbf8df7f322d..8b24ca08ff8b 100644 --- a/pkgs/development/python-modules/python-registry/default.nix +++ b/pkgs/development/python-modules/python-registry/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , unicodecsv +, six }: buildPythonPackage rec { @@ -24,6 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; disabledTestPaths = [ From ac4a86a2f520929ff11ae413081a4540db7156dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:35:45 +0200 Subject: [PATCH 184/314] python3Packages.aurorapy: add six to check deps --- pkgs/development/python-modules/aurorapy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 17abcf0e9c47..7e59d9c8bc95 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -5,6 +5,7 @@ , pyserial , pytestCheckHook , pythonOlder +, six }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; pythonImportsCheck = [ From a69da8d55e184ee7feb62ace1fab3cdb4fe8fb66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:45:41 +0200 Subject: [PATCH 185/314] python310Packages.validictory: disable --- pkgs/development/python-modules/validictory/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index 29ffb76591ef..c4172079a607 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchPypi }: @@ -7,6 +8,8 @@ buildPythonPackage rec { pname = "validictory"; version = "1.1.2"; + disabled = pythonAtLeast "3.10"; # abandoned, should be removed when we move to py310/311 + src = fetchPypi { inherit pname version; sha256 = "1fim11vj990rmn59qd67knccjx1p4an7gavbgprpabsrb13bi1rs"; From a9ca307b73a8cd84ce672b1c5f107ee044168c2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 23:50:13 +0200 Subject: [PATCH 186/314] python3Packages.flake8-blind-except: propagate pycodestyle --- .../python-modules/flake8-blind-except/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index ee3f46d078ca..c25985e16819 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, pycodestyle , pythonOlder }: @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-8lpXWp3LPus8dgv5wi22C4taIxICJO0fqppD913X3RY="; }; + propagatedBuildInputs = [ + pycodestyle + ]; + # Module has no tests doCheck = false; From 7994e287ea8638dda95fd57617e485277ecbbf31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 01:07:58 +0200 Subject: [PATCH 187/314] python3Packages.sqlalchemy: 1.4.33 -> 1.4.34 --- 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 f42794abcc2a..a3e2800f37af 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.33"; + version = "1.4.34"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hHR9HMSCMoW4JTo0UTFipmTUmJIXRh4REJdEa5iAO/w="; + sha256 = "sha256-YjusLWvco/PmHPHhxGbF+59c8Ic1c27hERGHt6QQiJE="; }; propagatedBuildInputs = [ From 8e64a0c0d8f32468212f24768e371c611f0e873c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 04:07:01 +0200 Subject: [PATCH 188/314] python3Packages.wasm: disable --- pkgs/development/python-modules/wasm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/wasm/default.nix b/pkgs/development/python-modules/wasm/default.nix index f6c2cc42e387..adc3c958bee1 100644 --- a/pkgs/development/python-modules/wasm/default.nix +++ b/pkgs/development/python-modules/wasm/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchPypi +, pythonAtLeast , lib }: @@ -7,6 +8,8 @@ buildPythonPackage rec { pname = "wasm"; version = "1.2"; + disabled = pythonAtLeast "3.10"; # project is abandoned, remove we whe move to py310/311 + src = fetchPypi { inherit pname version; sha256 = "179xcinfc35xgk0bf9y58kwxzymzk7c1p58w6khmqfiqvb91j3r8"; From c4b104a8508dfccf4792670b3086db5776701702 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 04:12:30 +0200 Subject: [PATCH 189/314] python310Packages.py-radix: disable --- pkgs/development/python-modules/py-radix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index 18fff5ec97f6..f4b064d41aac 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub , coverage , nose @@ -9,6 +10,8 @@ buildPythonPackage rec { pname = "py-radix"; version = "0.10.0"; + disabled = pythonAtLeast "3.10"; # abandoned, remove when we move to py310/py311 + src = fetchFromGitHub { owner = "mjschultz"; repo = "py-radix"; From 90161bca631b7b426173e7bf7926c45cb724ab7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 04:22:28 +0200 Subject: [PATCH 190/314] python3Packages.reedsolo: use git tag --- pkgs/development/python-modules/reedsolo/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index d9dd54e29f43..b219a7b23e97 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -8,9 +8,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = "reedsolomon"; - # https://github.com/tomerfiliba/reedsolomon/issues/28 - rev = "73926cdf81b39009bd6e46c8d49f3bbc0eaad4e4"; - sha256 = "03wrr0c32dsl7h9k794b8fwnyzklvmxgriy49mjvvd3val829cc1"; + rev = "v${version}"; + hash = "sha256-GUMdL5HclXxqMYasq9kUE7fCqOkjr1D20wjd/E+xPBk="; }; nativeBuildInputs = [ cython ]; From b801565f228550894c61071dbf253f8caf65706a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 04:22:47 +0200 Subject: [PATCH 191/314] python3Packages.reedsolo: python 3.10 compat --- .../python-modules/reedsolo/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index b219a7b23e97..44e2c3b9b449 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cython, nose }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, cython +, nose +}: buildPythonPackage rec { pname = "reedsolo"; @@ -12,6 +18,14 @@ buildPythonPackage rec { hash = "sha256-GUMdL5HclXxqMYasq9kUE7fCqOkjr1D20wjd/E+xPBk="; }; + patches = [ + (fetchpatch { + # python3.10 compat; https://github.com/tomerfiliba/reedsolomon/pull/38 + url = "https://github.com/tomerfiliba/reedsolomon/commit/63e5bd9fc3ca503990c212eb2c77c10589e6d6c3.patch"; + hash = "sha256-47g+jUsJEAyqGnlzRA1oSyc2XFPUOfH0EW+vcOJzsxI="; + }) + ]; + nativeBuildInputs = [ cython ]; checkInputs = [ nose ]; From 4d62358894717bf75d63ce2f47b2d6d327c85dc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 04:30:27 +0200 Subject: [PATCH 192/314] python3Packages.flask-paranoid: disable failing tests --- pkgs/development/python-modules/flask-paranoid/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix index 787b34a93b37..7668cfe271ef 100644 --- a/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/pkgs/development/python-modules/flask-paranoid/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { flask ]; + doCheck = false; # all tests are failing; https://github.com/miguelgrinberg/flask-paranoid/issues/10 + checkInputs = [ pytestCheckHook ]; From 935ec0a8356345ad0318bbb466611c52de0dca87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 06:21:16 +0200 Subject: [PATCH 193/314] python3Packages.flask-security-too: split off extra-requires --- .../flask-security-too/default.nix | 95 +++++++++++++------ 1 file changed, 64 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index e88556c07d02..f192673ad47c 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -1,29 +1,44 @@ { lib , buildPythonPackage , fetchPypi -, flask -, blinker -, setuptools -, itsdangerous -, flask_principal -, passlib -, email_validator -, flask_wtf -, flask_login -, pytestCheckHook + +# extras: babel +, Babel +, flask-babel + +# extras: common +, bcrypt +, bleach , flask_mail -, sqlalchemy + +# extras: fsqla , flask_sqlalchemy +, sqlalchemy +, sqlalchemy-utils + +# extras: mfa +, cryptography +, phonenumbers +, pyqrcode + +# propagates +, blinker +, email_validator +, flask +, flask_login +, flask_principal +, flask_wtf +, itsdangerous +, passlib + +# tests , flask-mongoengine +, mongoengine +, mongomock , peewee , pony +, pytestCheckHook , zxcvbn -, mongoengine -, cryptography -, pyqrcode -, phonenumbers -, bleach -, mongomock }: buildPythonPackage rec { @@ -37,33 +52,51 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + blinker + email_validator flask flask_login flask_principal flask_wtf - email_validator itsdangerous passlib - blinker - setuptools ]; + passthru.extras-require = { + babel = [ + Babel + flask-babel + ]; + common = [ + bcrypt + bleach + flask_mail + ]; + fsqla = [ + flask_sqlalchemy + sqlalchemy + sqlalchemy-utils + ]; + mfa = [ + cryptography + phonenumbers + pyqrcode + ]; + }; + checkInputs = [ - pytestCheckHook - flask_mail - sqlalchemy - flask_sqlalchemy flask-mongoengine + mongoengine + mongomock peewee pony + pytestCheckHook zxcvbn - mongoengine - cryptography - pyqrcode - phonenumbers - bleach - mongomock - ]; + ] + ++ passthru.extras-require.babel + ++ passthru.extras-require.common + ++ passthru.extras-require.fsqla + ++ passthru.extras-require.mfa; pythonImportsCheck = [ "flask_security" ]; From 349e9dae04d7ac17a5d3b102b07e594a82db3ee7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 06:21:49 +0200 Subject: [PATCH 194/314] python3Packages.flask-security-too: disable tests incompatible with flask>=2.1.0 --- .../flask-security-too/default.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index f192673ad47c..88fd2da77d72 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -98,6 +98,29 @@ buildPythonPackage rec { ++ passthru.extras-require.fsqla ++ passthru.extras-require.mfa; + disabledTests = [ + # flask 2.1.0 incompatibilities https://github.com/Flask-Middleware/flask-security/issues/594 + "test_admin_setup_reset" + "test_authn_freshness" + "test_authn_freshness_nc" + "test_bad_sender" + "test_change_invalidates_auth_token" + "test_change_invalidates_session" + "test_default_authn_bp" + "test_default_unauthn" + "test_default_unauthn_bp" + "test_email_not_identity" + "test_next" + "test_post_security_with_application_root" + "test_post_security_with_application_root_and_views" + "test_recover_invalidates_session" + "test_two_factor_flag" + "test_unauthorized_access_with_referrer" + "test_verify" + "test_verify_link" + "test_view_configuration" + ]; + pythonImportsCheck = [ "flask_security" ]; meta = with lib; { From 27c0f6efa9203b1a8ad52f2dfee294dd90962f7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 05:43:08 +0200 Subject: [PATCH 195/314] Revert "python3Packages.regex: 2022.3.2 -> 2022.3.15" This reverts commit 1be45287bdedb40f3d070733dc5975f64341c9c9. Completely breaks dateparser. --- 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 829dd9e7e6a1..512a7162f0e3 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.3.15"; + version = "2022.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Cnt1zHu0zAM0OABT5GccVg4xJyydLVpsS46a4sm9D4I="; + hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs="; }; checkPhase = '' From 9628bac854169e9a4ec264910b52bede30176eb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 05:51:22 +0200 Subject: [PATCH 196/314] python3Packages.dateparser: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/dateparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 467ed5184c11..7f92077c0c73 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.0"; + version = "1.1.1"; disabled = !isPy3k; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; rev = "v${version}"; - sha256 = "sha256-RpQWDsj7vGtfu6wf4yETdswfXDfoTkburTl6aOA03Ww="; + sha256 = "sha256-bDup3q93Zq+pvwsy/lQy2byOMjG6C/+7813hWQMbZRU="; }; propagatedBuildInputs = [ From dc9fdf545cd3f9e723a164632215bf45016ff73f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 06:11:10 +0200 Subject: [PATCH 197/314] python3Packages.pympler: disable failing test --- pkgs/development/python-modules/pympler/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 4f132ad2c827..6fc917981a7f 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { @@ -12,9 +13,15 @@ buildPythonPackage rec { sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa"; }; - postPatch = '' - rm test/asizeof/test_asizeof.py - ''; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # 'AssertionError: 'function (test.muppy.test_summary.func)' != 'function (muppy.test_summary.func)' + # https://github.com/pympler/pympler/issues/134 + "test_repr_function" + ]; doCheck = stdenv.hostPlatform.isLinux; From 4c3a954438cc157d8e0be81e2d86eec1b888da4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 16:02:55 +0200 Subject: [PATCH 198/314] python3Packages.numpydoc: relax jinja2 constraint, disable failing tests --- .../python-modules/numpydoc/default.nix | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 9d0c1b09e20b..b770ac26fbd7 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -1,13 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 , jinja2 -, nose -, pytest , sphinx +, pytestCheckHook +, matplotlib }: buildPythonPackage rec { pname = "numpydoc"; version = "1.2.1"; + format = "setuptools"; + disabled = isPy27; src = fetchPypi { @@ -16,8 +21,34 @@ buildPythonPackage rec { sha256 = "sha256-fOgm7Q1Uw/3JCXmSqNc6TUWdxGhhE1HGjkRP7ESkWvY="; }; - checkInputs = [ nose pytest ]; - propagatedBuildInputs = [ sphinx jinja2 ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "Jinja2>=2.10,<3.1" "Jinja2>=2.10,<3.2" + substituteInPlace setup.cfg \ + --replace "--cov-report=" "" \ + --replace "--cov=numpydoc" "" + ''; + + propagatedBuildInputs = [ + jinja2 + sphinx + ]; + + checkInputs = [ + matplotlib + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/numpy/numpydoc/issues/373 + "test_MyClass" + "test_my_function" + "test_reference" + ]; + + pythonImportsCheck = [ + "numpydoc" + ]; meta = { description = "Sphinx extension to support docstrings in Numpy format"; From 67579d12adfc21cb8b50e499f2f90376e890f924 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Apr 2022 17:42:54 +0200 Subject: [PATCH 199/314] python3Packages.fn: patch for python3.10 compat --- .../development/python-modules/fn/default.nix | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix index f64d1a3d122d..0acdf24d9542 100644 --- a/pkgs/development/python-modules/fn/default.nix +++ b/pkgs/development/python-modules/fn/default.nix @@ -1,20 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +}: buildPythonPackage rec { pname = "fn"; version = "0.4.3"; - meta = { + src = fetchPypi { + inherit pname version; + sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/kachayev/fn.py/commit/a54fc0bd8aeae277de2db726131d249ce607c0c2.patch"; + hash = "sha256-I0ZISOgVibsc1k7gwSfeW6qV9PspQqdaHlRLr/IusQ8="; + excludes = [ + "fn/monad.py" + ]; + }) + ]; + + meta = with lib; { description = '' Functional programming in Python: implementation of missing features to enjoy FP ''; homepage = "https://github.com/kachayev/fn.py"; - license = lib.licenses.asl20; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq"; + license = licenses.asl20; }; } From 1a22bd129a7a4d61d8c490d16d262e8244e95d1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 02:57:49 +0200 Subject: [PATCH 200/314] python3Packages.importlib-resources: use pyproject format --- pkgs/development/python-modules/importlib-resources/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 869762bec85e..61fb5be068d3 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "importlib-resources"; version = "5.6.0"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { From d744db51bc6e497f128094df7b0bc77633b46cc9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 02:58:45 +0200 Subject: [PATCH 201/314] python3Packages.nunavut: propagate importlib-resources --- pkgs/development/python-modules/nunavut/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index fef36f87ab39..4cfce289917a 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, importlib-resources , pydsdl , pyyaml }: @@ -18,6 +19,7 @@ }; propagatedBuildInputs = [ + importlib-resources pydsdl pyyaml ]; From dd0dd6a6d0793dcf9d327ffd578c08ea77ea7496 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 03:02:12 +0200 Subject: [PATCH 202/314] python3Packages.ovh: propagate requests --- .../python-modules/ovh/default.nix | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 74f341038b18..b9ab287260d6 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -1,20 +1,45 @@ { lib , buildPythonPackage , fetchPypi +, mock +, nose +, requests +, yanc }: buildPythonPackage rec { pname = "ovh"; version = "1.0.0"; - - # Needs yanc - doCheck = false; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "sha256-IQzwu0gwfPNPOLQLCO99KL5Hu2094Y+acQBFXVGzHhU="; }; + propagatedBuildInputs = [ + requests + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = [ + mock + nose + yanc + ]; + + # requires network + checkPhase = '' + nosetests . \ + -e test_config_get_conf \ + -e test_config_get_custom_conf \ + -e test_endpoints \ + -e test_init_from_custom_config + ''; + meta = { description = "Thin wrapper around OVH's APIs"; homepage = "https://github.com/ovh/python-ovh"; From ccc1ddd231f96d43d93eb400afddc229767613d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 03:07:04 +0200 Subject: [PATCH 203/314] python3Packaegs.pyspark: update py4j pin relaxation --- pkgs/development/python-modules/pyspark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index c424e3195e7d..6acc5b3bf92f 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i "s/'pypandoc'//" setup.py substituteInPlace setup.py \ - --replace py4j==0.10.9.2 'py4j>=0.10.9,<0.11' + --replace py4j==0.10.9.3 'py4j>=0.10.9,<0.11' ''; propagatedBuildInputs = [ From 32b8c9e7b96de613f245f93bce8c8923db680720 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 03:14:28 +0200 Subject: [PATCH 204/314] python3Packages.django-modelcluster: rename, fix build, enable tests --- .../django_modelcluster/default.nix | 36 ++++++++++++++----- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 989f9f9981b0..02995c1570b9 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -1,25 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, django +, django-taggit , pytz , pythonOlder -, six +, python }: buildPythonPackage rec { pname = "django-modelcluster"; version = "6.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-zc/+9br103We4ExbYP+vGgyV/A8mXnYvPd+t3jOU5ds="; - }; + format = "setuptools"; disabled = pythonOlder "3.5"; - doCheck = false; + src = fetchFromGitHub { + owner = "wagtail"; + repo = pname; + rev = "v${version}"; + hash = "sha256-p6hvOkPWRVJYLHvwyn9nS05wblikRFmlSYZuLiCcuqc="; + }; - propagatedBuildInputs = [ pytz six ]; + propagatedBuildInputs = [ + django + pytz + ]; + + passthru.extras-require.taggit = [ + django-taggit + ]; + + checkInputs = passthru.extras-require.taggit; + + checkPhase = '' + runHook preCheck + ${python.interpreter} ./runtests.py --noinput + runHook postCheck + ''; meta = with lib; { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3b5f95c84b80..9e5c59674720 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ django_appconf = django-appconf; # added 2022-03-03 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 + django_modelcluster = django-modelcluster; # added 2022-04-02 django_redis = django-redis; # added 2021-10-11 django_taggit = django-taggit; # added 2021-10-11 dns = dnspython; # added 2017-12-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d94b33bfa215..4310388003c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2293,7 +2293,7 @@ in { django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; - django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + django-modelcluster = callPackage ../development/python-modules/django_modelcluster { }; django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; From 280d3f06e9bceb369a477f288971fefb520d2ce9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 03:41:32 +0200 Subject: [PATCH 205/314] python3Packaegs.sphinx_rtd_theme: update docutils pin relaxation --- pkgs/development/python-modules/sphinx_rtd_theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 1d890de94f70..d0c9a3883aff 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "docutils<0.17" "docutils" + --replace "docutils<0.18" "docutils" ''; preBuild = '' From 45e30be21ad53fddbe1f0f0dc466fa7e94972712 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 03:42:46 +0200 Subject: [PATCH 206/314] python3Packages.clize: relax docutils constraint, set up extras-require --- .../python-modules/clize/default.nix | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 75c4513d1e3a..10b4c8f68c69 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,12 +1,18 @@ { lib , buildPythonPackage , fetchPypi -, python-dateutil + +# propagtes , sigtools , six , attrs , od , docutils + +# extras: datetime +, python-dateutil + +# tests , pygments , unittest2 , pytestCheckHook @@ -21,6 +27,25 @@ buildPythonPackage rec { sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "docutils ~= 0.17.0" "docutils" + ''; + + propagatedBuildInputs = [ + attrs + docutils + od + sigtools + six + ]; + + passthru.extras-require = { + datetime = [ + python-dateutil + ]; + }; + # repeated_test no longer exists in nixpkgs # also see: https://github.com/epsy/clize/issues/74 doCheck = false; @@ -31,14 +56,6 @@ buildPythonPackage rec { unittest2 ]; - propagatedBuildInputs = [ - attrs - docutils - od - sigtools - six - ]; - pythonImportsCheck = [ "clize" ]; meta = with lib; { From 2e4bb34c632b93921042816be0d892d2c9d8d4d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 05:26:32 +0200 Subject: [PATCH 207/314] python3Packages.dugong: disable tests on python310 --- pkgs/development/python-modules/dugong/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 5130ea3b0043..190411b5333c 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonAtLeast , pytestCheckHook }: @@ -21,6 +22,10 @@ buildPythonPackage rec { pytestCheckHook ]; + # Lots of tests hang during teardown with: + # ssl.SSLEOFError: EOF occurred in violation of protocol (_ssl.c:2396) + doCheck = pythonOlder "3.10"; + pythonImportsCheck = [ "dugong" ]; meta = with lib; { From 008fbda841b9b008de6583bc40d5543dae9755f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 06:16:42 +0200 Subject: [PATCH 208/314] python3Packages.pytest-xdist: fix hook being applied multiple times --- pkgs/development/python-modules/pytest-xdist/setup-hook.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 8bba79ca3360..877fcf26d0cf 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -1,7 +1,10 @@ pytestXdistHook() { - pytestFlagsArray+=("--numprocesses=$NIX_BUILD_CORES" "--forked" ) + pytestFlagsArray+=( + "--numprocesses=$NIX_BUILD_CORES" + "--forked" + ) } if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - addEnvHooks "$hostOffset" pytestXdistHook + preDistPhases+=" pytestXdistHook" fi From 3467f4e89524549f11fdb4160da874922cfb19df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 18:32:10 +0200 Subject: [PATCH 209/314] python3Packages.moto: update disabled tests, drop xdist Dropping pytest-xdist due to reproducible hangs at the end of the test run. --- .../python-modules/moto/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 857b580f980d..7f3251a6cc22 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -71,14 +71,11 @@ buildPythonPackage rec { checkInputs = [ freezegun - pytest-xdist pytestCheckHook sure ]; pytestFlagsArray = [ - "--numprocesses $NIX_BUILD_CORES" - # Disable tests that try to access the network "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" @@ -92,9 +89,24 @@ buildPythonPackage rec { "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" + "--deselect=tests/test_iotdata/test_iotdata.py::test_update" + "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" + "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" + "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" + "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + + # AssertionError: CloudWatch log event was not found. + "--deselect=tests/test_logs/test_integration.py::test_subscription_filter_applies_to_new_streams" + + # KeyError: 'global' + "--deselect=tests/test_iotdata/test_server.py::test_iotdata_list" + "--deselect=tests/test_iotdata/test_server.py::test_publish" + + # Blocks test execution + "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_load_data_from_inmemory_client" ]; disabledTestPaths = [ From 0822ef73055798f6eae5cda61562e54d796700a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 18:47:34 +0200 Subject: [PATCH 210/314] python3Packages.flask-paranoid: 0.2 -> 0.3.0 --- pkgs/development/python-modules/flask-paranoid/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix index 7668cfe271ef..8de346593efb 100644 --- a/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/pkgs/development/python-modules/flask-paranoid/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "flask-paranoid"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = pname; rev = "v${version}"; - sha256 = "0WWc/ktAOuTk4A75xI1jCj/aef2+1TjLKBA9+PRfJO0="; + sha256 = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4="; }; postPatch = '' @@ -25,8 +25,6 @@ buildPythonPackage rec { flask ]; - doCheck = false; # all tests are failing; https://github.com/miguelgrinberg/flask-paranoid/issues/10 - checkInputs = [ pytestCheckHook ]; From 72f9e7ced48ac268c82dd2768a495d694d78c2dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Apr 2022 23:44:52 +0200 Subject: [PATCH 211/314] python3Packages.pandas: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 90309ef0b402..1d0a50f71ab5 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jbk+yYrHy1+KwUIMEPXjxDUzFT8lP+f7bYkc9aorgNI="; + sha256 = "sha256-krwfxYXxRjyoJ7RVNZV4FbfeshjFSbfBhALDIsdUmhI="; }; nativeBuildInputs = [ cython ]; From c994f0ed6354628a5e834f818692a79a79467e6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Apr 2022 04:05:20 +0200 Subject: [PATCH 212/314] python3Packages.funcparserlib: add six to check deps --- pkgs/development/python-modules/funcparserlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index 3ace04b108d4..ba535146cf25 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -6,6 +6,7 @@ , python , pytestCheckHook , pythonOlder +, six }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + six ]; patches = [ From 04cc709898d1f542404283f4811c0cc430c3427b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Apr 2022 04:12:07 +0200 Subject: [PATCH 213/314] python3Packages.httplib2: drop xdist, prone to race conditions --- pkgs/development/python-modules/httplib2/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 9fc6b4ff1440..6c1304ec9518 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -9,7 +9,6 @@ , pytest-forked , pytest-randomly , pytest-timeout -, pytest-xdist , pytestCheckHook , six }: @@ -36,7 +35,6 @@ buildPythonPackage rec { pytest-forked pytest-randomly pytest-timeout - pytest-xdist six pytestCheckHook ]; From 8502ec56ec039186eabbb8f97653092fcb16b55e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Apr 2022 16:23:33 +0200 Subject: [PATCH 214/314] python3Packages.pylint: 2.13.3 -> 2.13.4 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 4f6824381b24..f44615df18b1 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.13.3"; + version = "2.13.4"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m/wmds95+DGHHJvBHU+icFtXUmY7qI+Ga9YmSQagFoc="; + sha256 = "sha256-CMbw6D6szQvur+13halZrskSV/9rDaThMGLeGxfjqWo="; }; nativeBuildInputs = [ From 46111b2bcd4e107f08c70346c1de7314650e3059 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Apr 2022 22:51:33 +0200 Subject: [PATCH 215/314] python3Packages.flask-restful: apply patch for werkzeug 2.1.0 compat Based on https://github.com/python-restx/flask-restx/pull/423. --- .../python-modules/flask-restful/default.nix | 4 + .../flask-restful/werkzeug-2.1.0-compat.patch | 114 ++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 pkgs/development/python-modules/flask-restful/werkzeug-2.1.0-compat.patch diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index db7a63c5ed4a..1af875d4bbc5 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -20,6 +20,10 @@ buildPythonPackage rec { sha256 = "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c"; }; + patches = [ + ./werkzeug-2.1.0-compat.patch + ]; + propagatedBuildInputs = [ aniso8601 flask diff --git a/pkgs/development/python-modules/flask-restful/werkzeug-2.1.0-compat.patch b/pkgs/development/python-modules/flask-restful/werkzeug-2.1.0-compat.patch new file mode 100644 index 000000000000..c8707b239435 --- /dev/null +++ b/pkgs/development/python-modules/flask-restful/werkzeug-2.1.0-compat.patch @@ -0,0 +1,114 @@ +Fixes compatibility with Werkzeug 2.1.0 ported over from flask-restx#423. + +https://github.com/python-restx/flask-restx/pull/423 + +diff --git a/flask_restful/reqparse.py b/flask_restful/reqparse.py +index 9bb3099..5c59594 100644 +--- a/flask_restful/reqparse.py ++++ b/flask_restful/reqparse.py +@@ -114,7 +114,10 @@ class Argument(object): + :param request: The flask request object to parse arguments from + """ + if isinstance(self.location, six.string_types): +- value = getattr(request, self.location, MultiDict()) ++ if self.location in {"json", "get_json"}: ++ value = request.get_json(silent=True) ++ else: ++ value = getattr(request, self.location, MultiDict()) + if callable(value): + value = value() + if value is not None: +@@ -122,7 +125,10 @@ class Argument(object): + else: + values = MultiDict() + for l in self.location: +- value = getattr(request, l, None) ++ if l in {"json", "get_json"}: ++ value = request.get_json(silent=True) ++ else: ++ value = getattr(request, l, None) + if callable(value): + value = value() + if value is not None: +diff --git a/tests/test_api.py b/tests/test_api.py +index 15f12eb..9a9cceb 100644 +--- a/tests/test_api.py ++++ b/tests/test_api.py +@@ -936,7 +936,7 @@ class APITestCase(unittest.TestCase): + app = app.test_client() + resp = app.get('/api') + self.assertEqual(resp.status_code, 302) +- self.assertEqual(resp.headers['Location'], 'http://localhost/') ++ self.assertEqual(resp.headers['Location'], '/') + + def test_json_float_marshalled(self): + app = Flask(__name__) +diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py +index 1d75e40..e5c586b 100644 +--- a/tests/test_reqparse.py ++++ b/tests/test_reqparse.py +@@ -23,8 +23,9 @@ class ReqParseTestCase(unittest.TestCase): + with app.app_context(): + parser = RequestParser() + parser.add_argument('foo', choices=('one', 'two'), help='Bad choice: {error_msg}') +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', 'three')]) ++ req.get_json.return_value = None + parser.parse_args(req) + expected = {'foo': 'Bad choice: three is not a valid choice'} + abort.assert_called_with(400, message=expected) +@@ -35,8 +36,9 @@ class ReqParseTestCase(unittest.TestCase): + with app.app_context(): + parser = RequestParser() + parser.add_argument('foo', choices=('one', 'two'), help=u'Bad choice: {error_msg}') +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', u'\xf0\x9f\x8d\x95')]) ++ req.get_json.return_value = None + parser.parse_args(req) + expected = {'foo': u'Bad choice: \xf0\x9f\x8d\x95 is not a valid choice'} + abort.assert_called_with(400, message=expected) +@@ -47,8 +49,9 @@ class ReqParseTestCase(unittest.TestCase): + with app.app_context(): + parser = RequestParser() + parser.add_argument('foo', choices=['one', 'two'], help='Please select a valid choice') +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', 'three')]) ++ req.get_json.return_value = None + parser.parse_args(req) + expected = {'foo': 'Please select a valid choice'} + abort.assert_called_with(400, message=expected) +@@ -58,8 +61,9 @@ class ReqParseTestCase(unittest.TestCase): + def bad_choice(): + parser = RequestParser() + parser.add_argument('foo', choices=['one', 'two']) +- req = Mock(['values']) ++ req = Mock(["values", "get_json"]) + req.values = MultiDict([('foo', 'three')]) ++ req.get_json.return_value = None + parser.parse_args(req) + abort.assert_called_with(400, message='three is not a valid choice') + app = Flask(__name__) +@@ -190,7 +194,8 @@ class ReqParseTestCase(unittest.TestCase): + self.assertTrue(len(arg.source(req)) == 0) # yes, basically you don't find it + + def test_source_default_location(self): +- req = Mock(['values']) ++ req = Mock(['values', 'get_json']) ++ req.get_json.return_value = None + req._get_child_mock = lambda **kwargs: MultiDict() + arg = Argument('foo') + self.assertEqual(arg.source(req), req.values) +@@ -215,8 +220,9 @@ class ReqParseTestCase(unittest.TestCase): + args = parser.parse_args(req) + self.assertEqual(args['foo'], "bar") + +- req = Mock() ++ req = Mock(['get_json']) + req.values = () ++ req.get_json.return_value = None + req.json = None + req.view_args = {"foo": "bar"} + parser = RequestParser() From cce35dad7ab540adec0fb7cb3454647ddf91a089 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Apr 2022 23:15:12 +0200 Subject: [PATCH 216/314] python3Packages.httpbin: apply patch for werkzeug 2.1.0 compatibility --- pkgs/development/python-modules/httpbin/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 8359fcf0a096..a5a77a82af29 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -2,6 +2,7 @@ , brotlipy , buildPythonPackage , decorator +, fetchpatch , fetchPypi , flask , flask-limiter @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; }; + patches = [ + (fetchpatch { + # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility + # https://github.com/postmanlabs/httpbin/pull/674 + url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; + hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; + }) + ]; + propagatedBuildInputs = [ brotlipy flask From 5279d5ebc4eff52403201334827e2bd65eba4bb7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 4 Apr 2022 00:27:33 +0100 Subject: [PATCH 217/314] python3Packages.asgiref: fix tests on darwin our macos sdk version doesn't have SOCK_NONBLOCK --- pkgs/development/python-modules/asgiref/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index d0d32168574e..2ea9f4130f97 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -6,6 +6,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, fetchpatch }: buildPythonPackage rec { @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "sha256-eWDsd8iWK1C/X3t/fKAM1i4hyTM/daGTd8CDSgDTL/U="; }; + patches = [ + (fetchpatch { + name = "remove-sock-nonblock-in-tests.patch"; + url = "https://github.com/django/asgiref/commit/d451a724c93043b623e83e7f86743bbcd9a05c45.patch"; + sha256 = "0whdsn5isln4dqbqqngvsy4yxgaqgpnziz0cndj1zdxim8cdicj7"; + }) + ]; + propagatedBuildInputs = [ async-timeout ]; From 26122503115d906c951e40a827f21f54c996d537 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 4 Apr 2022 00:43:14 +0100 Subject: [PATCH 218/314] python3Packages.ephemeral-port-reserve: skip test_fqdn on darwin --- .../python-modules/ephemeral-port-reserve/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index ff0eab1aa059..0af57945073f 100644 --- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -23,6 +24,11 @@ buildPythonPackage { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # can't find hostname in our darwin build environment + "test_fqdn" + ]; + pythonImportsCheck = [ "ephemeral_port_reserve" ]; From 4775c308fa481128d971fd9f15313ebaf6aeb76c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Apr 2022 23:20:31 +0200 Subject: [PATCH 219/314] pytest-httpbin: drop assertion that doesn't hold anymore In Flask 2.1.0 Location headers were made relative and alot of packages still assume absolute values. That breaks the assertion, so we drop it. --- pkgs/development/python-modules/pytest-httpbin/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 0069eb6f179e..7dc70c49280f 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { six ]; + preCheck = '' + # Remove assertion that doesn't hold for Flask 2.1.0 + substituteInPlace tests/test_server.py \ + --replace "assert response.headers['Location'].startswith('https://')" "" + ''; + checkInputs = [ pytestCheckHook requests From 1e38fae01e13a2257722feadc81fad79cf05276e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 16:44:20 +0200 Subject: [PATCH 220/314] python39Packages.ipython: remove optional black depedency, update homepage Black should be updatable without a mass rebuild --- pkgs/development/python-modules/ipython/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 4d2e54827fe9..0a39950689df 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -10,7 +10,6 @@ # Runtime dependencies , appnope , backcall -, black , decorator , jedi , matplotlib-inline @@ -43,7 +42,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ backcall - black decorator jedi matplotlib-inline @@ -83,7 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; From 334fb0c7ed3e2e2446b5fe52c8b2e9747e6da509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 16:44:53 +0200 Subject: [PATCH 221/314] python39Packages.typer: remove linting programs --- pkgs/development/python-modules/typer/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 6aa663b0cc20..9ef2b53b9470 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -10,9 +10,6 @@ , pytest-xdist , pytest-sugar , coverage -, mypy -, black -, isort , pythonOlder }: @@ -41,10 +38,7 @@ buildPythonPackage rec { pytest-xdist pytest-sugar shellingham - coverage - mypy - black - isort + coverage # execs coverage in tests ]; preCheck = '' From 00f38e1a832f8b2e39f63f34e7ded26058ed8dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 16:43:53 +0200 Subject: [PATCH 222/314] python39Packages.hypothesmith: remove linting programs --- .../python-modules/hypothesmith/default.nix | 31 ++++++- .../hypothesmith/remove-black.patch | 88 +++++++++++++++++++ 2 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/hypothesmith/remove-black.patch diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 33174deb6573..ae02a076bafb 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, hypothesis, lark, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, lark +, libcst +, parso +, pytestCheckHook +, pytest-xdist +}: buildPythonPackage rec { pname = "hypothesmith"; @@ -9,19 +18,35 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; + patches = [ + ./remove-black.patch + ]; + postPatch = '' - substituteInPlace setup.py --replace "lark-parser" "lark" + substituteInPlace setup.py \ + --replace "lark-parser" "lark" + + substituteInPlace tox.ini \ + --replace "--cov=hypothesmith" "" \ + --replace "--cov-branch" "" \ + --replace "--cov-report=term-missing:skip-covered" "" \ + --replace "--cov-fail-under=100" "" ''; propagatedBuildInputs = [ hypothesis lark libcst ]; - checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; + checkInputs = [ parso pytestCheckHook pytest-xdist ]; pytestFlagsArray = [ "-v" "--numprocesses $NIX_BUILD_CORES" ]; + disabledTests = [ + # https://github.com/Zac-HD/hypothesmith/issues/21 + "test_source_code_from_libcst_node_type" + ]; + 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 new file mode 100644 index 000000000000..565f350b06b4 --- /dev/null +++ b/pkgs/development/python-modules/hypothesmith/remove-black.patch @@ -0,0 +1,88 @@ +diff --git a/tests/test_cst.py b/tests/test_cst.py +index c436183..bdba2d7 100644 +--- a/tests/test_cst.py ++++ b/tests/test_cst.py +@@ -3,7 +3,6 @@ import ast + from inspect import isabstract + from operator import attrgetter + +-import black + import libcst + import parso + import pytest +@@ -51,27 +50,6 @@ def test_ast_unparse_from_nodes(source_code): + assert ast.dump(first) == ast.dump(second) + + +-@pytest.mark.xfail +-@example("A\u2592", black.FileMode()) +-@given( +- source_code=hypothesmith.from_node(), +- mode=st.builds( +- black.FileMode, +- line_length=st.just(88) | st.integers(0, 200), +- string_normalization=st.booleans(), +- is_pyi=st.booleans(), +- ), +-) +-def test_black_autoformatter_from_nodes(source_code, mode): +- try: +- result = black.format_file_contents(source_code, fast=False, mode=mode) +- except black.NothingChanged: +- pass +- else: +- with pytest.raises(black.NothingChanged): +- black.format_file_contents(result, fast=False, mode=mode) +- +- + @given(source_code=hypothesmith.from_node()) + 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 +--- a/tests/test_syntactic.py ++++ b/tests/test_syntactic.py +@@ -3,8 +3,6 @@ import ast + import io + import tokenize + +-import black +-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): + assert ast.dump(first) == ast.dump(second) + + +-@example("\\", black.FileMode()) +-@example("A#\r#", black.FileMode()) +-@given( +- source_code=hypothesmith.from_grammar(), +- mode=st.builds( +- black.FileMode, +- line_length=st.just(88) | st.integers(0, 200), +- string_normalization=st.booleans(), +- is_pyi=st.booleans(), +- ), +-) +-def test_black_autoformatter_from_grammar(source_code, mode): +- try: +- result = black.format_file_contents(source_code, fast=False, mode=mode) +- except black.NothingChanged: +- pass +- except blib2to3.pgen2.tokenize.TokenError: +- # Fails to tokenise e.g. "\\", though compile("\\", "", "exec") works. +- # See https://github.com/psf/black/issues/1012 +- reject() +- except black.InvalidInput: +- # e.g. "A#\r#", see https://github.com/psf/black/issues/970 +- reject() +- else: +- with pytest.raises(black.NothingChanged): +- black.format_file_contents(result, fast=False, mode=mode) +- +- + @given(source_code=hypothesmith.from_grammar("eval_input")) + def test_eval_input_generation(source_code): + compile(source_code, filename="", mode="eval") From 41d6a4e19cc5c3674db091469e87429f504a5fc8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 05:29:10 +0200 Subject: [PATCH 223/314] python3Packages.ipykernel: 6.11.0 -> 6.12.1 --- .../python-modules/ipykernel/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index e406b2f3594b..d7302eaaecb2 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -3,35 +3,37 @@ , callPackage , fetchPypi , pythonOlder -, argcomplete , ipython , jupyter-client +, packaging +, psutil , tornado , traitlets }: buildPythonPackage rec { pname = "ipykernel"; - version = "6.11.0"; + version = "6.12.1"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZxJgRTHJYQDzJkQMEcsCPaJoGfLzS6nRyg+xY0AYNOg="; + sha256 = "sha256-CGj1VhcpreREAR+Mp9NQLcnyf39E4g8dX+5+Hytxg6E="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 postPatch = '' - substituteInPlace setup.py \ - --replace "'debugpy>=1.0.0,<2.0'," "" + sed -i "/debugpy/d" setup.py ''; propagatedBuildInputs = [ ipython jupyter-client + packaging + psutil tornado traitlets - ] ++ lib.optionals (pythonOlder "3.8") [ - argcomplete ]; # check in passthru.tests.pytest to escape infinite recursion with ipyparallel From 95f405100f188b05c4817fdb0eff7130fe29e1cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 13:43:01 +0200 Subject: [PATCH 224/314] python3Packages.botocore: 1.24.30 -> 1.24.33 --- 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 f42c7ea70abf..52b8d8d37fc1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.24.30"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.24.33"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-r0vcUe7svp/c2tvtmtWMXJE4DvMPNWACK7wu4dePCtY="; + sha256 = "sha256-6l/RgAggMKbDP6Gb8BHXKXDz7SPP/xtBQTBp4yV2gQM="; }; propagatedBuildInputs = [ From 280ec33cd21b90ce681d97f28ed72375a93b48ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 13:43:14 +0200 Subject: [PATCH 225/314] awscli: 1.22.67 -> 1.22.88 --- 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 1e82459f4c6a..1319a8b42709 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.22.67"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.88"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-ofgxL9V/jTn/itxSOLGYkAmgQXES7aVUM/vM6nWdbBc="; + hash = "sha256-fwbejwcT4piC8Zr6+ubxMd+TuF9O4icOentI2GlhYrc="; }; # https://github.com/aws/aws-cli/issues/4837 From c0a3fcdf9f368906d3bafe63b547cb0971d377c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 13:47:19 +0200 Subject: [PATCH 226/314] python3Packages.azure-core: 1.23.0 -> 1.23.1 --- pkgs/development/python-modules/azure-core/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index b11a81d148b7..4e1901c8860d 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.23.0"; + version = "1.23.1"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-pWpvcg0JSNPz5KJaX+Rt8vG3+GXDWNdOLOR9u0kmJgg="; + sha256 = "sha256-KKAd+68KaBLE4qgtFkLqMJVqlznyW8d8myO5H06mjw8="; }; propagatedBuildInputs = [ @@ -57,6 +57,8 @@ buildPythonPackage rec { "response" "request" "timeout" + "test_sync_transport_short_read_download_stream" + "test_aio_transport_short_read_download_stream" # disable 8 tests failing on some darwin machines with errors: # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' From bfea00a6039e639d733dc7151571d390912afc5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 16:04:55 +0200 Subject: [PATCH 227/314] python3Packages.azure-mgmt-core: propagate typing-extensions --- pkgs/development/python-modules/azure-mgmt-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index 6adca4c02c7a..0a65dbfb7ec8 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , azure-core +, typing-extensions }: buildPythonPackage rec { @@ -16,6 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-core + typing-extensions ]; pythonNamespaces = "azure.mgmt"; From c213165843d8c1b2ba7047ece89d1112409d00ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 16:07:16 +0200 Subject: [PATCH 228/314] python3Packages.nbconvert: propagate beautifulsoup4 --- pkgs/development/python-modules/nbconvert/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 224b4113136c..5a89210170fe 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -5,6 +5,7 @@ , glibcLocales , entrypoints , bleach +, beautifulsoup4 , mistune , nbclient , jinja2 @@ -45,7 +46,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client - defusedxml + defusedxml beautifulsoup4 (nbclient.override { doCheck = false; }) # avoid infinite recursion jupyterlab-pygments ]; From 27b5b67d9f929dd024e6caf63c518e93c5400b8c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 16:10:36 +0200 Subject: [PATCH 229/314] python3Packages.pdm-pep517: 0.12.1 -> 0.12.3 --- 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 51e46400d678..f91df4f6e5ea 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.12.1"; + version = "0.12.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-w/ms/ceDJjVijpQjUyDg9sGcvNkm6wQcRU+xJGO8dQQ="; + sha256 = "sha256-EXv7Fhm4a+s0/gCbjUGsrPeQ0fxSQMzBH2ytoVHUaIc="; }; preCheck = '' From c7fa67725a918662beb99cbbb5110f65a715db4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 22:14:32 +0200 Subject: [PATCH 230/314] python39Packages.bcrypt: remove unused dependencies --- pkgs/development/python-modules/bcrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index d6347b179046..4d0f02838fb6 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder -, cffi, pycparser, mock, pytest, py, six }: +, cffi, pytestCheckHook, six }: buildPythonPackage rec { version = "3.2.0"; @@ -11,12 +11,12 @@ buildPythonPackage rec { sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; - buildInputs = [ pycparser mock pytest py ]; - propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi; + checkInputs = [ pytestCheckHook ]; + meta = with lib; { maintainers = with maintainers; [ domenkozar ]; description = "Modern password hashing for your software and your servers"; From 0594c921f191904dd8cb014aadd6af3f521f73b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Mar 2022 10:00:23 +0200 Subject: [PATCH 231/314] python3Packages.bcrypt: add pythonImportsCheck --- .../python-modules/bcrypt/default.nix | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 4d0f02838fb6..16d059cb46d7 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,9 +1,18 @@ -{ lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder -, cffi, pytestCheckHook, six }: +{ lib +, buildPythonPackage +, isPyPy +, fetchPypi +, pythonOlder +, cffi +, pytestCheckHook +, six +}: buildPythonPackage rec { - version = "3.2.0"; pname = "bcrypt"; + version = "3.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -11,16 +20,28 @@ buildPythonPackage rec { sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; - propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; + propagatedBuildInputs = [ + six + ] ++ lib.optional (!isPyPy) [ + cffi + ]; - propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi; + propagatedNativeBuildInputs = lib.optional (!isPyPy) [ + cffi + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bcrypt" + ]; meta = with lib; { - maintainers = with maintainers; [ domenkozar ]; description = "Modern password hashing for your software and your servers"; - license = licenses.asl20; homepage = "https://github.com/pyca/bcrypt/"; + license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; }; } From d52b53fd9ea0c8a75383457a60bcf22fe3b6f5f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Apr 2022 20:35:57 +0200 Subject: [PATCH 232/314] python3.pkgs.bcrypt: fix build also use pyproject format as we're heading that direction. --- pkgs/development/python-modules/bcrypt/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 16d059cb46d7..13fb25d03714 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, setuptools , isPyPy , fetchPypi , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "bcrypt"; version = "3.2.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,13 +21,16 @@ buildPythonPackage rec { sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six - ] ++ lib.optional (!isPyPy) [ cffi ]; - propagatedNativeBuildInputs = lib.optional (!isPyPy) [ + propagatedNativeBuildInputs = [ cffi ]; From f0719291bc23766be9d266fbe2ac1c397fe856ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Apr 2022 20:33:38 +0200 Subject: [PATCH 233/314] python39Packages.cffi: move prePatch to postPatch to not break patches --- pkgs/development/python-modules/cffi/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index a65cd297f43f..22d2e87cd276 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -19,11 +19,12 @@ if isPyPy then null else buildPythonPackage rec { propagatedBuildInputs = [ pycparser ]; - prePatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # Remove setup.py impurities - substituteInPlace setup.py --replace "'-iwithsysroot/usr/include/ffi'" "" - substituteInPlace setup.py --replace "'/usr/include/ffi'," "" - substituteInPlace setup.py --replace '/usr/include/libffi' '${lib.getDev libffi}/include' + substituteInPlace setup.py \ + --replace "'-iwithsysroot/usr/include/ffi'" "" \ + --replace "'/usr/include/ffi'," "" \ + --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; # The tests use -Werror but with python3.6 clang detects some unreachable code. From 352ae0b79e526dc110858acd16d4d01bf3cd415f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Apr 2022 00:31:22 +0200 Subject: [PATCH 234/314] python39Packages.yanc: only disable tests on python >=3.5 --- pkgs/development/python-modules/yanc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 925276c0ad62..37e7d91a8098 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -4,16 +4,16 @@ buildPythonPackage rec { pname = "yanc"; version = "0.3.3"; - # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 - disabled = !(pythonOlder "3.5"); - - checkInputs = [ nose ]; - src = fetchPypi { inherit pname version; sha256 = "0z35bkk9phs40lf5061k1plhjdl5fskm0dmdikrsqi1bjihnxp8w"; }; + # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 + doCheck = pythonOlder "3.5"; + + checkInputs = [ nose ]; + checkPhase = '' nosetests . ''; From b5facab1efb476520dd62de05d3bde2e571b333c Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 6 Apr 2022 09:04:48 +0300 Subject: [PATCH 235/314] python39Packages.pytest-xdist: run xdist hook before pytestCheckPhase --- .../python-modules/pytest-xdist/setup-hook.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 877fcf26d0cf..5523a7f360f5 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -5,6 +5,14 @@ pytestXdistHook() { ) } +# 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 "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - preDistPhases+=" pytestXdistHook" + if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then + preDistPhases+=" " + preDistPhases="${preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }" + else + preDistPhases+=" pytestXdistHook" + fi fi From 9639fdbb920a200bebc144cd07a984d27c5caf8f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 5 Apr 2022 20:21:51 -0500 Subject: [PATCH 236/314] python3Packages.pycurl: re-enable tests that no longer fail --- pkgs/development/python-modules/pycurl/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 9d3319001d34..e7f3b87ad0c3 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -50,16 +50,6 @@ buildPythonPackage rec { ''; disabledTests = [ - # libcurl stopped passing the reason phrase from the HTTP status line - # https://github.com/pycurl/pycurl/issues/679 - "test_failonerror" - "test_failonerror_status_line_invalid_utf8_python3" - # bottle>=0.12.17 escapes utf8 properly, so these test don't work anymore - # https://github.com/pycurl/pycurl/issues/669 - "test_getinfo_content_type_invalid_utf8_python3" - "test_getinfo_cookie_invalid_utf8_python3" - "test_getinfo_raw_content_type_invalid_utf8" - "test_getinfo_raw_cookie_invalid_utf8" # tests that require network access "test_keyfunction" "test_keyfunction_bogus_return" From 487969790f378cb9d4e86fb72274ee4312eff3d1 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 6 Apr 2022 22:48:26 +0100 Subject: [PATCH 237/314] python3Packages.shapely: update patch to apply to 1.8.1.post1 --- .../shapely/library-paths.patch | 72 +++++++++++++------ 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index d55630be9c10..484af67ef68c 100644 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -1,8 +1,8 @@ diff --git a/shapely/geos.py b/shapely/geos.py -index 4619732..1abdb5e 100644 +index 13ab835..1abdb5e 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -55,148 +55,21 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): +@@ -55,174 +55,21 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) @@ -61,16 +61,23 @@ index 4619732..1abdb5e 100644 - -elif sys.platform == 'darwin': - # Test to see if we have a delocated wheel with a GEOS dylib. -- geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname( -- __file__), '.dylibs/libgeos_c.1.dylib')) +- dylib_path = os.path.abspath( +- os.path.join(os.path.dirname(__file__), ".dylibs/*.dylib") +- ) +- LOG.debug("Formed path for globbing: dylib_path=%r", dylib_path) - -- if os.path.exists(geos_whl_dylib): +- geos_whl_dylib = glob.glob(dylib_path) +- LOG.debug("Globbed: geos_whl_dylib=%r", geos_whl_dylib) +- +- if len(geos_whl_dylib) > 0: - handle = CDLL(None) - if hasattr(handle, "initGEOS_r"): - LOG.debug("GEOS already loaded") - _lgeos = handle - else: -- _lgeos = CDLL(geos_whl_dylib) +- geos_whl_dylib = sorted(geos_whl_dylib) +- CDLL(geos_whl_dylib[0]) +- _lgeos = CDLL(geos_whl_dylib[-1]) - LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) - - elif exists_conda_env(): @@ -112,25 +119,44 @@ index 4619732..1abdb5e 100644 -elif sys.platform == 'win32': - _conda_dll_path = os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll') - if exists_conda_env() and os.path.exists(_conda_dll_path): -- # conda package. - _lgeos = CDLL(_conda_dll_path) - else: -- try: -- egg_dlls = os.path.abspath( -- os.path.join(os.path.dirname(__file__), 'DLLs')) -- if hasattr(sys, '_MEIPASS'): -- wininst_dlls = sys._MEIPASS -- elif hasattr(sys, "frozen"): -- wininst_dlls = os.path.normpath( -- os.path.abspath(sys.executable + '../../DLLS')) -- else: -- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") -- original_path = os.environ['PATH'] -- os.environ['PATH'] = "%s;%s;%s" % \ -- (egg_dlls, wininst_dlls, original_path) -- _lgeos = load_dll("geos_c.dll") -- except (ImportError, WindowsError, OSError): -- raise +- geos_whl_dll = glob.glob( +- os.path.abspath( +- os.path.join( +- os.path.dirname(__file__), "..", "Shapely.libs", "geos*.dll" +- ) +- ) +- ) +- +- if len(geos_whl_dll) > 0: +- geos_whl_dll = sorted(geos_whl_dll) +- # CDLL(geos_whl_so[0]) +- _lgeos = CDLL(geos_whl_dll[-1]) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- else: +- try: +- egg_dlls = os.path.abspath( +- os.path.join(os.path.dirname(__file__), "DLLs") +- ) +- if hasattr(sys, "_MEIPASS"): +- wininst_dlls = sys._MEIPASS +- elif hasattr(sys, "frozen"): +- wininst_dlls = os.path.normpath( +- os.path.abspath(sys.executable + "../../DLLS") +- ) +- else: +- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") +- original_path = os.environ["PATH"] +- os.environ["PATH"] = "%s;%s;%s" % ( +- egg_dlls, +- wininst_dlls, +- original_path, +- ) +- _lgeos = load_dll("geos_c.dll") +- +- except (ImportError, WindowsError, OSError): +- raise - - def free(m): - try: From 29b968bf1732c77bab8ab8c00cc6da6fe9e60f53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 12:17:58 +0200 Subject: [PATCH 238/314] python3Packages.httplib2: 0.20.3 -> 0.20.4 --- pkgs/development/python-modules/httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 6c1304ec9518..7f331c8edad4 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.20.3"; + version = "0.20.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q5KkhVqyHDoIeKjvvYoHRbZPY7LUXGDwgp4CSuyvQ1g="; + sha256 = "sha256-eLvxmG9PUX+2RB3M6oG442Wmh6c5GI/aKP/Z8Z5Ixq8="; }; propagatedBuildInputs = [ From 8b069e36f9fdaa8498ad7fe5b5e7255daaff0024 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 16:29:35 +0200 Subject: [PATCH 239/314] python3Packages.sqlalchemy: 1.4.34 -> 1.4.35 --- 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 a3e2800f37af..b6e800a7ed3d 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.34"; + version = "1.4.35"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YjusLWvco/PmHPHhxGbF+59c8Ic1c27hERGHt6QQiJE="; + hash = "sha256-L/yBOwHcZHOZD15XXyEMpawvVGWs45CLeP/W0gBYqrU="; }; propagatedBuildInputs = [ From 44f0a04ddd7e98f186ef11a70fba5d7db5ee32f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 21:16:33 +0200 Subject: [PATCH 240/314] python3Packages.pandas: use upstreams fast test settings --- pkgs/development/python-modules/pandas/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 1d0a50f71ab5..70919715eefd 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -71,10 +71,16 @@ buildPythonPackage rec { doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture + # don't max out build cores, it breaks tests + dontUsePytestXdist = true; + pytestFlagsArray = [ + # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh + "--skip-db" "--skip-slow" "--skip-network" - "--numprocesses" "0" + "-m" "'not single_cpu'" + "--numprocesses" "4" ]; disabledTests = [ From 5a6793c4f8d9e582d8ccfca7380838c5870a0f78 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Apr 2022 20:27:03 +0200 Subject: [PATCH 241/314] python3Packages.junos-eznc: fix build and tests --- .../python-modules/junos-eznc/default.nix | 66 ++++++++++++++----- 1 file changed, 50 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 426b990ccac5..d693c73130be 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,43 +1,77 @@ { lib , buildPythonPackage -, fetchPypi -, six -, scp -, pyserial -, paramiko -, netaddr -, ncclient -, ntc-templates -, lxml +, fetchpatch +, fetchFromGitHub + +# propagates , jinja2 +, lxml +, ncclient +, netaddr +, ntc-templates +, paramiko +, pyparsing +, pyserial , pyyaml +, scp +, six , transitions , yamlordereddictloader + +# tests +, mock , nose +, pytestCheckHook }: buildPythonPackage rec { pname = "junos-eznc"; version = "2.6.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "4eee93d0af203af7cee54a8f0c7bd28af683e829edf1fd68feba85d0ad737395"; + src = fetchFromGitHub { + owner = "Juniper"; + repo = "py-junos-eznc"; + rev = version; + hash = "sha256-XhQJwtS518AzSwyaWE392nfNdYe9+iYHvXxQsjJfzI8="; }; + patches = [ + (fetchpatch { + # Fixes tests with lxml>=4.8.0; remove > 2.6.3 + url = "https://github.com/Juniper/py-junos-eznc/commit/048f750bb7357b6f6b9db8ad64bea479298c74fb.patch"; + hash = "sha256-DYVj0BNPwDSbxDrzHhaq4F4kz1bliXB6Au3I63mRauc="; + }) + ]; + postPatch = '' substituteInPlace requirements.txt \ --replace "ncclient==0.6.9" "ncclient" ''; - checkInputs = [ nose ]; - propagatedBuildInputs = [ - scp six pyserial paramiko netaddr ncclient ntc-templates lxml jinja2 pyyaml transitions yamlordereddictloader + jinja2 + lxml + ncclient + netaddr + ntc-templates + paramiko + pyparsing + pyserial + pyyaml + scp + six + transitions + yamlordereddictloader + ]; + + checkInputs = [ + mock + nose ]; checkPhase = '' - nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit + nosetests -v -a unit --exclude=test_sw_put_ftp ''; pythonImportsCheck = [ "jnpr.junos" ]; From 26970a06a9aeed8f4c79ac7631a68e4663247a5f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 9 Apr 2022 01:07:32 +0100 Subject: [PATCH 242/314] python3Packages.mitmproxy: add dontUsePytestXdist flag a couple of tests don't seem to like this, producing confusing failures --- pkgs/development/python-modules/mitmproxy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index f3b24ffabff2..055cb8aee99a 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -111,6 +111,7 @@ buildPythonPackage rec { # Tests require terminal "test_integration" ]; + dontUsePytestXdist = true; pythonImportsCheck = [ "mitmproxy" ]; From 7fc6852dbfa61c86021292e6c9cf99cd764f615a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 Apr 2022 00:53:23 +0200 Subject: [PATCH 243/314] python3Packages.google-cloud-testutils: propagate packaging --- .../python-modules/google-cloud-testutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index d4551b4954a5..c5d02926f507 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, click, google-auth, six }: +{ lib, buildPythonPackage, fetchPypi, click, google-auth, packaging, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-X85NRgGZt7+OpL4poOyS+UWec4fuABiTxEYyFpkUpqs="; }; - propagatedBuildInputs = [ click google-auth six ]; + propagatedBuildInputs = [ click google-auth packaging six ]; # does not contain tests doCheck = false; From ba47e59440bbcfd1f769600783331f4cb4c95bbe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 9 Apr 2022 19:37:58 -0700 Subject: [PATCH 244/314] python3Packges.websocket: add missing six dependency ``` > Processing ./websocket_client-0.56.0-py2.py3-none-any.whl > ERROR: Could not find a version that satisfies the requirement six (from websocket-client) (from versions: none) > ERROR: No matching distribution found for six > ``` --- pkgs/development/python-modules/websocket-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 42d15476ff88..a1c0cfa82e1d 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -4,6 +4,7 @@ , pythonOlder , pytestCheckHook , python-socks +, six }: buildPythonPackage rec { @@ -18,6 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-socks + six ]; checkInputs = [ From 214d151733609316e45aaf60d95c0ac6b43707ae Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 10 Apr 2022 13:58:04 +0100 Subject: [PATCH 245/314] python3Packages.rich: 12.0.1 -> 12.2.0 --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 26f1248f3388..addc12b3637a 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rich"; - version = "12.0.1"; + version = "12.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hx/Xot+LFzhyO17f1hRqsNCFTlKFEq87sFLvd1SGUfo="; + sha256 = "02zypmnc9sijlipki0riywh82piamd3hlrl5xbg2bxlldnlnwx1d"; }; nativeBuildInputs = [ poetry-core ]; From d57404ea3dcb3ab98913414a6f6fba854a8509b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 Apr 2022 17:31:15 +0200 Subject: [PATCH 246/314] python3Packages.jax: test with limited parallelism The tests are prone to getting stuck with high parallelism. --- pkgs/development/python-modules/jax/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 332cac3133cc..0d1e8c17b13e 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -54,12 +54,15 @@ buildPythonPackage rec { pytest-xdist ]; + # high parallelism will result in the tests getting stuck + dontUsePytestXdist = true; + # NOTE: Don't run the tests in the expiremental directory as they require flax # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2. # Not a big deal, this is how the JAX docs suggest running the test suite # anyhow. pytestFlagsArray = [ - "-n auto" + "--numprocesses=4" "-W ignore::DeprecationWarning" "tests/" ]; From 35a6f46d6d85a0138808422afda2f0a84aaeb1d9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 10 Apr 2022 20:53:31 +0100 Subject: [PATCH 247/314] python3Packages.fastparquet: 0.7.1 -> 0.8.1 --- pkgs/development/python-modules/fastparquet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 56fb6a53e14a..30aa6a2ab764 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-xV0AXNZSy4LSrHf11OP/+KDbeDQu8yF1ugX+W4mie1E="; + sha256 = "05qb4nz87p9vnrdsyl25hdp5sj35lki64gjza5dahc89fwfdnsmd"; }; postPatch = '' From fe31277c3cbdb53a9cf8338d9b17fc98c8942201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Apr 2022 19:58:53 +0000 Subject: [PATCH 248/314] python3Packages.pillow: 9.0.1 -> 9.1.0 https://pillow.readthedocs.io/en/stable/releasenotes/9.1.0.html --- .../python-modules/pillow/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 8aa1ad1f4c4d..47ed191c6d99 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook # for passthru.tests @@ -6,14 +11,15 @@ }@args: import ./generic.nix (rec { - pname = "Pillow"; - version = "9.0.1"; + pname = "pillow"; + version = "9.1.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "bIvII4p9/a96dfXsWmY/QXP4w2flo5+H5yBJXh7tdfo="; + pname = "Pillow"; + inherit version; + sha256 = "f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97"; }; passthru.tests = { From 4e23b47f4825b417863574c1bca5dcd900f2d839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Apr 2022 20:16:19 +0000 Subject: [PATCH 249/314] python3Packages.pikepdf: disable failing test --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index bb8c2c385c23..d0671f93513d 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -81,6 +81,10 @@ buildPythonPackage rec { setuptools ]; + disabledTests = [ + "test_image_palette" # https://github.com/pikepdf/pikepdf/issues/328 + ]; + pythonImportsCheck = [ "pikepdf" ]; meta = with lib; { From 406c7d8c3db0568fc2b4a2c65da85b348d52e155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Apr 2022 05:07:46 +0000 Subject: [PATCH 250/314] python3Packages.img2pdf: 0.4.3 -> 0.4.4 https://gitlab.mister-muffin.de/josch/img2pdf/src/tag/0.4.4/CHANGES.rst --- .../development/python-modules/img2pdf/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 58e3db524a82..791edcb2fb20 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , isPy27 , fetchPypi -, fetchpatch , pikepdf , pillow , stdenv @@ -19,23 +18,14 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.3"; + version = "0.4.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-jlHFBD76lddRSBtRYHGgBvh8KkBZlhqaxD7COJFd4J8="; + sha256 = "8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c"; }; - patches = [ - # Disable tests broken by Pillow 9.0.0 - # https://gitlab.mister-muffin.de/josch/img2pdf/issues/130#issuecomment-586 - (fetchpatch { - url = "https://salsa.debian.org/debian/img2pdf/-/raw/f77fefc81e7c4b235c47ae6777d222d391c59536/debian/patches/pillow9"; - sha256 = "sha256-8giZCuv5PzSbrBQqslNqiLOhgxbg3LsdBVwt+DWnvh4="; - }) - ]; - propagatedBuildInputs = [ pikepdf pillow From 6fc914b33759b5a831b634b4fb1bed092f71c186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Apr 2022 11:57:28 +0200 Subject: [PATCH 251/314] python39Packages.ncclient: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/ncclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 2cb040ed8a38..3457c71af4ca 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1sjvqaxb54nmqljiw5bg1423msa9rg015wiix9fsm6djk3wpklmk"; + sha256 = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc="; }; propagatedBuildInputs = [ From 84cc0b7449edec98b4d94857e549a9430b257b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Apr 2022 12:25:37 +0200 Subject: [PATCH 252/314] python310Packages.click: 8.1.1 -> 8.1.2 --- pkgs/development/python-modules/click/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index b780fc017bac..a75f563862a3 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "click"; - version = "8.1.1"; + version = "8.1.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-erkA44FJyYcjduj5tZht3K9owPQTz3NnigvKVUfm+XY="; + sha256 = "sha256-R5cH/hTZ7JoHV2GLehAKCuTE4jb6xbf4DKaAKBQaGnI="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ From 836e3af5447ee51c81566b6717f445213c50f47b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Apr 2022 23:48:50 +0200 Subject: [PATCH 253/314] python3Packages.jax: disable test_custom_linear_solve_aux ``` ______________ CustomLinearSolveTest.test_custom_linear_solve_aux ______________ [gw3] linux -- Python 3.9.11 /nix/store/k1physzalj5vffsvl7ag6h6b6vaqip5x-python3-3.9.11/bin/python3.9 self = @jtu.skip_on_flag("jax_skip_slow_tests", True) def test_custom_linear_solve_aux(self): def explicit_jacobian_solve_aux(matvec, b): x = lax.stop_gradient(jnp.linalg.solve(jax.jacobian(matvec)(b), b)) return x, array_aux def matrix_free_solve_aux(matvec, b): return lax.custom_linear_solve( matvec, b, explicit_jacobian_solve_aux, explicit_jacobian_solve_aux, symmetric=True, has_aux=True) def linear_solve_aux(a, b): return matrix_free_solve_aux(partial(high_precision_dot, a), b) # array aux values, to be able to use jtu.check_grads array_aux = {"converged": np.array(1.), "nfev": np.array(12345.)} rng = self.rng() a = rng.randn(3, 3) a = a + a.T b = rng.randn(3) expected = jnp.linalg.solve(a, b) actual_nojit, nojit_aux = linear_solve_aux(a, b) actual_jit, jit_aux = jax.jit(linear_solve_aux)(a, b) self.assertAllClose(expected, actual_nojit) self.assertAllClose(expected, actual_jit) # scalar dict equality check self.assertDictEqual(nojit_aux, array_aux) self.assertDictEqual(jit_aux, array_aux) # jvp / vjp test > jtu.check_grads(linear_solve_aux, (a, b), order=2, rtol=4e-3) tests/custom_linear_solve_test.py:157: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ jax/_src/test_util.py:372: in check_grads _check_grads(f, args, order) jax/_src/test_util.py:361: in _check_grads _check_grads(partial(api.jvp, f), (args, args), order - 1, fwd_msg) jax/_src/test_util.py:365: in _check_grads _check_vjp(f, partial(api.vjp, f), args, err_msg=rev_msg) jax/_src/test_util.py:325: in check_vjp check_close(ip, ip_expected, atol=atol, rtol=rtol, jax/_src/test_util.py:227: in check_close tree_all(tree_multimap(assert_close, xs, ys)) jax/_src/tree_util.py:180: in tree_map return treedef.unflatten(f(*xs) for xs in zip(*all_leaves)) jax/_src/tree_util.py:180: in return treedef.unflatten(f(*xs) for xs in zip(*all_leaves)) jax/_src/test_util.py:217: in _assert_numpy_close _assert_numpy_allclose(a, b, atol=atol * a.size, rtol=rtol * b.size, _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ a = array(1.89683694), b = array(1.88698006), atol = 0.002, rtol = 0.004 err_msg = 'VJP of JVP cotangent projection' def _assert_numpy_allclose(a, b, atol=None, rtol=None, err_msg=''): if a.dtype == b.dtype == _dtypes.float0: np.testing.assert_array_equal(a, b, err_msg=err_msg) return a = a.astype(np.float32) if a.dtype == _dtypes.bfloat16 else a b = b.astype(np.float32) if b.dtype == _dtypes.bfloat16 else b kw = {} if atol: kw["atol"] = atol if rtol: kw["rtol"] = rtol with np.errstate(invalid='ignore'): # TODO(phawkins): surprisingly, assert_allclose sometimes reports invalid # value errors. It should not do that. > np.testing.assert_allclose(a, b, **kw, err_msg=err_msg) E AssertionError: E Not equal to tolerance rtol=0.004, atol=0.002 E VJP of JVP cotangent projection E Mismatched elements: 1 / 1 (100%) E Max absolute difference: 0.00985688 E Max relative difference: 0.00522363 E x: array(1.896837) E y: array(1.88698) jax/_src/test_util.py:187: AssertionError ``` --- pkgs/development/python-modules/jax/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 0d1e8c17b13e..812463fb3da7 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -67,11 +67,14 @@ buildPythonPackage rec { "tests/" ]; - # See - # * https://github.com/google/jax/issues/9705 - # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 - # * https://github.com/NixOS/nixpkgs/issues/161960 - disabledTests = lib.optionals usingMKL [ + disabledTests = [ + # Exceeds tolerance when the machine is busy + "test_custom_linear_solve_aux" + ] ++ lib.optionals usingMKL [ + # See + # * https://github.com/google/jax/issues/9705 + # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 + # * https://github.com/NixOS/nixpkgs/issues/161960 "test_custom_linear_solve_cholesky" "test_custom_root_with_aux" "testEigvalsGrad_shape" From 9f340b5bf1cb63f10dd34c3ff69b582216168c75 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 16:16:05 +0200 Subject: [PATCH 254/314] treewide: remove redundant numprocesses pytest-xdist parameter Including the pytest-xdist package automatically configures numprocesses to $NIX_BUILD_CORES, so specifying these on a package level has become redundant. --- pkgs/development/python-modules/alembic/default.nix | 4 ---- pkgs/development/python-modules/ansible-lint/default.nix | 4 ---- pkgs/development/python-modules/build/default.nix | 2 -- pkgs/development/python-modules/cattrs/default.nix | 3 --- .../development/python-modules/clickhouse-driver/default.nix | 2 -- pkgs/development/python-modules/dask/default.nix | 2 -- pkgs/development/python-modules/datashader/default.nix | 1 - pkgs/development/python-modules/debugpy/default.nix | 1 - pkgs/development/python-modules/diskcache/default.nix | 4 ---- pkgs/development/python-modules/dm-haiku/default.nix | 1 - pkgs/development/python-modules/flax/default.nix | 1 - pkgs/development/python-modules/hypothesmith/default.nix | 1 - pkgs/development/python-modules/ibis-framework/default.nix | 1 - pkgs/development/python-modules/optax/default.nix | 1 - pkgs/development/python-modules/pylint/default.nix | 4 ---- pkgs/development/python-modules/scikit-learn/default.nix | 2 -- .../python-modules/tensorflow-datasets/default.nix | 1 - pkgs/development/python-modules/yamlfix/default.nix | 5 ----- pkgs/tools/misc/pre-commit/default.nix | 1 - pkgs/tools/package-management/pdm/default.nix | 1 - 20 files changed, 42 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 1a7487a25f78..ea8f4d4d1318 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -42,10 +42,6 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlagsArray = [ - "--numprocesses" "$NIX_BUILD_CORES" - ]; - meta = with lib; { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 503247580fb4..37538088b226 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -57,10 +57,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--numprocesses" "$NIX_BUILD_CORES" - ]; - preCheck = '' # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index f1f7f0e81bd2..d36804649b7e 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -52,8 +52,6 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" "-W" "ignore::DeprecationWarning" ]; diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 94a357df98be..69a351e3c341 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -52,9 +52,6 @@ buildPythonPackage rec { ujson ]; - pytestFlagsArray = [ - "--numprocesses $NIX_BUILD_CORES" - ]; postPatch = '' substituteInPlace pyproject.toml \ diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index dd1698f9a3ae..826ce08c1e06 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -57,8 +57,6 @@ buildPythonPackage rec { # some test in test_buffered_reader.py doesn't seem to return disabledTestPaths = [ "tests/test_buffered_reader.py" ]; - pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" ]; - # most tests require `clickhouse` # TODO: enable tests after `clickhouse` unbroken doCheck = false; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index ffdca65a606a..79f07c6e88f2 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -67,8 +67,6 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - # parallelize - "--numprocesses $NIX_BUILD_CORES" # rerun failed tests up to three times "--reruns 3" # don't run tests that require network access diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 152582f6716f..b9630aa07fd4 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -70,7 +70,6 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" "datashader" ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 9f6026ce7360..04b78d6c8023 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -84,7 +84,6 @@ buildPythonPackage rec { # Override default arguments in pytest.ini pytestFlagsArray = [ "--timeout=0" - "-n=$NIX_BUILD_CORES" ]; disabledTests = lib.optionals (pythonAtLeast "3.10") [ diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 26cb0e438f01..cf3f7b514b1f 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -45,10 +45,6 @@ buildPythonPackage rec { "test_get_many" ]; - pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" - ]; - pythonImportsCheck = [ "diskcache" ]; diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 03677faa689f..570d923509a3 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { pytestCheckHook tensorflow ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; pythonImportsCheck = [ "haiku" diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 1f1622dc1aea..82675df46c91 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -42,7 +42,6 @@ buildPythonPackage rec { pytestCheckHook tensorflow ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; disabledTestPaths = [ # Docs test, needs extra deps + we're not interested in it. diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index ae02a076bafb..4bac9c0bb022 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -39,7 +39,6 @@ buildPythonPackage rec { pytestFlagsArray = [ "-v" - "--numprocesses $NIX_BUILD_CORES" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 61b944b48836..e25832fbfcb3 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -119,7 +119,6 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--numprocesses $NIX_BUILD_CORES" "ibis/tests" "ibis/backends/tests" "ibis/backends/{${lib.concatStringsSep "," backends}}/tests" diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index f3790a3f59f4..b0f896a18ebb 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { tensorflow tensorflow-datasets ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; pythonImportsCheck = [ "optax" diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index f44615df18b1..9b631bd17b3b 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -65,10 +65,6 @@ buildPythonPackage rec { export HOME=$TEMPDIR ''; - pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" - ]; - disabledTestPaths = [ # tests miss multiple input files # FileNotFoundError: [Errno 2] No such file or directory diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 7e2096c9b9ba..82a85d709413 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -78,8 +78,6 @@ buildPythonPackage rec { # https://github.com/scikit-learn/scikit-learn/issues/17582 # Since we are overriding '-k' we need to include the 'disabledTests' from above manually. "-k" "'not (NuSVC and memmap) ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'" - - "-n" "$NIX_BUILD_CORES" ]; preCheck = '' diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 1fc9f5ae25dc..1cfbd1ae59c9 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -96,7 +96,6 @@ buildPythonPackage rec { tensorflow tifffile ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; disabledTestPaths = [ # Sandbox violations: network access, filesystem write attempts outside of build dir, ... diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 7243b3891f40..b789aab03701 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -37,11 +37,6 @@ buildPythonPackage rec { --replace 'python_paths = "."' "" ''; - pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" - ]; - pythonImportsCheck = [ "yamlfix" ]; diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index addd7134b7f8..df211378f4b4 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -74,7 +74,6 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "--numprocesses $NIX_BUILD_CORES" "--forked" ]; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index cae4431ea65b..a931578a092d 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -71,7 +71,6 @@ buildPythonApplication rec { ]; pytestFlagsArray = [ - "--numprocesses $NIX_BUILD_CORES" "-m 'not network'" ]; From c2d27581473839bc979b695a18cf4e2a911a1337 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 16:29:56 +0200 Subject: [PATCH 255/314] borgbackup: disable racy test https://github.com/borgbackup/borg/issues/6573 --- pkgs/tools/backup/borgbackup/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 03446be5341a..8202786dde84 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -90,7 +90,6 @@ python3.pkgs.buildPythonApplication rec { ]; pytestFlagsArray = [ - "--numprocesses" "$NIX_BUILD_CORES" "--benchmark-skip" "--pyargs" "borg.testsuite" ]; @@ -109,6 +108,8 @@ python3.pkgs.buildPythonApplication rec { "test_get_keys_dir" "test_get_security_dir" "test_get_config_dir" + # https://github.com/borgbackup/borg/issues/6573 + "test_basic_functionality" ]; preCheck = '' From bfcb28e12864af4acbceee9966791036f04fc163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Apr 2022 01:25:01 +0000 Subject: [PATCH 256/314] python3Packages.async_generator: does not depend on pytest-asyncio --- pkgs/development/python-modules/async_generator/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index 6f6da10a87f9..277616849e15 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, pytest-asyncio , pytestCheckHook }: @@ -19,7 +18,6 @@ buildPythonPackage rec { }; checkInputs = [ - pytest-asyncio pytestCheckHook ]; From d735ed3864920076030454b74d494d592b844e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Apr 2022 01:18:24 +0000 Subject: [PATCH 257/314] python3Packages.pytest-asyncio: 0.18.1 -> 0.18.3 https://github.com/pytest-dev/pytest-asyncio/blob/v0.18.3/CHANGELOG.rst --- .../python-modules/pytest-asyncio/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index da60feb724f8..8c368c50e32c 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.18.1"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-9KN45+Pdz40rJv1NUxuoy8xWtLGt7kz7YcqfjfZ9x4A="; + hash = "sha256-eopKlDKiTvGmqcqw44MKlhvSKswKZd/VDYRpZbuyOqM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -29,17 +29,20 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + buildInputs = [ pytest ]; checkInputs = [ flaky hypothesis - flaky pytestCheckHook ]; + disabledTestPaths = [ + "tests/trio" # pytest-trio causes infinite recursion + ]; + pythonImportsCheck = [ "pytest_asyncio" ]; @@ -47,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.rev}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; From 8aaa0192217668bd99a1c1d490a1f20db8911e42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 20:29:41 +0200 Subject: [PATCH 258/314] python3Packages.twisted: 22.2.0 -> 22.4.0 --- pkgs/development/python-modules/twisted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index e78d06eb7bac..02a993fdf139 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -17,12 +17,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "22.2.0"; + version = "22.4.0"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "1wml02jxni8k15984pskks7d6yin81w4d2ac026cpyiqd0gjpwsp"; + sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA="; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; From 5ee7d17afc450ecf199e9d8d636e57e397fb3b28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 21:59:32 +0200 Subject: [PATCH 259/314] python3Packages.path: rename from path.py; 12.0.1 -> 16.4.0 The project had been renamed after 12.5.0 back in 2020, which is why we didn't receive further updates. Created an alias and renamed all existing references. --- .../graphics/cq-editor/default.nix | 2 +- .../python-modules/behave/default.nix | 4 +- .../python-modules/cherrypy/default.nix | 4 +- .../python-modules/entrypoint2/default.nix | 4 +- .../python-modules/modeled/default.nix | 4 +- .../python-modules/moretools/default.nix | 4 +- .../python-modules/path.py/default.nix | 50 ------------------- .../python-modules/path/default.nix | 45 +++++++++++++++++ .../python-modules/pickleshare/default.nix | 4 +- .../python-modules/pytest-shutil/default.nix | 4 +- .../robotframework-tools/default.nix | 4 +- .../python-modules/scikit-build/default.nix | 4 +- .../python-modules/zetup/default.nix | 4 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +- 15 files changed, 69 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/python-modules/path.py/default.nix create mode 100644 pkgs/development/python-modules/path/default.nix diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index 33bae268c8a6..bb157ad18db0 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -27,7 +27,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pyparsing pyqtgraph spyder - pathpy + path qtconsole requests ]; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 2384a51e5023..5254f79c4b2f 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , buildPythonApplication, python -, pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html +, pytestCheckHook, mock, path, pyhamcrest, pytest-html , glibcLocales , colorama, cucumber-tag-expressions, parse, parse-type, six }: @@ -16,7 +16,7 @@ buildPythonApplication rec { hash = "sha256-B8PUN1Q4UAsDWrHjPZDlpaPjCKjI/pAogCSI+BQnaWs="; }; - checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; + checkInputs = [ pytestCheckHook mock path pyhamcrest pytest-html ]; # upstream tests are failing, so instead we only check if we can import it doCheck = false; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 01bbfe8841b7..f4272f90d629 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -6,7 +6,7 @@ , jaraco_collections , more-itertools , objgraph -, pathpy +, path , portend , pytest-forked , pytest-services @@ -51,7 +51,7 @@ buildPythonPackage rec { checkInputs = [ objgraph - pathpy + path pytest-forked pytest-services pytestCheckHook diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix index 73ede85fb886..4fd464d483f3 100644 --- a/pkgs/development/python-modules/entrypoint2/default.nix +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, EasyProcess, path, pytestCheckHook }: buildPythonPackage rec { pname = "entrypoint2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "entrypoint2" ]; - checkInputs = [ EasyProcess pathpy pytestCheckHook ]; + checkInputs = [ EasyProcess path pytestCheckHook ]; meta = with lib; { description = "Easy to use command-line interface for python modules"; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index acf8ee4c1123..c49077d2181b 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -4,7 +4,7 @@ , zetup , six , moretools -, pathpy +, path , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ zetup ]; - propagatedBuildInputs = [ six moretools pathpy ]; + propagatedBuildInputs = [ six moretools path ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 5a96682accdb..01f6b58a9475 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, six, pathpy, zetup, pytest +, six, path, zetup, pytest , decorator }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ zetup ]; - checkInputs = [ six pathpy pytest ]; + checkInputs = [ six path pytest ]; propagatedBuildInputs = [ decorator ]; meta = with lib; { diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix deleted file mode 100644 index e49b1ceb462c..000000000000 --- a/pkgs/development/python-modules/path.py/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -, pytestCheckHook -, pytest-flake8 -, glibcLocales -, packaging -, isPy38 -, importlib-metadata -, fetchpatch -}: - -buildPythonPackage rec { - pname = "path.py"; - version = "12.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f"; - }; - - checkInputs = [ pytestCheckHook pytest-flake8 glibcLocales packaging ]; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - importlib-metadata - ]; - - LC_ALL = "en_US.UTF-8"; - - meta = { - description = "A module wrapper for os.path"; - homepage = "https://github.com/jaraco/path.py"; - license = lib.licenses.mit; - }; - - # ignore performance test which may fail when the system is under load - # test_version fails with 3.8 https://github.com/jaraco/path.py/issues/172 - disabledTests = [ "TestPerformance" ] ++ lib.optionals isPy38 [ "test_version"]; - - dontUseSetuptoolsCheck = true; - - patches = [ - (fetchpatch { - url = "https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch"; - sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9"; - }) - ]; - -} diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix new file mode 100644 index 000000000000..9e89231d9ce5 --- /dev/null +++ b/pkgs/development/python-modules/path/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi + +# build time +, setuptools-scm + +# tests +, pytestCheckHook +, appdirs +, packaging +}: + +buildPythonPackage rec { + pname = "path"; + version = "16.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uvLnV8Sxm+ggj55n5I+0dbSld9VhNZDORmk7298IL1I="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "path" + ]; + + meta = with lib; { + description = "Object-oriented file system path manipulation"; + homepage = "https://github.com/jaraco/path"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index 34798cc3ee5e..381f03bdce5c 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pathpy +, path , pathlib2 , pythonOlder }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"; }; - propagatedBuildInputs = [ pathpy ] + propagatedBuildInputs = [ path ] ++ lib.optional (pythonOlder "3.4") pathlib2; # No proper test suite diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index e43a837d6aa4..0432117e1e8a 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,5 +1,5 @@ { lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, pathpy, execnet +, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, path, execnet , contextlib2, termcolor }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 77a7fe13df99..2c2fe3945b09 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -3,7 +3,7 @@ , fetchPypi , robotframework , moretools -, pathpy +, path , six , zetup , modeled @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ robotframework moretools - pathpy + path six modeled ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 3fefba47cbda..66b7a0743c75 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -12,7 +12,7 @@ , cython , flake8 , ninja -, pathpy +, path , pytest , pytest-cov , pytest-mock @@ -45,7 +45,7 @@ buildPythonPackage rec { cython flake8 ninja - pathpy + path pytest pytest-cov pytest-mock diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index c2e707347b33..41b5f05cfeb2 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nbconvert -, pathpy +, path , pytestCheckHook , setuptools-scm , pythonAtLeast @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; checkInputs = [ - pathpy + path nbconvert pytestCheckHook ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9e5c59674720..5e6a44e55c76 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -82,6 +82,7 @@ mapAliases ({ nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 + pathpy = path; # added 2022-04-12 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 prometheus_client = prometheus-client; # added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4310388003c5..ad268b2591b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6017,6 +6017,8 @@ in { patch-ng = callPackage ../development/python-modules/patch-ng { }; + path = callPackage ../development/python-modules/path { }; + path-and-address = callPackage ../development/python-modules/path-and-address { }; pathable = callPackage ../development/python-modules/pathable { }; @@ -6027,8 +6029,6 @@ in { pathos = callPackage ../development/python-modules/pathos { }; - pathpy = callPackage ../development/python-modules/path.py { }; - pathspec = callPackage ../development/python-modules/pathspec { }; pathtools = callPackage ../development/python-modules/pathtools { }; From b4ead6abae46bd26d6ad667b372fb324b6ea8abb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 22:38:45 +0200 Subject: [PATCH 260/314] python3Packges.pep257: remove together with pytest-pep257 The code apparently was migrated into pycodestyle. https://github.com/PyCQA/pydocstyle/issues/580 --- .../python-modules/pep257/default.nix | 23 ------------------- .../python-modules/pytest-pep257/default.nix | 20 ---------------- pkgs/top-level/python-aliases.nix | 2 ++ pkgs/top-level/python-packages.nix | 4 ---- 4 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/python-modules/pep257/default.nix delete mode 100644 pkgs/development/python-modules/pytest-pep257/default.nix diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix deleted file mode 100644 index d6205fc6e72e..000000000000 --- a/pkgs/development/python-modules/pep257/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, mock }: - -buildPythonPackage rec { - pname = "pep257"; - version = "6.1.1"; - - src = fetchFromGitHub { - owner = "GreenSteam"; - repo = "pep257"; - rev = version; - sha256 = "0hcf3nyvzl8kd6gmc9qsiigz7vpwrjxcd1bd50dd63cad87qqicg"; - }; - - checkInputs = [ pytestCheckHook mock ]; - - meta = with lib; { - homepage = "https://github.com/GreenSteam/pep257/"; - description = "Python docstring style checker"; - longDescription = "Static analysis tool for checking compliance with Python PEP 257."; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix deleted file mode 100644 index 827386786b79..000000000000 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pep257 }: - -buildPythonPackage rec { - pname = "pytest-pep257"; - version = "0.0.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; - }; - - buildInputs = [ pytest ]; - propagatedBuildInputs = [ pep257 ]; - - meta = with lib; { - homepage = "https://github.com/anderslime/pytest-pep257"; - description = "py.test plugin for PEP257"; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5e6a44e55c76..1fcd5f71f1b1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -83,6 +83,7 @@ mapAliases ({ pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 + pep257 = pydocstyle; # added 2022-04-12 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 prometheus_client = prometheus-client; # added 2021-06-10 @@ -96,6 +97,7 @@ mapAliases ({ pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 + pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12 pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad268b2591b4..f572b8bec9ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6091,8 +6091,6 @@ in { pendulum = callPackage ../development/python-modules/pendulum { }; - pep257 = callPackage ../development/python-modules/pep257 { }; - pep440 = callPackage ../development/python-modules/pep440 { }; pep517 = callPackage ../development/python-modules/pep517 { }; @@ -7978,8 +7976,6 @@ in { pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-qt = callPackage ../development/python-modules/pytest-qt { }; From 3847540f6d42e327930833921e5b3ec598c87d81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 23:38:03 +0200 Subject: [PATCH 261/314] python3Packages.mkdocs: 1.2.3 -> 1.3.0 https://github.com/mkdocs/mkdocs/releases/tag/1.3.0 --- pkgs/development/python-modules/mkdocs/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 7d4f1cc66c6e..13604bc975a3 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -3,7 +3,6 @@ lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # runtime deps , click @@ -24,24 +23,16 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.2.3"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-LBw2ftGyeNvARQ8xiYUho8BiQh+aIEqROP51gKvNxEo="; + sha256 = "sha256-S4xkr3jS5GvkMu8JnEGfqhmkxy3FtZZb7Rbuniltudg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/mkdocs/mkdocs/commit/c93fc91e4dc0ef33e2ea418aaa32b0584a8d354a.patch"; - sha256 = "sha256-7uLIuQOt6KU/+iS9cwhXkWPAHzZkQdMyNBxSMut5WK4="; - excludes = [ "tox.ini" ]; - }) - ]; - propagatedBuildInputs = [ click jinja2 From 1feb33974a6e36188a6f1104c104d45b39c555ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 23:42:41 +0200 Subject: [PATCH 262/314] python3Packages.mkdocs-material: 8.2.7 -> 8.2.9 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index dc67a5158240..41eff2026b97 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.2.7"; + version = "8.2.9"; src = fetchFromGitHub { owner = "squidfunk"; repo = pname; rev = version; - sha256 = "sha256-Jh0FmtBCYCEk6mYFLOKb1HQXQ4Wc9Z6JCHFVu420IBk="; + sha256 = "sha256-lrklTQWWsP1rjixqu5/S7XMN+K095NRGv3JkjRQ4brM="; }; propagatedBuildInputs = [ From 90112c221fa2a783a0c7a198238f596298fe9c39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 23:48:12 +0200 Subject: [PATCH 263/314] python3Packages.fakeredis: relax redis constraint --- pkgs/development/python-modules/fakeredis/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 5860a959afcd..5d45c4dc5ce3 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "redis<4.2.0" "redis" + ''; + propagatedBuildInputs = [ aioredis lupa From abacec3d0bf5d6d5d2eb821ef7a148031d1bb67d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 21:11:41 +0200 Subject: [PATCH 264/314] python3Packages.pytest-shutil: fix build Propagates six and replaces path.py dependency with path, the new name. --- .../development/python-modules/pytest-shutil/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 0432117e1e8a..e3b2277fa99b 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,6 +1,6 @@ { lib, isPyPy, buildPythonPackage, fetchPypi , pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, path, execnet -, contextlib2, termcolor }: +, contextlib2, termcolor, six }: buildPythonPackage rec { pname = "pytest-shutil"; @@ -11,9 +11,14 @@ buildPythonPackage rec { sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "path.py" "path" + ''; + buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor ]; + propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor six ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} From 1828ad603b55d4fab1b0caa6964fac78948cf78e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 21:22:05 +0200 Subject: [PATCH 265/314] python3.pkgs.pylint: 2.13.4 -> 2.13.5 https://github.com/PyCQA/pylint/releases/tag/v2.13.5 --- .../python-modules/pylint/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 9b631bd17b3b..dda915bb7ef3 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -2,15 +2,17 @@ , lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , installShellFiles , astroid , dill , isort -, GitPython , mccabe , platformdirs -, toml +, tomli +, typing-extensions +, GitPython , pytest-benchmark , pytest-timeout , pytest-xdist @@ -19,15 +21,16 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.13.4"; + version = "2.13.5"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6.2"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CMbw6D6szQvur+13halZrskSV/9rDaThMGLeGxfjqWo="; + sha256 = "sha256-FB99vmUtoTc0cTjDUSbx80Tesh0vASigSpPktrDYk08="; }; nativeBuildInputs = [ @@ -40,7 +43,10 @@ buildPythonPackage rec { isort mccabe platformdirs - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions ]; postInstall = '' @@ -51,10 +57,12 @@ buildPythonPackage rec { checkInputs = [ GitPython + # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt pytest-benchmark pytest-timeout pytest-xdist pytestCheckHook + typing-extensions ]; dontUseSetuptoolsCheck = true; From a484235634a63c35e4e3a22d9f17f7938d7bf374 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 21:30:51 +0200 Subject: [PATCH 266/314] grab-site: update sqlalchemy hash --- pkgs/tools/backup/grab-site/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index fe6496bf212b..3b7e0a9a6005 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -7,8 +7,9 @@ let version = "1.3.24"; src = oldAttrs.src.override { inherit version; - sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; + doCheck = false; }); tornado = super.tornado_4; }; From 7f613bbdb66228538757faea2cdaa65dab57ffd0 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 13 Apr 2022 20:47:29 +1000 Subject: [PATCH 267/314] awsebcli: fixup, downgrade jmespath --- pkgs/tools/virtualization/awsebcli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 998ae80e306e..c431980125a6 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -17,6 +17,7 @@ let packageOverrides = self: super: { cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; botocore = changeVersion super.botocore.overridePythonAttrs "1.23.54" "sha256-S7m6FszO5fWiYCBJvD4ttoZTRrJVBmfzATvfM7CgHOs="; + jmespath = changeVersion super.jmespath.overridePythonAttrs "0.10.0" "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"; colorama = changeVersion super.colorama.overridePythonAttrs "0.4.3" "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9"; future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; requests = super.requests.overridePythonAttrs (oldAttrs: rec { From e391e40d0218a128c7144a4ae9faf11aac7222ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 01:59:19 +0200 Subject: [PATCH 268/314] python3Packages.falcon: fix build; cythonize! --- .../python-modules/falcon/default.nix | 89 +++++++++++-------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 7e6179fd5abf..58bbae872832 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,22 +1,21 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi -, pytestCheckHook +, isPyPy +, fetchFromGitHub + +# build +, cython + +# tests , aiofiles , cbor2 -, ddt -, gunicorn , httpx -, hypercorn -, jsonschema , msgpack , mujson -, nose , orjson -, pecan , pytest-asyncio -, python-mimeparse +, pytestCheckHook , pyyaml , rapidjson , requests @@ -32,39 +31,53 @@ buildPythonPackage rec { format = "pyproject"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-8nYL0YwWOTpvteVfNx9nkh7bcv6+aTqCs8XoIZXQh7c="; + src = fetchFromGitHub { + owner = "falconry"; + repo = pname; + rev = version; + hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; }; - checkInputs = [ - aiofiles - cbor2 - ddt - gunicorn - httpx - hypercorn - jsonschema - msgpack - mujson - nose - orjson - pecan - pytest-asyncio - pytestCheckHook - python-mimeparse - pyyaml - rapidjson - requests - testtools - ujson - uvicorn - websockets + nativeBuildInputs = lib.optionals (!isPyPy) [ + cython ]; - disabledTestPaths = [ - # missing optional nuts package - "falcon/bench/nuts/nuts/tests/test_functional.py" + preCheck = '' + export HOME=$TMPDIR + cp -R tests examples $TMPDIR + pushd $TMPDIR + ''; + + postCheck = '' + popd + ''; + + checkInputs = [ + # https://github.com/falconry/falcon/blob/master/requirements/tests + pytestCheckHook + pyyaml + requests + rapidjson + orjson + + # ASGI specific + pytest-asyncio + aiofiles + httpx + uvicorn + websockets + + # handler specific + cbor2 + msgpack + mujson + ujson + ] ++ lib.optionals (pythonOlder "3.10") [ + testtools + ]; + + pytestFlagsArray = [ + "tests" ]; meta = with lib; { From 69900853ca5dc675ebc74a04a2e663899b3650f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 02:01:28 +0200 Subject: [PATCH 269/314] mailman: fix build Required an update to the sqlalchemy override due to new hash variable usage. Also disables tests for sqlalchemy and alembic because neither can find any, so they error out. --- pkgs/servers/mail/mailman/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8cd087f4174f..f5632df79491 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -5,12 +5,18 @@ let # Mailman does not support sqlalchemy >= 1.4 https://gitlab.com/mailman/mailman/-/issues/845 pythonOverride = python3.override { packageOverrides = self: super: { + alembic = super.alembic.overridePythonAttrs (oldAttrs: { + # does not find tests + doCheck = false; + }); sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; src = oldAttrs.src.override { inherit version; - sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb"; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; + # does not find tests + doCheck = false; }); }; }; From 2d1e788f6072b90899cd159dba288625870f52e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 02:23:38 +0200 Subject: [PATCH 270/314] buku: update sqlalchemy hash --- pkgs/applications/misc/buku/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 5227f0e6f474..990c4eb73e7b 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -7,8 +7,9 @@ let version = "1.3.24"; src = oldAttrs.src.override { inherit version; - sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; + doCheck = false; }); sqlalchemy-utils = super.sqlalchemy-utils.overridePythonAttrs (oldAttrs: rec { version = "0.36.6"; From 3d0ccac7fe2247d5d9051d88ec45150b21d64b21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 02:54:53 +0200 Subject: [PATCH 271/314] home-assistant: reduce component tests processes Component tests are often of lesser quality, which may lead to spurious errors when run with high parallelization. Reducing to 4 processes aligns the setup with what GitHub actions provides, which is what upstream uses to test. --- pkgs/servers/home-assistant/default.nix | 2 -- pkgs/servers/home-assistant/tests.nix | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ded617b35f6c..b74947e8ab75 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -293,8 +293,6 @@ in python.pkgs.buildPythonApplication rec { ]; pytestFlagsArray = [ - # parallelize test run - "--numprocesses $NIX_BUILD_CORES" # assign tests grouped by file to workers "--dist loadfile" # retry racy tests that end in "RuntimeError: Event loop is closed" diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 58bb1670e5a0..00b2e7fbac07 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -56,7 +56,11 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( disabledTests = old.disabledTests ++ extraDisabledTests.${component} or []; disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; + # components are more often racy than the core + dontUsePytestXdist = true; + pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray + ++ [ "--numprocesses=4" ] ++ extraPytestFlagsArray.${component} or [ ] ++ [ "tests/components/${component}" ]; From 95769fb2c8210c7de17cfe0a4419a337e82c6390 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 03:35:27 +0200 Subject: [PATCH 272/314] octoprint: fix eval Relying on attributes like these to always be available is prone to an eval error when the overridden package drops them. --- pkgs/applications/misc/octoprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 4dc6f8763189..b7b0f8ae46bf 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -233,7 +233,7 @@ let self: super: { falcon = super.falcon.overridePythonAttrs (oldAttrs: rec { #pytestFlagsArray = [ "-W ignore::DeprecationWarning" ]; - disabledTestPaths = oldAttrs.disabledTestPaths ++ [ + disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [ "tests/asgi/test_asgi_servers.py" ]; }); @@ -244,7 +244,7 @@ let ( self: super: { sanic = super.sanic.overridePythonAttrs (oldAttrs: rec { - disabledTestPaths = oldAttrs.disabledTestPaths ++ [ + disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [ "test_cli.py" "test_cookies.py" # requires network From 04c0a4b7b639a19348d39071c85eedce9df80737 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 03:48:38 +0200 Subject: [PATCH 273/314] home-assistant-cli: downgrade click to 8.0.4 https://github.com/home-assistant-ecosystem/home-assistant-cli/issues/382 --- pkgs/servers/home-assistant/cli.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index baa418776c5b..18bc9c76da00 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -2,7 +2,21 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + click = super.click.overrideAttrs (oldAttrs: rec { + version = "8.0.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-hFjXsSh8X7EoyQ4jOBz5nc3nS+r2x/9jhM6E1v4JCts="; + }; + }); + }; + }; +in + +python.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; version = "0.9.4"; @@ -16,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ aiohttp click click-log @@ -38,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { # $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" #''; - checkInputs = with python3.pkgs; [ + checkInputs = with python.pkgs; [ pytestCheckHook requests-mock ]; From 4584d22ba16a1f4f03a8e4692a6adfd5100d008d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 03:59:00 +0200 Subject: [PATCH 274/314] python3Packages.azure-core: propagate typing-extensions --- pkgs/development/python-modules/azure-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 4e1901c8860d..260a40e9de80 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six + typing-extensions ]; checkInputs = [ @@ -41,7 +42,6 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - typing-extensions ]; # test server needs to be available From 1ccdd9ad738ebc43ad843659bca9d91c19f071e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 04:23:12 +0200 Subject: [PATCH 275/314] python3Packages.starlette: 0.18.0 -> 0.19.0 --- pkgs/development/python-modules/starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 00283cd9ec9c..caa841339e16 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-N2X9pjCiQ6TKRcm6VlyybLLyCdjQuIZHu1vK99gY8rY="; + sha256 = "sha256-gjRTMzoQ8pqxjIusRwRXGs72VYo6xsp2DSUxmEr9KxU="; }; postPatch = '' From c0ea8f066ef1c041442df6f233cc1a96505604f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 04:26:58 +0200 Subject: [PATCH 276/314] python3Packages.python3-saml: relax lxml constraint --- pkgs/development/python-modules/python3-saml/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index 8bc9cf3090f0..dca35089f45f 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -13,6 +13,11 @@ buildPythonPackage rec { sha256 = "sha256-TAfVXh1fSKhNn/lsi7elq4wFyKCxCtCYUTrnH3ytBTw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "lxml<4.7.1" "lxml<5" + ''; + propagatedBuildInputs = [ isodate lxml xmlsec ]; From 5eb123c36504ff166c89aa68f542f34d9045ad9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 04:39:52 +0200 Subject: [PATCH 277/314] python3Packages.approvaltests: 4.0.0 -> 5.0.0 --- .../python-modules/approvaltests/default.nix | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index ece87d1894e0..a6c94f244425 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,36 +1,58 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# propagates +, allpairspy , beautifulsoup4 , empty-files -, numpy , pyperclip , pytest + +# tests +, numpy +, pytestCheckHook }: buildPythonPackage rec { - version = "4.0.0"; + version = "5.0.0"; pname = "approvaltests"; + format = "setuptools"; + + disabled = pythonOlder "3.6.1"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "v${version}"; - sha256 = "sha256-4dg5xTswqLFRBaZagKrkilCvsAnky9donb03MT/PiWM="; + sha256 = "sha256-ku8J1ccX6LZZitlAOgc3eNCdsFx/FP1nqtdgPJF/jRg="; }; propagatedBuildInputs = [ + allpairspy beautifulsoup4 empty-files - numpy pyperclip pytest ]; - postPatch = '' - substituteInPlace setup.py \ - --replace bs4 beautifulsoup4 \ - --replace "pyperclip==1.5.27" "pyperclip>=1.5.27" - ''; + checkInputs = [ + numpy + pytestCheckHook + ]; + + disabledTests = [ + # tests expects paths below ApprovalTests.Python directory + "test_received_filename" + "test_pytest_namer" + ]; + + pythonImportsCheck = [ + "approvaltests.approvals" + "approvaltests.reporters.generic_diff_reporter_factory" + ]; meta = with lib; { description = "Assertion/verification library to aid testing"; From f6e6d9510069981ddcfba55538a2d3cb0e3ea02e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 04:46:10 +0200 Subject: [PATCH 278/314] python3Packages.flask-socketio: 5.0.1 -> 5.1.1 --- .../development/python-modules/flask-socketio/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 496676600fc9..a429e81ce0fb 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; rev = "v${version}"; - sha256 = "01zf6cy95pgc4flgn0740z2my90l7rxwliahp6rb2xbp7rh32cng"; + sha256 = "sha256-PnNJEtcWaisOlt6OmYUl97TlZb9cK2ORvtEcmGPxSB0="; }; propagatedBuildInputs = [ @@ -28,6 +28,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "test_socketio.py" + ]; + pythonImportsCheck = [ "flask_socketio" ]; meta = with lib; { From 2dde351eca481f756c0cba29673616040d13e58e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 04:48:47 +0200 Subject: [PATCH 279/314] python3Packages.glean-parser: relax markupsafe constraint --- .../python-modules/glean-parser/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 704c556c0033..3cb8d83b7c8d 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-PjOMNUnrz0kDfYEXv5Ni/9RIHn4Yylle6NJOK1Rb3SY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" \ + --replace "MarkupSafe==2.0.1" "MarkupSafe" + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -44,11 +50,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; - disabledTests = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 "test_validate_ping" From 8e6075b2acda414c1633d318b37d796b0edf769f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 05:02:37 +0200 Subject: [PATCH 280/314] python3Packages.atom: fix versioning and tests --- .../python-modules/atom/default.nix | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 7db9bda39ee9..88cfc818e3b9 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -1,19 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, future, cppy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, future +, cppy +, pytestCheckHook +}: buildPythonPackage rec { pname = "atom"; version = "0.8.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-LnLyNaljNocqAKr85VhIxZqU3KIPAPWnQpazcdoNrXE="; + src = fetchFromGitHub { + owner = "nucleic"; + repo = pname; + rev = version; + hash = "sha256-Xby3QopKw7teShMi80RMG8YdhOOvfQb5vwOuFEUTxHQ="; }; - buildInputs = [ cppy ]; - propagatedBuildInputs = [ future ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Tests not released to pypi - doCheck = true; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + cppy + ]; + + preCheck = '' + rm -rf atom + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "atom.api" + ]; meta = with lib; { description = "Memory efficient Python objects"; From b95480efb117f524dd0c90f4bab90b8cdc9635e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 13:54:53 +0200 Subject: [PATCH 281/314] fava: 1.19 -> 1.21; fix Werkzeug compat --- pkgs/applications/office/fava/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 92f48eb91b82..5833e5e4adf3 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,14 +1,26 @@ -{ lib, python3 }: +{ lib, python3, fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.19"; + version = "1.21"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "def7c0210bf0ce8dfffdb46ce21b3efcf71eba5a4e903565258419e4c53c2d43"; + sha256 = "sha256-0aFCKEjmXn6yddgNMi9t4rzqHcN7VBLoz3LEg9apmNY="; }; + patches = [ + (fetchpatch { + # Update werkzeug compatibility + url = "https://github.com/beancount/fava/commit/5a99417a42e1d739b1e57fae2d01ff1d146dcbc2.patch"; + hash = "sha256-Y6IcxZAcFJEYgT8/xBIABdkP+pUdQX1EgSS5uNdSJUE="; + excludes = [ + ".pre-commit-config.yaml" + ]; + }) + ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ From 498a4d8feb0a2a92b02689341d852604ddd0142e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Apr 2022 15:36:52 +0200 Subject: [PATCH 282/314] python3Packages.jaxlib: set platforms --- pkgs/development/python-modules/jaxlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 3ecad5e4c7ad..a15e86c01619 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -55,6 +55,8 @@ let homepage = "https://github.com/google/jax"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; + platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; + hydraPlatforms = ["x86_64-linux" ]; # Don't think anybody is checking the darwin builds }; cudatoolkit_joined = symlinkJoin { From 50907e300935a4bd8c09e74ff6a961358703194f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 15:58:07 +0200 Subject: [PATCH 283/314] python3Packages.kivy-garden: fix source --- .../python-modules/kivy-garden/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/kivy-garden/default.nix b/pkgs/development/python-modules/kivy-garden/default.nix index 97f55aa94b02..1475b4448230 100644 --- a/pkgs/development/python-modules/kivy-garden/default.nix +++ b/pkgs/development/python-modules/kivy-garden/default.nix @@ -1,29 +1,31 @@ { lib -, buildPythonPackage, fetchPypi +, buildPythonPackage +, fetchFromGitHub , requests }: buildPythonPackage rec { pname = "kivy-garden"; version = "0.1.5"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-K4N3N46HUB1dJx8z2U8ORMCJiEVyxk+JydYJsfhqJ0g="; + src = fetchFromGitHub { + owner = "kivy-garden"; + repo = "garden"; + rev = "v${version}"; + hash = "sha256-xOMBPFKV7mTa51Q0VKja7b0E509IaWjwlJVlSRVdct8="; }; propagatedBuildInputs = [ requests ]; pythonImportsCheck = [ "garden" ]; - # There are no tests in the Pypi archive and building from source is not - # easily feasible because the build is done using buildozer and multiple - # repositories. + # There are no tests doCheck = false; meta = with lib; { description = "The kivy garden installation script, split into its own package for convenient use in buildozer."; - homepage = "https://pypi.python.org/pypi/kivy-garden"; + homepage = "https://github.com/kivy-garden/garden"; license = licenses.mit; maintainers = with maintainers; [ risson ]; }; From b08880a4f8afc27ee4d39daf22a371e89fe569ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 16:22:40 +0200 Subject: [PATCH 284/314] python3Packages.ansible-runner: build requires pbr --- pkgs/development/python-modules/ansible-runner/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 0083362c753b..706cde06b8b1 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -5,6 +5,7 @@ , fetchPypi , mock , openssh +, pbr , pexpect , psutil , pytest-mock @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-2m5dD+gGDL5LnY7QbDYiGdu4GYu0C49WU29GZY2bnBo="; }; + nativeBuildInputs = [ + pbr + ]; + propagatedBuildInputs = [ ansible psutil From 60d698f8bfcf16a67a3ddf2ae2ccbf542c559c72 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 16:28:52 +0200 Subject: [PATCH 285/314] python3Packages.datasette: relax click & jinja2 constraints Move substituion into postPatch, the canonical place for this kind of operation. --- .../python-modules/datasette/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index f2a0d531a0a7..18c6943d1e67 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "datasette"; version = "0.61.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "simonw"; @@ -41,6 +41,17 @@ buildPythonPackage rec { sha256 = "sha256-HVzMyF4ujYK12UQ25il/XROPo+iBldsMxOTx+duoc5o="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" \ + --replace "click>=7.1.1,<8.1.0" "click>=7.1.1,<8.2.0" \ + --replace "click-default-group~=1.2.2" "click-default-group" \ + --replace "hupper~=1.9" "hupper" \ + --replace "Jinja2>=2.10.3,<3.1.0" "Jinja2" \ + --replace "pint~=0.9" "pint" \ + --replace "uvicorn~=0.11" "uvicorn" + ''; + propagatedBuildInputs = [ aiofiles asgi-csrf @@ -70,17 +81,6 @@ buildPythonPackage rec { trustme ]; - postConfigure = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - substituteInPlace setup.py \ - --replace "click-default-group~=1.2.2" "click-default-group" \ - --replace "hupper~=1.9" "hupper" \ - --replace "pint~=0.9" "pint" \ - --replace "pluggy~=0.13.0" "pluggy" \ - --replace "uvicorn~=0.11" "uvicorn" \ - ''; - # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews # with pytest-xdist, it still takes around 10 mins with 32 cores # just run the csv tests, as this should give some indictation of correctness From cc58bb11698cc49cf8101e392842f33a6a96c55e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 17:11:03 +0200 Subject: [PATCH 286/314] python3Packages.matchpy: 0.5.1 -> 0.5.5 --- .../python-modules/matchpy/default.nix | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 8ee3d60f8010..efcf1741ab41 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -1,11 +1,9 @@ { lib , buildPythonPackage -, fetchpatch -, fetchPypi +, fetchFromGitHub , hopcroftkarp , multiset -, pytest -, pytest-runner +, pytestCheckHook , hypothesis , setuptools-scm , isPy27 @@ -13,37 +11,45 @@ buildPythonPackage rec { pname = "matchpy"; - version = "0.5.1"; + version = "0.5.5"; # Don't upgrade to 4.3.1, this tag is very old disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r"; + src = fetchFromGitHub { + owner = "HPAC"; + repo = pname; + rev = version; + hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA="; }; - patches = [ - # Fix tests for pytest 4. Remove with the next release - (fetchpatch { - url = "https://github.com/HPAC/matchpy/commit/b405a2717a7793d58c47b2e2197d9d00c06fb13c.patch"; - includes = [ "tests/conftest.py" ]; - sha256 = "1b6gqf2vy9qxg384nqr9k8il335afhbdmlyx4vhd8r8rqpv7gax9"; - }) - ]; - postPatch = '' + sed -i '/pytest-runner/d' setup.cfg + substituteInPlace setup.cfg \ - --replace "hypothesis>=3.6,<4.0" "hypothesis" \ - --replace "pytest>=3.0,<4.0" "pytest" + --replace "multiset>=2.0,<3.0" "multiset" ''; - buildInputs = [ setuptools-scm pytest-runner ]; - checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ hopcroftkarp multiset ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + hopcroftkarp + multiset + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ + "matchpy" + ]; meta = with lib; { description = "A library for pattern matching on symbolic expressions"; homepage = "https://github.com/HPAC/matchpy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 77e83e985a5e6a218aac78c0c5404c048f219bd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 17:23:27 +0200 Subject: [PATCH 287/314] python3Packages.scikit-build: fix build Drops code that references non-existant distutils object and then: - Migrates to pyproject, - uses pytestCheckHook, - trims checkInputs. --- .../python-modules/scikit-build/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 66b7a0743c75..8e0caeedb9c4 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -7,16 +7,13 @@ , wheel # Test Inputs , cmake -, codecov , coverage , cython , flake8 , ninja , path -, pytest -, pytest-cov +, pytestCheckHook , pytest-mock -, pytest-runner , pytest-virtualenv , requests , six @@ -26,30 +23,32 @@ buildPythonPackage rec { pname = "scikit-build"; version = "0.13.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-XRd0ousVmI4IHFgsJUq0qXUgluajTyNUEct5vWFmDDc="; }; + postPatch = '' + sed -i '/distutils.dir_util._path_created/d' tests/__init__.py + ''; + propagatedBuildInputs = [ distro packaging setuptools wheel ]; + checkInputs = [ cmake - codecov - coverage cython flake8 ninja path - pytest - pytest-cov + pytestCheckHook pytest-mock - pytest-runner pytest-virtualenv requests six @@ -58,7 +57,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ + disabledTests = [ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies "test_wheel" # pip has no way to install missing dependencies @@ -68,11 +67,9 @@ buildPythonPackage rec { "test_setup" # tries to install using distutils "test_pep518" # pip exits with code 1 "test_dual_pep518" # pip exits with code 1 - ]); - - checkPhase = '' - py.test -k '${disabledTests}' - ''; + "test_isolated_env_trigger_reconfigure" # Regex pattern 'exit skbuild saving cmake spec' does not match 'exit skbuild running make'. + "test_hello_wheel" # [Errno 2] No such file or directory: '_skbuild/linux-x86_64-3.9/setuptools/bdist.linux-x86_64/wheel/helloModule.py' + ]; meta = with lib; { description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; From 2f7893fbf69006a303ab0b61d6e857a4e00b38d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 17:46:03 +0200 Subject: [PATCH 288/314] python3Packages.sanic: disable test_noisy_exceptions Sometimes the noisy exceptions output is missing, which makes the test flaky. --- pkgs/development/python-modules/sanic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 460927719ad5..91d8c564315c 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -123,6 +123,8 @@ buildPythonPackage rec { "test_version" # Sensitive comparison of raw HTTP header fails "test_raw_headers" + # noisy_exceptions sometimes missing from sanic stdout + "test_noisy_exceptions" ]; disabledTestPaths = [ From 8e3fae565c7bdab658aadc7327cb2a19e05d108e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 18:25:26 +0200 Subject: [PATCH 289/314] python3Packages.chalice: relax jmespath constraint https://github.com/aws/chalice/commit/48511562f189d33b43438ca608b10fc376508f09 --- pkgs/development/python-modules/chalice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 93499d0f5638..d309bc71731b 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { sed -i setup.py -e "/pip>=/c\'pip'," substituteInPlace setup.py \ --replace "typing==3.6.4" "typing" \ - --replace "attrs>=19.3.0,<21.3.0" "attrs" + --replace "jmespath>=0.9.3,<1.0.0" "jmespath>=0.9.3,<2.0.0" ''; disabledTestPaths = [ From 4e4e4a570f4a2db98f7201c3b801f1f08c3642e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 18:34:39 +0200 Subject: [PATCH 290/314] python3Packages.trytond: fix werkzeug2.1 compat in test suite --- pkgs/development/python-modules/trytond/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 6a52dd869e05..c2509c662d3d 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonApplication +, fetchpatch , fetchPypi , pythonOlder , mock @@ -34,6 +35,14 @@ buildPythonApplication rec { sha256 = "sha256-Sof6A9lxU70YnCbboJr56CAdTL0cRbaRNxdvG5Tnqnw="; }; + patches = [ + (fetchpatch { + # werkzeug 2.1 compatibility for the tests + url = "https://github.com/tryton/trytond/commit/86a50ca06cf0d79404dbd731141ed29f8e9fcb9d.patch"; + hash = "sha256-xY5Sdhkd0lEgscV7NHwX2YWxobWqQFElY5BJvDT+we8="; + }) + ]; + # Tells the tests which database to use DB_NAME = ":memory:"; From 9a9f7b940bf6e658890000cffd2a56fd6bb64f63 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 21:40:42 +0200 Subject: [PATCH 291/314] python3Packages.pytorch-bin: don't build on hydra It won't complete anyhow, as it exceeds the recently increased maximum output size by another 200 MB. https://hydra.nixos.org/build/173626214 --- pkgs/development/python-modules/pytorch/bin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index 24533a08e475..daa82bba580c 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -76,6 +76,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; + hydraPlatforms = []; # output size 3.2G on 1.11.0 maintainers = with maintainers; [ junjihashimoto ]; }; } From 8c7d490da6e39682fc46228feb6a8bd9733cddd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 22:01:18 +0200 Subject: [PATCH 292/314] python3Packages.pyslurm: 19-05-0 -> 21.08.4 Unbreaks the package. --- .../python-modules/pyslurm/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f25651dcf98b..248ccc41033b 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -1,17 +1,27 @@ -{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: +{ lib +, pythonOlder +, fetchFromGitHub +, buildPythonPackage +, cython +, slurm +}: buildPythonPackage rec { pname = "pyslurm"; - version = "19-05-0"; + version = "21.08.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = version; - sha256 = "1lfb4q81y96syz5an1lzscfcvmfvlkf4cfl3i5zllw9r3gbarl2r"; + rev = "v${version}"; + hash = "sha256-9ZYTBO8g+5B9D8Ll5JjkJYFyh0RQNIjxg958UZoCNmA="; }; buildInputs = [ cython slurm ]; + setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; # Test cases need /etc/slurm/slurm.conf and require a working slurm installation @@ -23,6 +33,5 @@ buildPythonPackage rec { license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; platforms = platforms.linux; - broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } From 8adac3f85fa16aa4dd7fce698ffb1b49f6b3dd40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 22:15:49 +0200 Subject: [PATCH 293/314] python3Packages.pyrad: revamp - Use pyproject build - Patch poetry-core usage - Use unittest over nosetest - Fix meta.homepage --- .../python-modules/pyrad/default.nix | 49 ++++++++++++++++--- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 67841cab7d9f..c8fb0310548d 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -1,8 +1,17 @@ -{ buildPythonPackage, fetchFromGitHub, lib, netaddr, six, nose }: +{ buildPythonPackage +, fetchFromGitHub +, fetchpatch +, lib +, poetry-core +, netaddr +, six +, python +}: buildPythonPackage rec { pname = "pyrad"; version = "2.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "pyradius"; @@ -11,19 +20,43 @@ buildPythonPackage rec { sha256 = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; }; - propagatedBuildInputs = [ netaddr six ]; - checkInputs = [ nose ]; + patches = [ + (fetchpatch { + # Migrate to poetry-core + url = "https://github.com/pyradius/pyrad/commit/a4b70067dd6269e14a2f9530d820390a8a454231.patch"; + hash = "sha256-1We9wrVY3Or3GLIKK6hZvEjVYv6JOaahgP9zOMvgErE="; + }) + ]; - checkPhase = '' - nosetests -e testBind + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + netaddr + six + ]; + + preCheck = '' + substituteInPlace tests/testServer.py \ + --replace "def testBind(self):" "def dontTestBind(self):" \ + --replace "def testBindv6(self):" "def dontTestBindv6(self):" ''; - pythonImportsCheck = [ "pyrad" ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ + "pyrad" + ]; meta = with lib; { description = "Python RADIUS Implementation"; - homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + homepage = "https://github.com/pyradius/pyrad"; license = licenses.bsd3; - maintainers = [ maintainers.globin ]; + maintainers = with maintainers; [ globin ]; }; } From 75331fc5e58c9c5c4fb009af2a378c087d2485bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 14 Apr 2022 22:29:18 +0200 Subject: [PATCH 294/314] python3Packages.SQLAlchemy-ImageAttach: drop Unmaintained since 2017 and incompatible with SQLAlchemy 1.4 --- .../sqlalchemy-imageattach/default.nix | 42 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/sqlalchemy-imageattach/default.nix diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix deleted file mode 100644 index 55026b2b5530..000000000000 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, pytest -, Wand -, webob -, sqlalchemy -, isPyPy -, pkgs -}: - -buildPythonPackage rec { - pname = "SQLAlchemy-ImageAttach"; - version = "1.0.0"; - - src = pkgs.fetchFromGitHub { - repo = "sqlalchemy-imageattach"; - owner = "dahlia"; - rev = version; - sha256 = "0ba97pn5dh00qvxyjbr0mr3pilxqw5kb3a6jd4wwbsfcv6nngqig"; - }; - - checkInputs = [ pytest Wand.imagemagick webob ]; - propagatedBuildInputs = [ sqlalchemy Wand ]; - - checkPhase = '' - cd tests - export MAGICK_HOME="${pkgs.imagemagick.dev}" - export PYTHONPATH=$PYTHONPATH:../ - py.test - cd .. - ''; - - doCheck = !isPyPy; # failures due to sqla version mismatch - - meta = with lib; { - homepage = "https://github.com/dahlia/sqlalchemy-imageattach"; - description = "SQLAlchemy extension for attaching images to entity objects"; - license = licenses.mit; - broken = true; # Incompatible with sqlalchemy>=1.4 (https://github.com/dahlia/sqlalchemy-imageattach/issues/47) - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1fcd5f71f1b1..b2359347199b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -129,6 +129,7 @@ mapAliases ({ SPARQLWrapper = sparqlwrapper; sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 + SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f572b8bec9ea..063ba557ce03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9597,8 +9597,6 @@ in { sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; - SQLAlchemy-ImageAttach = callPackage ../development/python-modules/sqlalchemy-imageattach { }; - sqlalchemy-jsonfield = callPackage ../development/python-modules/sqlalchemy-jsonfield { }; sqlalchemy-migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; From fa37f4a1ff95696d0d1f7a6f64c3fd70ed21735c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 00:43:56 +0200 Subject: [PATCH 295/314] python3Packages.flask-restx: patch for werkzeug 2.1 compat --- .../python-modules/flask-restx/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 42e3eabec74e..4b88ab564507 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , aniso8601 , jsonschema , flask @@ -28,6 +29,20 @@ buildPythonPackage rec { sha256 = "18vrmknyxw6adn62pz3kr9kvazfgjgl4pgimdf8527fyyiwcqy15"; }; + patches = [ + # Fixes werkzeug 2.1 compatibility + (fetchpatch { + # https://github.com/python-restx/flask-restx/pull/427 + url = "https://github.com/python-restx/flask-restx/commit/bb72a51860ea8a42c928f69bdd44ad20b1f9ee7e.patch"; + hash = "sha256-DRH3lI6TV1m0Dq1VyscL7GQS26OOra9g88dXZNrNpmQ="; + }) + (fetchpatch { + # https://github.com/python-restx/flask-restx/pull/427 + url = "https://github.com/python-restx/flask-restx/commit/bb3e9dd83b9d4c0d0fa0de7d7ff713fae71eccee.patch"; + hash = "sha256-HJpjG4aQWzEPCMfbXfkw4mz5TH9d89BCvGH2dE6Jfv0="; + }) + ]; + propagatedBuildInputs = [ aniso8601 flask From b66f4f6d8f46d9249437e509be8c0b549461d3d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 00:52:54 +0200 Subject: [PATCH 296/314] python3Packages.gipc: remove broken flag --- pkgs/development/python-modules/gipc/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 2bab62fbcb10..85d17ee3ab8a 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { ''; homepage = "http://gehrcke.de/gipc"; license = licenses.mit; - # gipc only has support for older versions of gevent - broken = versionOlder "1.6" gevent.version; }; } From 56a90cd79111f94c9250731336fe4baee03ebfa0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:08:20 +0200 Subject: [PATCH 297/314] python3Packages.prompt_toolkit: propagate six --- pkgs/development/python-modules/prompt-toolkit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 4ec9e381dafb..be90726e189b 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytestCheckHook , pythonOlder +, six , wcwidth }: @@ -20,6 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + six wcwidth ]; From bd382e63411b45cfe7659f628c4bd590c727761c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:19:26 +0200 Subject: [PATCH 298/314] python3Packages.vdirsyncer: relax click-log constraint --- .../development/python-modules/vdirsyncer/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 52418b8fd24e..b51246739518 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -28,6 +28,13 @@ buildPythonPackage rec { hash = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0" + + sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg + ''; + propagatedBuildInputs = [ atomicwrites click @@ -49,10 +56,6 @@ buildPythonPackage rec { pytest-subtesthack ]; - postPatch = '' - sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg - ''; - preCheck = '' export DETERMINISTIC_TESTS=true ''; From 621a68e48918d3e2f2f430e1cdbc273e3c4c6831 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:21:49 +0200 Subject: [PATCH 299/314] python3Packages.json-schema-for-humans: relax pytz constraint --- .../python-modules/json-schema-for-humans/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index a9faf437f80f..8fb0e2dd40cf 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { hash = "sha256-H0jvOnrWE4/xxRYNehshHBRNc/qLX1+sCV7O1ACCdew="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pytz = "^2021.1"' 'pytz = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -54,12 +59,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/coveooss/json-schema-for-humans/issues/127 - substituteInPlace pyproject.toml \ - --replace 'PyYAML = "^5.4.1"' 'PyYAML = "*"' - ''; - disabledTests = [ # Tests require network access "test_references_url" From 9ae1ca3fe6510f7cfc2a3f1ddc9b382357e66372 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:27:45 +0200 Subject: [PATCH 300/314] litecli: 1.6.0 -> 1.8.0 --- pkgs/development/tools/database/litecli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index b2a96ab0dc53..a1c35c88ee80 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -4,12 +4,12 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.6.0"; + version = "1.8.0"; disabled = python3Packages.pythonOlder "3.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-TSdOFHW007syOEg4gwvEqDiJkrfLgRmqjP/H/6oBZ/k="; + sha256 = "sha256-AvaSdHlwRlw7rN/o8GjcXZbyXVsrEh+XF37wVTBEED4="; }; propagatedBuildInputs = with python3Packages; [ From 18e3fc0341d351cf3e78eb7309cf928dc65ef6e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:49:25 +0200 Subject: [PATCH 301/314] python3Packages.oci: 2.60.0 -> 2.63.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 8fd06ae3b403..879a317469e2 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.60.0"; + version = "2.63.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24="; + hash = "sha256-EIn7BRXsVf7R2ij8iK3hrNWnLehxKDBlk96lAhFh0xw="; }; propagatedBuildInputs = [ From c089f9c37750606957a878fe37736c0124ec6cac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:53:32 +0200 Subject: [PATCH 302/314] oci-cli: 3.6.0 -> 3.7.2 Pins jmespath to 0.10.0. --- pkgs/tools/admin/oci-cli/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 21d115407f6e..2272a7efdfbe 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -16,6 +16,14 @@ let }; }); + jmespath = super.jmespath.overridePythonAttrs (oldAttrs: rec { + version = "0.10.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"; + }; + }); + }; }; in @@ -23,14 +31,14 @@ with py.pkgs; buildPythonApplication rec { pname = "oci-cli"; - version = "3.6.0"; + version = "3.7.2"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; rev = "v${version}"; - hash = "sha256-ADjHPRG3QzSWR7FvcTIJdcBYmzZK+SWipdY1giNtaME="; + hash = "sha256-20Tnn0s+sfLEsAG9S6f61OVGpRf53wFPtt4a2/TJbCg="; }; propagatedBuildInputs = [ From fd89ce6694b0493f9545ad49c34618aeec740601 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:54:10 +0200 Subject: [PATCH 303/314] python3Packages.myfitnesspal: propagate typing-extensions --- pkgs/development/python-modules/myfitnesspal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index f6df7b88f852..791cb708be5c 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -9,6 +9,7 @@ , python-dateutil , requests , rich +, typing-extensions , pytestCheckHook , mock , nose @@ -36,6 +37,7 @@ buildPythonPackage rec { python-dateutil requests rich + typing-extensions ]; checkInputs = [ From 55ac17856a944e4de6aefc69a12014bb97338db6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:56:19 +0200 Subject: [PATCH 304/314] python3Packages.installer: 0.3.0 -> 0.5.1 --- 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 a19f27a0a753..8749ea16132d 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.3.0"; + version = "0.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; repo = pname; rev = version; - sha256 = "sha256-AxAQgDhRFkb0HB7ttDb+pHuHzwnNDX6UOm9rswzIwmI="; + sha256 = "sha256-vhZYUhUcD5fnjkyEqFMvggVGH9Ri8iNgqRgSBQTOCtM="; }; nativeBuildInputs = [ flit-core ]; From 1607fca7a8db5cca002ca339f422c67b3d529f80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 01:57:25 +0200 Subject: [PATCH 305/314] pdm: 1.13.3 -> 1.14.0 --- pkgs/tools/package-management/pdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index a931578a092d..7458262b168a 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "1.13.3"; + version = "1.14.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5+bjjljmk3AHaDVjYzNuC7lkkvlpLa9/grKgdmERC7k="; + sha256 = "sha256-ZUbcuIRutSoHW5egCpwCKca2IZCgQsRAd72ueDzGySI="; }; # this patch allows us to run additional tests that invoke pdm, which checks From e87755d957088e5366d98197a774eddbfe7d886a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 02:07:19 +0200 Subject: [PATCH 306/314] pgadmin4: relax pytz constraint --- pkgs/tools/admin/pgadmin/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 29d0d91a0122..84781688ec1a 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -54,7 +54,8 @@ python3.pkgs.buildPythonApplication rec { --replace "cryptography==3.*" "cryptography>=3.0" \ --replace "requests==2.25.*" "requests>=2.25.0" \ --replace "boto3==1.20.*" "boto3>=1.20" \ - --replace "botocore==1.23.*" "botocore>=1.23" + --replace "botocore==1.23.*" "botocore>=1.23" \ + --replace "pytz==2021.*" "pytz" # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ From cd3b084c17052771ce7c23243d7f251687095f84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 02:11:19 +0200 Subject: [PATCH 307/314] python3Packages.grip: 4.5.2 -> 4.6.1 --- pkgs/development/python-modules/grip/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index dafa692493e3..eab4b45547c1 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch # Python bits: , buildPythonPackage , pytest @@ -16,23 +15,15 @@ buildPythonPackage rec { pname = "grip"; - version = "4.5.2"; + version = "4.6.1"; src = fetchFromGitHub { owner = "joeyespo"; repo = "grip"; rev = "v${version}"; - sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm"; + sha256 = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4="; }; - patches = [ - # Render "front matter", used in our RFC template and elsewhere - (fetchpatch { - url = "https://github.com/joeyespo/grip/pull/249.patch"; - sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg"; - }) - ]; - checkInputs = [ pytest responses ]; propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; From c2eae2011ceaad99b16a199eda90177e26934282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Apr 2022 03:19:34 +0000 Subject: [PATCH 308/314] python3Packages.rapidfuzz-capi: init at 1.0.5 --- .../python-modules/rapidfuzz-capi/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/rapidfuzz-capi/default.nix diff --git a/pkgs/development/python-modules/rapidfuzz-capi/default.nix b/pkgs/development/python-modules/rapidfuzz-capi/default.nix new file mode 100644 index 000000000000..b0235f1eda44 --- /dev/null +++ b/pkgs/development/python-modules/rapidfuzz-capi/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "rapidfuzz-capi"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "rapidfuzz_capi"; + rev = "v${version}"; + hash = "sha256-0IvJl2JU/k1WbGPWRoucVGbVsEFNPHZT1ozEQAKQnPk="; + }; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "rapidfuzz_capi" ]; + + meta = with lib; { + description = "C-API of RapidFuzz, which can be used to extend RapidFuzz from separate packages"; + homepage = "https://github.com/maxbachmann/rapidfuzz_capi"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 063ba557ce03..71da9cbed2a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8664,6 +8664,8 @@ in { rapidfuzz = callPackage ../development/python-modules/rapidfuzz { }; + rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { }; + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; From 5005b4256107146e4762d34718ec976b7219899c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Apr 2022 04:10:00 +0000 Subject: [PATCH 309/314] python3Packages.jarowinkler: init at 1.0.2 --- .../python-modules/jarowinkler/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/jarowinkler/default.nix diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix new file mode 100644 index 000000000000..3985a22d5bcb --- /dev/null +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cmake +, cython +, rapidfuzz-capi +, scikit-build +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jarowinkler"; + version = "1.0.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "JaroWinkler"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-zVAcV6xxqyfXRUcyWo9PcOdagcexJc/D5k4g5ag3hbY="; + }; + + nativeBuildInputs = [ + cmake + cython + rapidfuzz-capi + scikit-build + ]; + + dontUseCmakeConfigure = true; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + preCheck = '' + # import from $out + rm -r jarowinkler + ''; + + pythonImportsCheck = [ "jarowinkler" ]; + + meta = with lib; { + description = "Library for fast approximate string matching using Jaro and Jaro-Winkler similarity"; + homepage = "https://github.com/maxbachmann/JaroWinkler"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71da9cbed2a6..6c471babb523 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4215,6 +4215,8 @@ in { jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + jarowinkler = callPackage ../development/python-modules/jarowinkler { }; + javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; javaproperties = callPackage ../development/python-modules/javaproperties { }; From 0aba33ec297ea1cbb8c7a659fc40afa56ba9dca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 15 Apr 2022 02:51:56 +0200 Subject: [PATCH 310/314] python310Packages.cython_3: init at 3.0.0a10 --- pkgs/top-level/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c471babb523..5eb9f4427032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1986,6 +1986,15 @@ in { cython = callPackage ../development/python-modules/Cython { }; + cython_3 = self.cython.overridePythonAttrs (old: rec { + version = "3.0.0a10"; + src = old.src.override { + inherit version; + sha256 = "342e95121a3d1a67cbcf7b340391eb40cc5ce3d2a79d7873e005e8783353d89d"; + }; + patches = [ ]; + }); + cytoolz = callPackage ../development/python-modules/cytoolz { }; d2to1 = callPackage ../development/python-modules/d2to1 { }; From 4e5672439c33e85d7eafff30de3b6b560bbc77ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Feb 2022 03:25:51 +0000 Subject: [PATCH 311/314] python3Packages.rapidfuzz: 1.9.1 -> 2.0.8 https://github.com/maxbachmann/RapidFuzz/blob/v2.0.8/CHANGELOG.md --- .../python-modules/rapidfuzz/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 19ee86e93ab6..0ce27eccd0ef 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -2,39 +2,55 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, pytestCheckHook +, cmake +, cython_3 +, rapidfuzz-capi +, scikit-build +, jarowinkler +, numpy , hypothesis , pandas -, numpy +, pytestCheckHook }: buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.9.1"; + version = "2.0.8"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-aZqsQHrxmPqZARkqR1hWaj7XndOlCJjmWk1Cosx4skA="; + hash = "sha256-LA4UpP3jFcVZTYKuq8aBvfGgEhyOLeCUsUXEgSnwb94="; }; + nativeBuildInputs = [ + cmake + cython_3 + rapidfuzz-capi + scikit-build + ]; + + dontUseCmakeConfigure = true; + propagatedBuildInputs = [ + jarowinkler numpy ]; checkInputs = [ - pytestCheckHook hypothesis pandas + pytestCheckHook ]; - disabledTests = [ - "test_levenshtein_block" # hypothesis data generation too slow - ]; + preCheck = '' + # import from $out + rm -r rapidfuzz + ''; pythonImportsCheck = [ "rapidfuzz.fuzz" From d8e61ab141fbd730b1c8cb542b33af4c6b240e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 15 Apr 2022 02:59:46 +0200 Subject: [PATCH 312/314] python310Packages.levenshtein: fix build --- .../python-modules/levenshtein/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index e5f743e0fe11..ebc1c5113753 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -2,14 +2,17 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, cmake +, cython , pytestCheckHook , rapidfuzz +, scikit-build }: buildPythonPackage rec { pname = "levenshtein"; version = "0.18.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,13 +20,18 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "v${version}"; - sha256 = "sha256-3p9LM4tv45bqeTsuyngivqfd5uml7uqGB2ICKqPa0qY="; + # https://github.com/maxbachmann/Levenshtein/issues/22 + fetchSubmodules = true; + sha256 = "sha256-WREYdD5MFOpCzH4BSceRpzQZdpi3Xxxn0DpMvDsNlGo="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "rapidfuzz >= 1.8.2, < 1.9" "rapidfuzz" - ''; + nativeBuildInputs = [ + cmake + cython + scikit-build + ]; + + dontUseCmakeConfigure = true; propagatedBuildInputs = [ rapidfuzz From cd7a1607c662931c127037b06aabb006bdf60aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 15 Apr 2022 03:00:22 +0200 Subject: [PATCH 313/314] python310Packages.scikit-build: 0.13.1 -> 0.14.1 --- .../python-modules/scikit-build/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 8e0caeedb9c4..17b2ac355670 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -1,13 +1,15 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , distro , packaging +, python , setuptools +, setuptools-scm , wheel -# Test Inputs + # Test Inputs , cmake -, coverage , cython , flake8 , ninja @@ -22,29 +24,32 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.13.1"; + version = "0.14.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XRd0ousVmI4IHFgsJUq0qXUgluajTyNUEct5vWFmDDc="; + sha256 = "sha256-Fwc9g3tWVRvt6Pa++utOuj2UM15ZAjmELjZg8HY6CRo="; }; - postPatch = '' - sed -i '/distutils.dir_util._path_created/d' tests/__init__.py - ''; + patches = [ + (fetchpatch { + url = "https://github.com/scikit-build/scikit-build/commit/59cf7a5b09a71d418947db3c9d487471c4573a24.patch"; + sha256 = "sha256-oQllX3qzwWwllczXUMObrwndCfvMdS5FulEhbBORAks="; + }) + ]; propagatedBuildInputs = [ distro packaging setuptools + setuptools-scm wheel ]; checkInputs = [ cmake cython - flake8 ninja path pytestCheckHook @@ -69,11 +74,19 @@ buildPythonPackage rec { "test_dual_pep518" # pip exits with code 1 "test_isolated_env_trigger_reconfigure" # Regex pattern 'exit skbuild saving cmake spec' does not match 'exit skbuild running make'. "test_hello_wheel" # [Errno 2] No such file or directory: '_skbuild/linux-x86_64-3.9/setuptools/bdist.linux-x86_64/wheel/helloModule.py' + # sdist contents differ, contains additional setup.py + "test_hello_sdist" + "test_manifest_in_sdist" + "test_sdist_with_symlinks" + # distutils.errors.DistutilsArgError: no commands supplied + "test_invalid_command" + "test_manifest_in_sdist" + "test_no_command" ]; meta = with lib; { description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; - homepage = "http://scikit-build.org/"; + homepage = "https://github.com/scikit-build/scikit-build"; license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code maintainers = with maintainers; [ FlorianFranzen ]; }; From 0d75610566bf815a073953290a08579c11b81517 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Apr 2022 03:32:42 +0200 Subject: [PATCH 314/314] puddletag: relax lxml version --- pkgs/applications/audio/puddletag/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 701e6fffbbb8..936fb2f54eca 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -17,6 +17,7 @@ let # NOTE: check if we can drop any of these overrides when bumping the version overrideVersions = [ + "lxml" "pyparsing" "pyqt5" ];