From 5804b37991e7600ff968653d8bcd9777336afdca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 Jan 2023 07:54:35 -0800 Subject: [PATCH 1/4] python311Packages.http-parser: cythonize before building --- pkgs/development/python-modules/http-parser/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix index d0fc242c9896..1ca7c73ef2f2 100644 --- a/pkgs/development/python-modules/http-parser/default.nix +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -19,9 +19,14 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + cython setuptools ]; + preBuild = '' + # re-run cython + make -B + ''; pythonImportsCheck = [ "http_parser" From 32a8d42f3d57940e51932aa36247bebf8b953b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 Jan 2023 07:57:57 -0800 Subject: [PATCH 2/4] python311Packages.anyio: 3.5.0 -> 3.6.2 https://github.com/agronholm/anyio/blob/3.6.2/docs/versionhistory.rst --- pkgs/development/python-modules/anyio/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 3ad4d8495f06..927956a49f6d 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.5.0"; + version = "3.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,17 +29,9 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs="; + hash = "sha256-bootaulvx9zmobQGDirsMz5uxuLeCD9ggAvYkPaKnWo="; }; - patches = [ - (fetchpatch { - # Pytest 7.0 compatibility - url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch"; - sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw="; - }) - ]; - preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ''; @@ -95,6 +87,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "anyio" ]; meta = with lib; { + changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; homepage = "https://github.com/agronholm/anyio"; license = licenses.mit; From 2b671e96a88ff40c0a519a0ae24c66c61f0d36e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 Jan 2023 08:15:05 -0800 Subject: [PATCH 3/4] autoflake: move to pythonPackages It is imported by pydantic. --- .../autoflake/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) rename pkgs/development/{tools/analysis => python-modules}/autoflake/default.nix (77%) diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix similarity index 77% rename from pkgs/development/tools/analysis/autoflake/default.nix rename to pkgs/development/python-modules/autoflake/default.nix index adc861588dd5..2eebefa5c11d 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -1,21 +1,24 @@ { lib -, python3 +, buildPythonPackage +, fetchPypi +, pyflakes +, pytestCheckHook }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "autoflake"; version = "1.4"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-YaNTASz/arlMoGKCPR+y9pLErNpRx2/4Oo13kV+6Ueo="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ pyflakes ]; - checkInputs = with python3.pkgs; [ + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0aabf7a24d2..89f95690f485 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2644,7 +2644,7 @@ with pkgs; authenticator = callPackage ../applications/misc/authenticator { }; - autoflake = callPackage ../development/tools/analysis/autoflake { }; + autoflake = with python3.pkgs; toPythonApplication autoflake; autospotting = callPackage ../applications/misc/autospotting { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22b9f25bc400..4b89b98c0dc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -780,6 +780,8 @@ self: super: with self; { autofaiss = callPackage ../development/python-modules/autofaiss { }; + autoflake = callPackage ../development/python-modules/autoflake { }; + autograd = callPackage ../development/python-modules/autograd { }; autoit-ripper = callPackage ../development/python-modules/autoit-ripper { }; From 588d78bba7beea93119ed99ecf2e996f2b4b9820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 Jan 2023 08:16:14 -0800 Subject: [PATCH 4/4] python311Packages.pydantic: autoflake is only used at build time --- pkgs/development/python-modules/pydantic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index e0f342f72217..7ccd400326ae 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { cython ] ++ lib.optionals withDocs [ # dependencies for building documentation + autoflake ansi2html markdown-include mdx-truly-sane-lists @@ -67,7 +68,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - autoflake devtools email-validator pyupgrade