From 20b42a887bbfc55bf7349c96019ecf427e2f225b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 16:33:21 -0700 Subject: [PATCH 1/9] python312Packages.phonenumberslite: init at 8.13.39 According to upstream > The phonenumberslite version of the library does not include the > geocoder, carrier and timezone packages, which can be useful if you > have problems installing the main phonenumbers library due to > space/memory limitations. We want to ship a single version of the library to avoid dependency conflicts. This is thus only a wrapper of the non-lite version. --- .../python-modules/phonenumberslite/default.nix | 14 ++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/python-modules/phonenumberslite/default.nix diff --git a/pkgs/development/python-modules/phonenumberslite/default.nix b/pkgs/development/python-modules/phonenumberslite/default.nix new file mode 100644 index 000000000000000..c2e80c4786079c4 --- /dev/null +++ b/pkgs/development/python-modules/phonenumberslite/default.nix @@ -0,0 +1,14 @@ +{ + mkPythonMetaPackage, + phonenumbers, +}: + +mkPythonMetaPackage { + pname = "phonenumberslite"; + inherit (phonenumbers) version; + dependencies = [ phonenumbers ]; + optional-dependencies = phonenumbers.optional-dependencies or { }; + meta = { + inherit (phonenumbers.meta) changelog description homepage; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5292ba1d907ede1..0af368f7b2a291e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10111,6 +10111,8 @@ self: super: with self; { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + phonenumberslite = callPackage ../development/python-modules/phonenumberslite { }; + photutils = callPackage ../development/python-modules/photutils { }; pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { }; From 6f6eb8053d1b6394e829e916692bda607efef3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 16:38:17 -0700 Subject: [PATCH 2/9] python312Packages.flask-security: use phonenumberslite --- .../python-modules/flask-security/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/flask-security/default.nix b/pkgs/development/python-modules/flask-security/default.nix index e202a68ab480c19..8cfc0f5996b978e 100644 --- a/pkgs/development/python-modules/flask-security/default.nix +++ b/pkgs/development/python-modules/flask-security/default.nix @@ -22,7 +22,7 @@ # extras: mfa cryptography, - phonenumbers, + phonenumberslite, webauthn, qrcode, @@ -63,11 +63,6 @@ buildPythonPackage rec { hash = "sha256-RGRwgrDFe+0v8NYyajMikdoi1DQf1I+B5y8KJyF+cZs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail phonenumberslite phonenumbers - ''; - build-system = [ flit-core ]; # flask-login>=0.6.2 not satisfied by version 0.7.0.dev0 @@ -103,7 +98,7 @@ buildPythonPackage rec { ]; mfa = [ cryptography - phonenumbers + phonenumberslite webauthn qrcode ]; From f968e04430935149a122bc688c1982d17dbc3cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 16:40:03 -0700 Subject: [PATCH 3/9] pretix: use phonenumberslite and psycopg2-binary --- pkgs/by-name/pr/pretix/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index ebcab4bda0cc284..c1942a668ca4314 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -102,8 +102,6 @@ python.pkgs.buildPythonApplication rec { ]; pythonRemoveDeps = [ - "phonenumberslite" # we provide phonenumbers instead - "psycopg2-binary" # we provide psycopg2 instead "vat-moss-forked" # we provide a patched vat-moss package ]; @@ -175,11 +173,11 @@ python.pkgs.buildPythonApplication rec { paypalrestsdk paypal-checkout-serversdk pyjwt - phonenumbers + phonenumberslite pillow pretix-plugin-build protobuf - psycopg2 + psycopg2-binary pycountry pycparser pycryptodome From 75edda4ded3331b57393e43b4dffe8c3ce10bc03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 16:51:46 -0700 Subject: [PATCH 4/9] python312Packages.django-phonenumber-field: 7.3.0 -> 8.0.0 Diff: https://github.com/stefanfoulis/django-phonenumber-field/compare/refs/tags/7.3.0...8.0.0 Changelog: https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/8.0.0 --- .../django-phonenumber-field/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix index e58bb4e81cffabc..39cd78b2f495b4d 100644 --- a/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -4,8 +4,9 @@ buildPythonPackage, django, djangorestframework, - fetchPypi, + fetchFromGitHub, phonenumbers, + phonenumberslite, python, pythonOlder, setuptools-scm, @@ -13,19 +14,25 @@ buildPythonPackage rec { pname = "django-phonenumber-field"; - version = "7.3.0"; - format = "pyproject"; + version = "8.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-+c2z3ghfmcJJMoKTo7k9Tl+kQMDI47mesND1R0hil5c="; + src = fetchFromGitHub { + owner = "stefanfoulis"; + repo = "django-phonenumber-field"; + rev = "refs/tags/${version}"; + hash = "sha256-l+BAh7QYGN0AgDHICvlQnBYAcpEn8acu+JBmoo85kF0="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ django ] ++ passthru.optional-dependencies.phonenumbers; + # Upstream doesn't put phonenumbers in dependencies but the package doesn't + # make sense without either of the two optional dependencies. Since, in + # Nixpkgs, phonenumberslite depends on phonenumbers, add the latter + # unconditionally. + dependencies = [ django ] ++ optional-dependencies.phonenumbers; nativeCheckInputs = [ babel @@ -38,8 +45,9 @@ buildPythonPackage rec { ${python.interpreter} -m django test --settings tests.settings ''; - passthru.optional-dependencies = { + optional-dependencies = { phonenumbers = [ phonenumbers ]; + phonenumberslite = [ phonenumberslite ]; }; meta = with lib; { From 2206f617d5705837ac2d930020eee41e6fb0973d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 22:20:49 -0700 Subject: [PATCH 5/9] pretix: unpin django-phonenumber-field --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index c1942a668ca4314..2c6e7ccc16db512 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -90,6 +90,7 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "django-phonenumber-field" "importlib-metadata" "kombu" "markdown" From 7d969b9fd69f8b96670ed762998515aedc75449f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 16:55:20 -0700 Subject: [PATCH 6/9] python312Packages.django-payments: use phonenumberslite --- .../development/python-modules/django-payments/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix index 935808b32c79244..d601d778f009d28 100644 --- a/pkgs/development/python-modules/django-payments/default.nix +++ b/pkgs/development/python-modules/django-payments/default.nix @@ -30,11 +30,6 @@ buildPythonPackage rec { hash = "sha256-6WPV08CV+rko/tRnsT5GyTGYaJbiIKTvpisfRwizBIo="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "django-phonenumber-field[phonenumberslite]" "django-phonenumber-field" - ''; - build-system = [ setuptools setuptools-scm @@ -44,7 +39,7 @@ buildPythonPackage rec { django django-phonenumber-field requests - ] ++ django-phonenumber-field.optional-dependencies.phonenumbers; + ] ++ django-phonenumber-field.optional-dependencies.phonenumberslite; # require internet connection doCheck = false; From 301116e9d9ffc29e91992236ce566741cebc8b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 16:57:50 -0700 Subject: [PATCH 7/9] python312Packages.django-payments: 2.0.0 -> 3.0.1 Diff: https://github.com/jazzband/django-payments/compare/refs/tags/v2.0.0...3.0.1 Changelog: https://github.com/jazzband/django-payments/blob/refs/tags/v3.0.1/CHANGELOG.rst --- .../django-payments/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix index d601d778f009d28..62e4484e45537f3 100644 --- a/pkgs/development/python-modules/django-payments/default.nix +++ b/pkgs/development/python-modules/django-payments/default.nix @@ -13,12 +13,13 @@ setuptools-scm, sphinx-rtd-theme, stripe, + suds-community, xmltodict, }: buildPythonPackage rec { pname = "django-payments"; - version = "2.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-payments"; rev = "refs/tags/v${version}"; - hash = "sha256-6WPV08CV+rko/tRnsT5GyTGYaJbiIKTvpisfRwizBIo="; + hash = "sha256-/XsqtExnNtUGqI40XvvcO/nGq56gbC/mPdtHv1QQyGo="; }; build-system = [ @@ -46,19 +47,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "payments" ]; - passthru.optional-dependencies = { - all = [ - braintree # suds-community - mercadopago - cryptography - xmltodict - stripe - ]; + optional-dependencies = { braintree = [ braintree ]; - cybersource = [ - # suds-community - ]; - docs = [ sphinx-rtd-theme ]; + cybersource = [ suds-community ]; mercadopago = [ mercadopago ]; sagepay = [ cryptography ]; sofort = [ xmltodict ]; @@ -68,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Universal payment handling for Django"; homepage = "https://github.com/jazzband/django-payments/"; - changelog = "https://github.com/jazzband/django-payments/releases/tag/v${version}"; + changelog = "https://github.com/jazzband/django-payments/blob/${src.rev}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ derdennisop ]; }; From 8875d1f8e6e0d14c7cb8b12420a68805d754fc3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 17:27:31 -0700 Subject: [PATCH 8/9] python312Packages.suds: 1.1.2 -> 1.2.0 Diff: https://github.com/suds-community/suds/compare/refs/tags/v1.1.2...v1.2.0 Changelog: https://github.com/suds-community/suds/blob/v1.2.0/CHANGELOG.md --- pkgs/development/python-modules/suds/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix index 054f0b0cb4346f9..35dc2eeaa5bc1ce 100644 --- a/pkgs/development/python-modules/suds/default.nix +++ b/pkgs/development/python-modules/suds/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, setuptools, six, @@ -9,16 +9,20 @@ buildPythonPackage rec { pname = "suds"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-HVz6dBFxk7JEpCM/JGxIPZ9BGYtEjF8UqLrRHE9knys="; + src = fetchFromGitHub { + owner = "suds-community"; + repo = "suds"; + rev = "refs/tags/v${version}"; + hash = "sha256-YdL+zDelRspQ6VMqa45vK1DDS3HjFvKE1P02USVBrEo="; }; build-system = [ setuptools ]; + env.SUDS_PACKAGE = "suds"; + nativeCheckInputs = [ pytestCheckHook six From 7e377b1aa1ee0ad3831040fd7a2579ce8472b5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 17:04:51 -0700 Subject: [PATCH 9/9] python312Packages.suds-community: init at 1.2.0 --- .../python-modules/suds-community/default.nix | 14 ++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/python-modules/suds-community/default.nix diff --git a/pkgs/development/python-modules/suds-community/default.nix b/pkgs/development/python-modules/suds-community/default.nix new file mode 100644 index 000000000000000..e3a9d8a129877ec --- /dev/null +++ b/pkgs/development/python-modules/suds-community/default.nix @@ -0,0 +1,14 @@ +{ + mkPythonMetaPackage, + suds, +}: + +mkPythonMetaPackage { + pname = "suds-community"; + inherit (suds) version; + dependencies = [ suds ]; + optional-dependencies = suds.optional-dependencies or { }; + meta = { + inherit (suds.meta) changelog description homepage; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0af368f7b2a291e..4332f6d5adccde9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15284,6 +15284,8 @@ self: super: with self; { suds = callPackage ../development/python-modules/suds { }; + suds-community = callPackage ../development/python-modules/suds-community { }; + sumo = callPackage ../development/python-modules/sumo { }; sumtypes = callPackage ../development/python-modules/sumtypes { };