From ca13da7173881ed8ea890edc5cea23291efb3c23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:49:06 +0100 Subject: [PATCH 01/12] python311Packages.marshmallow: 3.20.1 -> 3.20.2 Diff: https://github.com/marshmallow-code/marshmallow/compare/refs/tags/3.20.1...3.20.2 Changelog: https://github.com/marshmallow-code/marshmallow/blob/3.20.2/CHANGELOG.rst --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index bbe9c9bf157d..6b09a0e97dfe 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.20.1"; + version = "3.20.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sPYiup7ontnubtBxv+rIT0up4IHPJNCUlH9J4FlHsss="; + hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; }; propagatedBuildInputs = [ From 922b1b02c6701cf0c15807ab555949ae4ab11947 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:57:35 +0100 Subject: [PATCH 02/12] python311Packages.marshmallow: refactor --- pkgs/development/python-modules/marshmallow/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 6b09a0e97dfe..880e3c869aab 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -6,22 +6,27 @@ , pytz , simplejson , packaging +, setuptools }: buildPythonPackage rec { pname = "marshmallow"; version = "3.20.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; - repo = pname; + repo = "marshmallow"; rev = "refs/tags/${version}"; hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging ]; From edf111a2f22ff6200a0de67e08759791dcbbc83f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:58:02 +0100 Subject: [PATCH 03/12] python311Packages.marshmallow-polyfield: refactor --- .../marshmallow-polyfield/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 24d117eb322e..81eed71d3016 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,22 +4,32 @@ , marshmallow , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "marshmallow-polyfield"; version = "5.10"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; - repo = pname; - rev = "v${version}"; + repo = "marshmallow-polyfield"; + rev = "refs/tags/v${version}"; hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow ]; @@ -28,11 +38,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=marshmallow_polyfield" "" - ''; - pythonImportsCheck = [ "marshmallow" ]; From 75f193f9e840f0b8664588ce5bb87311ff91b04b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 13:51:46 +0100 Subject: [PATCH 04/12] python311Packages.token-bucket: add patch to replace imp --- .../python-modules/token-bucket/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index 497d10d84fe8..0805ee9dea39 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -2,14 +2,16 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "token-bucket"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,11 +22,24 @@ buildPythonPackage rec { hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg="; }; + patches = [ + # Replace imp with importlib, https://github.com/falconry/token-bucket/pull/24 + (fetchpatch { + name = "remove-imp.patch"; + url = "https://github.com/falconry/token-bucket/commit/10a3c9f4de00f4933349f66b4c72b6c96db6e766.patch"; + hash = "sha256-Hk5+i3xzeA3F1kXRaRarWT9mff2lT2WNmTfTZvYzGYI="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 3320050e547216ec227003263c8a04aeebd8b2cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 17:19:16 +0100 Subject: [PATCH 05/12] python312Packages.strenum: patch vendorized versioneer --- .../python-modules/strenum/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index b7d2661ce2c8..b3ae130af270 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "strenum"; version = "0.4.15"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA="; }; + patches = [ + # Replace SafeConfigParser and readfp, https://github.com/milanmeu/aioaseko/pull/6 + (fetchpatch { + name = "replace-safeconfigparser.patch"; + url = "https://github.com/irgeek/StrEnum/commit/896bef1b7e4a50c8b53d90c8d2fb5c0164f08ecd.patch"; + hash = "sha256-dmmEzhy17huclo1wOubpBUDc2L7vqEU5b/6a5loM47A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" @@ -26,6 +37,10 @@ buildPythonPackage rec { --replace " --cov=strenum --cov-report term-missing --black --pylint" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,7 +50,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "MOdule for enum that inherits from str"; + description = "Module for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; license = with licenses; [ mit ]; From b8b2a1737d5c32e9f40d388f1c93bea6dc49d90a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 17:29:37 +0100 Subject: [PATCH 06/12] python311Packages.spyse-python: refactor --- .../python-modules/spyse-python/default.nix | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix index 0064454a1eaf..56ffdfe8c080 100644 --- a/pkgs/development/python-modules/spyse-python/default.nix +++ b/pkgs/development/python-modules/spyse-python/default.nix @@ -7,32 +7,23 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "spyse-python"; version = "2.2.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "spyse-com"; - repo = pname; - rev = "v${version}"; - sha256 = "041k0037anwaxp2mh7mdk8rdsw9hdr3arigyyqfxfn35x8j41c3k"; + repo = "spyse-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-c7BAJOplWNcd9v7FrEZuMHHdMpqtHljF7YpbdQYAMxA="; }; - propagatedBuildInputs = [ - requests - dataclasses-json - responses - limiter - ]; - - # Tests requires an API token - doCheck = false; - patches = [ # Update limiter import and rate limit, https://github.com/spyse-com/spyse-python/pull/11 (fetchpatch { @@ -45,11 +36,26 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "'dataclasses~=0.6'," "" \ + --replace "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \ --replace "responses~=0.13.3" "responses>=0.13.3" \ --replace "limiter~=0.1.2" "limiter>=0.1.2" \ --replace "requests~=2.26.0" "requests>=2.26.0" ''; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + dataclasses-json + responses + limiter + ]; + + # Tests requires an API token + doCheck = false; + pythonImportsCheck = [ "spyse" ]; @@ -57,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for spyse.com API"; homepage = "https://github.com/spyse-com/spyse-python"; + changelog = "https://github.com/spyse-com/spyse-python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 5419ff5c8e12bd01c1e15053a609016c30a5e0d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 19:42:04 +0100 Subject: [PATCH 07/12] python311Packages.pygitguardian: relax marshmallow-dataclass constraint --- pkgs/development/python-modules/pygitguardian/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 3d3590a37104..ad97cd944250 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -5,6 +5,7 @@ , marshmallow-dataclass , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests , responses , setuptools @@ -26,7 +27,12 @@ buildPythonPackage rec { hash = "sha256-ybl6QOLb1xE6v0D1C2wKMsSU+r2gWzj24Q4pPIMBsCY="; }; + pythonRelaxDeps = [ + "marshmallow-dataclass" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; From b1103fe5e86c8f0b70abd08fe2d86c7c6cc89a90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 15:43:34 +0100 Subject: [PATCH 08/12] python311Packages.marshmallow-polyfield: 5.10 -> 5.11 Diff: https://github.com/Bachmann1234/marshmallow-polyfield/compare/refs/tags/v5.10...v5.11 --- .../python-modules/marshmallow-polyfield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 81eed71d3016..dfdb85ebf9c7 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.10"; + version = "5.11"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bachmann1234"; repo = "marshmallow-polyfield"; rev = "refs/tags/v${version}"; - hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; + hash = "sha256-jbpeyih2Ccw1Rk+QcXRO9AfN5B/DhZmxa/M6FzXHqqs="; }; postPatch = '' From 0247cfb75a215cdd13c676be6053f7c49e331f90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:18:45 +0100 Subject: [PATCH 09/12] python312Packages.json-schema-for-humans: relax dataclasses-json --- .../python-modules/json-schema-for-humans/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 dfbe2d7d638e..3fa36c938fda 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -11,6 +11,7 @@ , pygments , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , pyyaml , requests @@ -19,19 +20,24 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; version = "0.46"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "coveooss"; - repo = pname; + repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg="; }; + pythonRelaxDeps = [ + "dataclasses-json" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ From cb1d8fd1f5df1307c7f968d61466df6302917d63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:24:08 +0100 Subject: [PATCH 10/12] python311Packages.dataprep-ml: relax pydantic --- .../python-modules/dataprep-ml/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index 6af89e238ccd..00a25158bc87 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage +, colorlog +, dataclasses-json , fetchPypi -, pythonOlder -, poetry-core +, nltk-data , numpy , pandas +, poetry-core +, pydantic , pydateinfer , python-dateutil +, pythonOlder +, pythonRelaxDepsHook , scipy -, type-infer -, dataclasses-json -, colorlog -, pydantic -, nltk-data , symlinkJoin +, type-infer }: let testNltkData = symlinkJoin { name = "nltk-test-data"; - paths = [ nltk-data.punkt nltk-data.stopwords ]; + paths = [ + nltk-data.punkt + nltk-data.stopwords + ]; }; in buildPythonPackage rec { @@ -35,20 +39,25 @@ buildPythonPackage rec { hash = "sha256-BtnRmj5JtgNdCFowgNdpIZn5vUdw8QYCWneHfDgC4/c="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + colorlog + dataclasses-json numpy pandas + pydantic pydateinfer python-dateutil scipy type-infer - dataclasses-json - colorlog - pydantic ]; # PyPI tarball has no tests From 2cd5685649d7b2bafb72be0bbe05019f4cc7f29e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:34:24 +0100 Subject: [PATCH 11/12] python311Packages.stravalib: refactor --- .../python-modules/stravalib/default.nix | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index df64dbebab50..174c583d0745 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -1,23 +1,23 @@ { lib +, arrow , buildPythonPackage , fetchPypi -, nose -, setuptools -, setuptools-scm -, wheel -, arrow -, requests -, units , pint , pydantic +, pythonOlder , pytz -, six +, requests +, responses +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "stravalib"; version = "1.5"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; @@ -27,31 +27,29 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel - ]; - - nativeCheckInputs = [ - nose ]; propagatedBuildInputs = [ arrow - requests - units pint pydantic pytz - six + requests + responses ]; - # tests require network access - # testing strava api + # Tests require network access, testing strava API doCheck = false; + pythonImportsCheck = [ + "stravalib" + ]; + meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; + changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } From e927b3b5cbf7e71d869cb44b8d20a6645bb2c99f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:38:21 +0100 Subject: [PATCH 12/12] python311Packages.stravalib: doesn't support pydantic > 2 https://github.com/stravalib/stravalib/issues/379 --- pkgs/development/python-modules/stravalib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index 174c583d0745..f7e527eae146 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -51,5 +51,7 @@ buildPythonPackage rec { changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; + # Support for pydantic > 2, https://github.com/stravalib/stravalib/issues/379 + broken = versionAtLeast pydantic.version "2"; }; }