From c2d512849832fa9d26806ba7851c7933ef563ede Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 13:44:30 +0900 Subject: [PATCH 1/6] python312Packages.altcha: init at 0.1.7 --- .../python-modules/altcha/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/altcha/default.nix diff --git a/pkgs/development/python-modules/altcha/default.nix b/pkgs/development/python-modules/altcha/default.nix new file mode 100644 index 000000000000..29072d1f6392 --- /dev/null +++ b/pkgs/development/python-modules/altcha/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "altcha"; + version = "0.1.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "altcha-org"; + repo = "altcha-lib-py"; + tag = "v${version}"; + hash = "sha256-jQUzIriy7p43WfbJ2XtT/n3AQy+f2ByDl7zNBBAxZ4I="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "altcha" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Lightweight Python library for creating and verifying ALTCHA challenges"; + homepage = "https://github.com/altcha-org/altcha-lib-py"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39b7f679e2c6..3f16ad7267e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -566,6 +566,8 @@ self: super: with self; { altair = callPackage ../development/python-modules/altair { }; + altcha = callPackage ../development/python-modules/altcha { }; + altgraph = callPackage ../development/python-modules/altgraph { }; amarna = callPackage ../development/python-modules/amarna { }; From 49f727175c13955e56b8a7322b262540cfdf505c Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 14:10:05 +0900 Subject: [PATCH 2/6] python312Packages.crochet: init at 2.1.1 --- .../python-modules/crochet/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/crochet/default.nix diff --git a/pkgs/development/python-modules/crochet/default.nix b/pkgs/development/python-modules/crochet/default.nix new file mode 100644 index 000000000000..12c85322c75a --- /dev/null +++ b/pkgs/development/python-modules/crochet/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + twisted, + wrapt, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "crochet"; + version = "2.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "itamarst"; + repo = "crochet"; + tag = version; + hash = "sha256-grymhvCC9zDBKhNnQC0o07hdLPV5KMWb6HSz/ntSbq8="; + }; + + # fix for python>=3.12 + postPatch = '' + substituteInPlace versioneer.py \ + --replace-fail "SafeConfigParser()" "ConfigParser()" \ + --replace-fail "parser.readfp" "parser.read_file" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + twisted + wrapt + ]; + + pythonImportsCheck = [ "crochet" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Library that makes it easier to use Twisted from regular blocking code"; + homepage = "https://github.com/itamarst/crochet"; + changelog = "https://github.com/itamarst/crochet/blob/${src.tag}/docs/news.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f16ad7267e8..4759f7c27628 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2726,6 +2726,8 @@ self: super: with self; { credstash = callPackage ../development/python-modules/credstash { }; + crochet = callPackage ../development/python-modules/crochet { }; + crocoddyl = toPythonModule (pkgs.crocoddyl.override { pythonSupport = true; python3Packages = self; From 99be53c1225cbc9652009cda700a08856810db46 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 14:24:34 +0900 Subject: [PATCH 3/6] python312Packages.fedora-messaging: init at 3.6.0 --- .../fedora-messaging/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/fedora-messaging/default.nix diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix new file mode 100644 index 000000000000..f479665de92f --- /dev/null +++ b/pkgs/development/python-modules/fedora-messaging/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + blinker, + click, + crochet, + jsonschema, + pika, + pyopenssl, + requests, + service-identity, + tomli, + twisted, + pytest-mock, + pytest-twisted, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "fedora-messaging"; + version = "3.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fedora-infra"; + repo = "fedora-messaging"; + tag = "v${version}"; + hash = "sha256-t5jwEgKLSB8APie+TD3WpgPYcAAPzEQLA+jXGlWVuNU="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + blinker + click + crochet + jsonschema + pika + pyopenssl + requests + service-identity + tomli + twisted + ]; + + pythonImportsCheck = [ "fedora_messaging" ]; + + nativeCheckInputs = [ + pytest-mock + pytest-twisted + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit" ]; + + meta = { + description = "Library for sending AMQP messages with JSON schema in Fedora infrastructure"; + homepage = "https://github.com/fedora-infra/fedora-messaging"; + changelog = "https://github.com/fedora-infra/fedora-messaging/releases/tag/${src.tag}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4759f7c27628..b903e2c58ea4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4525,6 +4525,8 @@ self: super: with self; { feather-format = callPackage ../development/python-modules/feather-format { }; + fedora-messaging = callPackage ../development/python-modules/fedora-messaging { }; + feedfinder2 = callPackage ../development/python-modules/feedfinder2 { }; feedgen = callPackage ../development/python-modules/feedgen { }; From 09277b1cfef2bd141bcd8e3212d2e657e8127c98 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 13:47:40 +0900 Subject: [PATCH 4/6] python312Packages.weblate-schemas: 2024.1 -> 2024.2 Changelog: https://github.com/WeblateOrg/weblate_schemas/blob/2024.2/CHANGES.rst --- .../python-modules/weblate-schemas/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix index 1fff774c1715..b08c60fe350d 100644 --- a/pkgs/development/python-modules/weblate-schemas/default.nix +++ b/pkgs/development/python-modules/weblate-schemas/default.nix @@ -7,19 +7,20 @@ jsonschema, rfc3987, strict-rfc3339, + fedora-messaging, pytestCheckHook, }: buildPythonPackage rec { pname = "weblate-schemas"; - version = "2024.1"; + version = "2024.2"; pyproject = true; src = fetchPypi { pname = "weblate_schemas"; inherit version; - hash = "sha256-nYPLD3VDO1Z97HI79J6Yjj3bWp1xKB79FWPCW146iz4="; + hash = "sha256-Y7hWqfv1gZ2sT2fNbWLVDzwbVdB/1rT/oND9p/mkYAs="; }; build-system = [ setuptools ]; @@ -31,7 +32,10 @@ buildPythonPackage rec { strict-rfc3339 ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + fedora-messaging + pytestCheckHook + ] ++ jsonschema.optional-dependencies.format; pythonImportsCheck = [ "weblate_schemas" ]; From d3ddbc116879dff4ac26664d04ec599deebfe6a1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 13:47:53 +0900 Subject: [PATCH 5/6] python312Packages.translation-finder: 2.16 -> 2.19 Changelog: https://github.com/WeblateOrg/translation-finder/blob/2.19/CHANGES.rst --- .../translation-finder/default.nix | 14 +++++------ .../translation-finder/fix_tests.patch | 25 ------------------- 2 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/translation-finder/fix_tests.patch diff --git a/pkgs/development/python-modules/translation-finder/default.nix b/pkgs/development/python-modules/translation-finder/default.nix index 1341054331d8..bb9df2e38cf5 100644 --- a/pkgs/development/python-modules/translation-finder/default.nix +++ b/pkgs/development/python-modules/translation-finder/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, charset-normalizer, ruamel-yaml, @@ -11,17 +11,17 @@ buildPythonPackage rec { pname = "translation-finder"; - version = "2.16"; + version = "2.19"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-a1C+j4Zo0DJ9BWDn5Zsu4zAftcUixfPktAWdqiFJpiU="; + src = fetchFromGitHub { + owner = "WeblateOrg"; + repo = "translation-finder"; + tag = version; + hash = "sha256-Hc1KxmzlFqCLHSAgFF8cgxH0dTdUnBV/2T2ZkfzVvSw="; }; - patches = [ ./fix_tests.patch ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/translation-finder/fix_tests.patch b/pkgs/development/python-modules/translation-finder/fix_tests.patch deleted file mode 100644 index caf748a77130..000000000000 --- a/pkgs/development/python-modules/translation-finder/fix_tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/translation_finder/test_api.py b/translation_finder/test_api.py -index c3b020c..9be070d 100644 ---- a/translation_finder/test_api.py -+++ b/translation_finder/test_api.py -@@ -173,6 +173,7 @@ class APITest(DiscoveryTestCase): - "filemask": "json/gotext-*.json", - "template": "json/gotext-en.json", - }, -+ {'filemask': 'linked/*.po', 'new_base': 'linked/messages.pot', 'file_format': 'po'}, - ], - ) - -diff --git a/translation_finder/test_discovery.py b/translation_finder/test_discovery.py -index 1a0ca40..14caa4f 100644 ---- a/translation_finder/test_discovery.py -+++ b/translation_finder/test_discovery.py -@@ -945,6 +945,9 @@ class JSONDiscoveryTest(DiscoveryTestCase): - "file_format": "json-nested", - "template": "src/app/[locale]/_translations/en.json", - }, -+ {'filemask': '*/app/[locale]/_translations/cs.json', 'file_format': 'json-nested'}, -+ {'filemask': '*/app/[locale]/_translations/de.json', 'file_format': 'json-nested'}, -+ {'filemask': '*/app/[locale]/_translations/en.json', 'file_format': 'json-nested'} - ], - ) From 361ddcd4401febdd1a8503c75caec947bccf250c Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 13:18:08 +0900 Subject: [PATCH 6/6] weblate: 5.8.3 -> 5.9.2 --- pkgs/by-name/we/weblate/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 9b88239b287c..fc672746baf2 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -26,12 +26,10 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.8.3"; + version = "5.9.2"; pyproject = true; - disabled = python.pythonOlder "3.11"; - outputs = [ "out" "static" @@ -41,7 +39,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-Kmna23jhhFRJ0ExplYNPFEaIAJxmwHU2azivfKHHnjs="; + hash = "sha256-/fsNQvIIgcTPZHHIwr8sruEJpPJTmXbevoxy1GPmOOU="; }; patches = [ @@ -75,6 +73,7 @@ python.pkgs.buildPythonApplication rec { [ aeidon ahocorasick-rs + altcha (toPythonModule (borgbackup.override { python3 = python; })) celery certifi @@ -103,6 +102,7 @@ python.pkgs.buildPythonApplication rec { gitpython hiredis html2text + httpx iniparse jsonschema lxml @@ -131,6 +131,7 @@ python.pkgs.buildPythonApplication rec { tesserocr translate-toolkit translation-finder + unidecode user-agents weblate-language-data weblate-schemas