From 1519ccc296b457a4e2e11a1290de9a98cb33b614 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 21 Nov 2024 13:43:25 +0100 Subject: [PATCH 1/6] python3Packages.crochet: init at 2.1.1 --- .../python-modules/crochet/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 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 0000000000000..92422757e8c36 --- /dev/null +++ b/pkgs/development/python-modules/crochet/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + setuptools, + versioneer, + configparser, + twisted, + wrapt, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "crochet"; + version = "2.1.1"; + + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-fs5p3hzo5j/8CvjiMx7E64mNke1Ccar6TMw5hSO4HPk="; + }; + + # Remove vendored versioneer + postPatch = '' + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ + twisted + wrapt + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = pname; + + meta = with lib; { + 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/${version}/docs/news.rst"; + license = licenses.mit; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e898838e9c63..f72fe86f7459c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2688,6 +2688,8 @@ self: super: with self; { criticality-score = callPackage ../development/python-modules/criticality-score { }; + crochet = callPackage ../development/python-modules/crochet { }; + crocoddyl = toPythonModule (pkgs.crocoddyl.override { pythonSupport = true; python3Packages = self; From 2843ede1e9ee4c602e6e38e05393f21b01cd5a0e Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 21 Nov 2024 13:43:49 +0100 Subject: [PATCH 2/6] python3Packages.fedora-messaging: init at 3.6.0 --- .../fedora-messaging/default.nix | 68 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 70 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 0000000000000..aacb3062f930b --- /dev/null +++ b/pkgs/development/python-modules/fedora-messaging/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + poetry-core, + blinker, + click, + crochet, + jsonschema, + pika, + pyopenssl, + requests, + service-identity, + tomli, + twisted, + pytestCheckHook, + pytest-twisted, + pytest-mock, + treq, +}: + +buildPythonPackage rec { + pname = "fedora-messaging"; + version = "3.6.0"; + + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "fedora_messaging"; + inherit version; + hash = "sha256-7NsiDndNHTf8GZ4uIN1Hv4ZMuxwAjHT/CmkNW75HYJ4="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + blinker + click + crochet + jsonschema + pika + pyopenssl + requests + service-identity + tomli + twisted + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-twisted + pytest-mock + treq + ]; + + pythonImportsCheck = "fedora_messaging"; + + meta = with lib; { + 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/blob/v${version}/docs/changelog.md"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f72fe86f7459c..2c41e2381b7e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4478,6 +4478,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 3662b6d810b8ed58126beab4a62982a8b695a543 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 19 Nov 2024 11:00:28 +0100 Subject: [PATCH 3/6] python3Packages.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 1fff774c17159..98ce5855bdb89 100644 --- a/pkgs/development/python-modules/weblate-schemas/default.nix +++ b/pkgs/development/python-modules/weblate-schemas/default.nix @@ -8,18 +8,19 @@ rfc3987, strict-rfc3339, pytestCheckHook, + fedora-messaging, }: 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 = [ + pytestCheckHook + fedora-messaging + ]; pythonImportsCheck = [ "weblate_schemas" ]; From 2027e15920b44da9773a94e69bfef53d5d6d3d3c Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 19 Nov 2024 11:01:00 +0100 Subject: [PATCH 4/6] python3Packages.weblate-language-data: 2024.13 -> 2024.14 --- .../python-modules/weblate-language-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index a8f24fa0a1feb..5265b6a55d8ce 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2024.13"; + version = "2024.14"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-fAT3dI3Tbu329BWaal/n4ka0JSVDzPrJLnzL7/LRjhs="; + hash = "sha256-Q03gtpdS/CVJusP/A6N3KbfFx/wwHWTlVDraCk6yL/0="; }; build-system = [ setuptools ]; From 95f32479887d8d8b6329083b27af408891b3aa76 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 19 Nov 2024 11:01:09 +0100 Subject: [PATCH 5/6] python3Packages.translation-finder: 2.16 -> 2.19 Changelog: https://github.com/WeblateOrg/translation-finder/blob/2.19/CHANGES.rst --- .../python-modules/translation-finder/default.nix | 7 ++++--- .../translation-finder/fix_tests.patch | 13 ------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/translation-finder/default.nix b/pkgs/development/python-modules/translation-finder/default.nix index 1341054331d88..44ab19f44e56c 100644 --- a/pkgs/development/python-modules/translation-finder/default.nix +++ b/pkgs/development/python-modules/translation-finder/default.nix @@ -11,13 +11,14 @@ buildPythonPackage rec { pname = "translation-finder"; - version = "2.16"; + version = "2.19"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-a1C+j4Zo0DJ9BWDn5Zsu4zAftcUixfPktAWdqiFJpiU="; + pname = "translation_finder"; + inherit version; + hash = "sha256-4eTPqI2VBKd5ECJk5mmgrKOaIwLCNhmwCx+jv8G+lwI="; }; patches = [ ./fix_tests.patch ]; diff --git a/pkgs/development/python-modules/translation-finder/fix_tests.patch b/pkgs/development/python-modules/translation-finder/fix_tests.patch index caf748a771304..dc7e87ddcb8d9 100644 --- a/pkgs/development/python-modules/translation-finder/fix_tests.patch +++ b/pkgs/development/python-modules/translation-finder/fix_tests.patch @@ -10,16 +10,3 @@ index c3b020c..9be070d 100644 ], ) -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 3347caf2520a842170f1b5cbd2a2a3d06030da76 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 21 Nov 2024 14:24:01 +0100 Subject: [PATCH 6/6] weblate: 5.8.3 -> 5.8.4 https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.8.4 --- pkgs/by-name/we/weblate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 1d2f3aad81035..941eaf2f948db 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -26,7 +26,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.8.3"; + version = "5.8.4"; pyproject = true; @@ -41,7 +41,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; rev = "refs/tags/weblate-${version}"; - hash = "sha256-Kmna23jhhFRJ0ExplYNPFEaIAJxmwHU2azivfKHHnjs="; + hash = "sha256-8QghEZ6PU3ArQWH9d80YrLjsbjylMEvJIwrGre9NrX8="; }; patches = [