diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-07-11 17:45:15 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-07-11 17:45:15 +0000 |
| commit | aa075903243459bd70da1495228adba962160b3d (patch) | |
| tree | 9641eef55c6ee59ff2b2aed098353359210521d6 /dev-python | |
| parent | 346d082088860d59afadaf985dfd3318ae370d3a (diff) | |
| download | baldeagleos-repo-aa075903243459bd70da1495228adba962160b3d.tar.gz baldeagleos-repo-aa075903243459bd70da1495228adba962160b3d.tar.xz baldeagleos-repo-aa075903243459bd70da1495228adba962160b3d.zip | |
Adding metadata
Diffstat (limited to 'dev-python')
51 files changed, 543 insertions, 2692 deletions
diff --git a/dev-python/betterproto/Manifest b/dev-python/betterproto/Manifest deleted file mode 100644 index 11fc008e0550..000000000000 --- a/dev-python/betterproto/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST betterproto-2.0.0_beta4.gh.tar.gz 137744 BLAKE2B 55cde21cca516ae935d8ff99303e3dcf78d952c470eaac2f91b5fa1dc20069e0ad150a0b59518d450c897547a3b3025d9ad683294adca5be6d66f06ba8034615 SHA512 10fc514e7a6d1ab87dd44e00d75d8f48752fa1ece26ccc671eeac502164aee2b8e4a30ec908e4abbb4b1c6671c72fc982764d74ccd0ac0f099d3533dcde64352 -DIST betterproto-2.0.0_beta5.gh.tar.gz 122701 BLAKE2B 6083afab1759653c53f97fd0d65b96941588e7038bc24138d486105fe6d419eb79ca6b8d585263237b02fa40b626560c272c114db15fe5f649e499ba5d6798ab SHA512 b40ecd77ff731d1b157debcc81361aa11a8c94d8198e9e99e94014b883d1f8f34fec86a071de3db06edda37afa5813a5c04f6e29ff75d23da6b0ba1f990f827d diff --git a/dev-python/betterproto/betterproto-2.0.0_beta4.ebuild b/dev-python/betterproto/betterproto-2.0.0_beta4.ebuild deleted file mode 100644 index ce7facdb316b..000000000000 --- a/dev-python/betterproto/betterproto-2.0.0_beta4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Better Protobuf / gRPC Support for Python" -HOMEPAGE="https://github.com/danielgtaylor/python-betterproto" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/danielgtaylor/python-betterproto" -else - MY_PV="${PV/_beta/b}" - S="${WORKDIR}/python-${PN}-${MY_PV}" - SRC_URI="https://github.com/danielgtaylor/python-${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -PATCHES=( - "${FILESDIR}/betterproto-2.0.0b4-fix-tests.patch" - ) - -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - >=dev-python/grpclib-0.4.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/black-19.3[${PYTHON_USEDEP}] - >=dev-python/isort-5.10.1[${PYTHON_USEDEP}] - >=dev-python/jinja-2.11.2[${PYTHON_USEDEP}] - >=dev-python/grpcio-tools-1.40.0[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.1.1[${PYTHON_USEDEP}] - >=dev-python/pytest-asyncio-0.12.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - '>=dev-python/sphinx-rtd-theme-0.5.0' - -python_test() { - "${EPYTHON}" -m tests.generate - epytest -} - -pkg_postinst() { - optfeature "protoc compilation support" "dev-python/black dev-python/isort dev-python/grpcio-tools dev-python/jinja" -} diff --git a/dev-python/betterproto/betterproto-2.0.0_beta5.ebuild b/dev-python/betterproto/betterproto-2.0.0_beta5.ebuild deleted file mode 100644 index 2c4e21fd1cdd..000000000000 --- a/dev-python/betterproto/betterproto-2.0.0_beta5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Better Protobuf / gRPC Support for Python" -HOMEPAGE="https://github.com/danielgtaylor/python-betterproto" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/danielgtaylor/python-betterproto" -else - MY_PV="${PV/_beta/b}" - S="${WORKDIR}/python-${PN}-${MY_PV}" - SRC_URI="https://github.com/danielgtaylor/python-${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - >=dev-python/grpclib-0.4.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/black-19.3[${PYTHON_USEDEP}] - >=dev-python/isort-5.10.1[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}] - >=dev-python/grpcio-tools-1.40.0[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.1.1[${PYTHON_USEDEP}] - >=dev-python/pytest-asyncio-0.12.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - '>=dev-python/sphinx-rtd-theme-0.5.0' - -python_test() { - "${EPYTHON}" -m tests.generate - epytest -} - -pkg_postinst() { - optfeature "protoc compilation support" "dev-python/black dev-python/isort dev-python/grpcio-tools dev-python/jinja" -} diff --git a/dev-python/betterproto/betterproto-9999.ebuild b/dev-python/betterproto/betterproto-9999.ebuild deleted file mode 100644 index d48c9b5cb3e8..000000000000 --- a/dev-python/betterproto/betterproto-9999.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Better Protobuf / gRPC Support for Python" -HOMEPAGE="https://github.com/danielgtaylor/python-betterproto" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/danielgtaylor/python-betterproto" -else - MY_PV="${PV/_beta/b}" - S="${WORKDIR}/python-${PN}-${MY_PV}" - SRC_URI="https://github.com/danielgtaylor/python-${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - >=dev-python/grpclib-0.4.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/black-19.3[${PYTHON_USEDEP}] - >=dev-python/isort-5.10.1[${PYTHON_USEDEP}] - >=dev-python/jinja-2.11.2[${PYTHON_USEDEP}] - >=dev-python/grpcio-tools-1.40.0[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.1.1[${PYTHON_USEDEP}] - >=dev-python/pytest-asyncio-0.12.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - '>=dev-python/sphinx-rtd-theme-0.5.0' - -python_test() { - "${EPYTHON}" -m tests.generate - epytest -} - -pkg_postinst() { - optfeature "protoc compilation support" "dev-python/black dev-python/isort dev-python/grpcio-tools dev-python/jinja" -} diff --git a/dev-python/betterproto/files/betterproto-2.0.0b4-fix-tests.patch b/dev-python/betterproto/files/betterproto-2.0.0b4-fix-tests.patch deleted file mode 100644 index f97267741cb1..000000000000 --- a/dev-python/betterproto/files/betterproto-2.0.0b4-fix-tests.patch +++ /dev/null @@ -1,1086 +0,0 @@ -From bd69862a0200eee369ddd44ab2a28e0066ca582d Mon Sep 17 00:00:00 2001 -From: Arun Babu Neelicattu <arun.neelicattu@gmail.com> -Date: Thu, 3 Mar 2022 14:34:53 +0100 -Subject: [PATCH] test input: use explicit package declaration (#345) - ---- - .github/workflows/ci.yml | 5 ++--- - tests/conftest.py | 10 ++++++++++ - tests/generate.py | 2 +- - tests/grpc/test_grpclib_client.py | 4 ++-- - tests/grpc/thing_service.py | 2 +- - tests/inputs/bool/bool.proto | 2 ++ - tests/inputs/bytes/bytes.proto | 2 ++ - tests/inputs/casing/casing.proto | 2 ++ - .../casing_message_field_uppercase.proto | 2 ++ - tests/inputs/deprecated/deprecated.proto | 2 ++ - tests/inputs/deprecated_field/deprecated_field.proto | 2 ++ - tests/inputs/double/double.proto | 2 ++ - tests/inputs/empty_repeated/empty_repeated.proto | 2 ++ - tests/inputs/enum/enum.proto | 2 ++ - tests/inputs/example/example.proto | 2 ++ - tests/inputs/example_service/test_example_service.py | 2 +- - .../field_name_identical_to_type.proto | 2 ++ - tests/inputs/fixed/fixed.proto | 2 ++ - tests/inputs/float/float.proto | 2 ++ - .../google_impl_behavior_equivalence.proto | 2 ++ - tests/inputs/googletypes/googletypes.proto | 2 ++ - .../googletypes_response/googletypes_response.proto | 2 ++ - .../googletypes_response_embedded.proto | 2 ++ - .../googletypes_service_returns_empty.proto | 2 ++ - .../googletypes_service_returns_googletype.proto | 2 ++ - .../googletypes_struct/googletypes_struct.proto | 2 ++ - .../inputs/googletypes_value/googletypes_value.proto | 2 ++ - .../import_capitalized_package/capitalized.proto | 2 +- - tests/inputs/import_capitalized_package/test.proto | 2 ++ - .../import_child_package_from_package/child.proto | 2 +- - .../import_child_package_from_package.proto | 2 ++ - .../package_message.proto | 2 +- - .../inputs/import_child_package_from_root/child.proto | 2 +- - .../import_child_package_from_root.proto | 2 ++ - .../import_circular_dependency.proto | 2 ++ - tests/inputs/import_circular_dependency/other.proto | 2 +- - tests/inputs/import_circular_dependency/root.proto | 2 ++ - tests/inputs/import_cousin_package/cousin.proto | 2 +- - tests/inputs/import_cousin_package/test.proto | 2 +- - .../import_cousin_package_same_name/cousin.proto | 2 +- - .../inputs/import_cousin_package_same_name/test.proto | 2 +- - .../import_packages_same_name.proto | 2 ++ - tests/inputs/import_packages_same_name/posts_v1.proto | 2 +- - tests/inputs/import_packages_same_name/users_v1.proto | 2 +- - .../import_parent_package_from_child.proto | 2 +- - .../parent_package_message.proto | 2 +- - .../inputs/import_root_package_from_child/child.proto | 2 +- - .../inputs/import_root_package_from_child/root.proto | 2 ++ - .../import_root_sibling/import_root_sibling.proto | 2 ++ - tests/inputs/import_root_sibling/sibling.proto | 2 ++ - .../child_package_request_message.proto | 2 +- - .../import_service_input_message.proto | 2 ++ - .../request_message.proto | 2 ++ - tests/inputs/int32/int32.proto | 2 ++ - tests/inputs/map/map.proto | 2 ++ - tests/inputs/mapmessage/mapmessage.proto | 2 ++ - .../namespace_builtin_types.proto | 2 ++ - .../namespace_keywords/namespace_keywords.proto | 2 ++ - tests/inputs/nested/nested.proto | 2 ++ - tests/inputs/nested2/nested2.proto | 2 ++ - tests/inputs/nested2/package.proto | 2 +- - tests/inputs/nestedtwice/nestedtwice.proto | 2 ++ - tests/inputs/oneof/oneof.proto | 2 ++ - .../oneof_default_value_serialization.proto | 2 ++ - tests/inputs/oneof_empty/oneof_empty.proto | 2 ++ - tests/inputs/oneof_enum/oneof_enum.proto | 2 ++ - .../proto3_field_presence/proto3_field_presence.proto | 2 ++ - .../proto3_field_presence_oneof.proto | 2 ++ - tests/inputs/recursivemessage/recursivemessage.proto | 2 ++ - tests/inputs/ref/ref.proto | 2 ++ - tests/inputs/repeated/repeated.proto | 2 ++ - .../repeated_duration_timestamp.proto | 2 ++ - tests/inputs/repeatedpacked/repeatedpacked.proto | 2 ++ - tests/inputs/service_separate_packages/messages.proto | 2 +- - tests/inputs/service_separate_packages/service.proto | 2 +- - tests/inputs/signed/signed.proto | 2 ++ - tests/test_features.py | 2 +- - tests/test_inputs.py | 11 +---------- - 78 files changed, 141 insertions(+), 37 deletions(-) - -diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -index 02f5ea9..120bfa8 100644 ---- a/.github/workflows/ci.yml -+++ b/.github/workflows/ci.yml -@@ -13,6 +13,7 @@ jobs: - name: ${{ matrix.os }} / ${{ matrix.python-version }} - runs-on: ${{ matrix.os }}-latest - strategy: -+ fail-fast: false - matrix: - os: [Ubuntu, MacOS, Windows] - python-version: ['3.6.7', '3.7', '3.8', '3.9', '3.10'] -@@ -56,9 +57,7 @@ jobs: - - - name: Install dependencies - shell: bash -- run: | -- poetry run python -m pip install pip -U -- poetry install -+ run: poetry install - - - name: Generate code from proto files - shell: bash -diff --git a/tests/conftest.py b/tests/conftest.py -index 6ab4f03..c6b256d 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -1,3 +1,6 @@ -+import copy -+import sys -+ - import pytest - - -@@ -10,3 +13,10 @@ def pytest_addoption(parser): - @pytest.fixture(scope="session") - def repeat(request): - return request.config.getoption("repeat") -+ -+ -+@pytest.fixture -+def reset_sys_path(): -+ original = copy.deepcopy(sys.path) -+ yield -+ sys.path = original -diff --git a/tests/generate.py b/tests/generate.py -index 1d7d3e9..8599804 100755 ---- a/tests/generate.py -+++ b/tests/generate.py -@@ -78,7 +78,7 @@ async def generate_test_case_output( - """ - - test_case_output_path_reference = output_path_reference.joinpath(test_case_name) -- test_case_output_path_betterproto = output_path_betterproto.joinpath(test_case_name) -+ test_case_output_path_betterproto = output_path_betterproto - - os.makedirs(test_case_output_path_reference, exist_ok=True) - os.makedirs(test_case_output_path_betterproto, exist_ok=True) -diff --git a/tests/grpc/test_grpclib_client.py b/tests/grpc/test_grpclib_client.py -index dc13885..28ce56f 100644 ---- a/tests/grpc/test_grpclib_client.py -+++ b/tests/grpc/test_grpclib_client.py -@@ -7,12 +7,12 @@ import grpclib.server - import asyncio - import sys - --from tests.output_betterproto.service.service import ( -+from tests.output_betterproto.service import ( - DoThingRequest, - DoThingResponse, - GetThingRequest, - TestStub as ThingServiceClient, - ) - import grpclib - import grpclib.metadata - -diff --git a/tests/grpc/thing_service.py b/tests/grpc/thing_service.py -index ae05852..835d6f1 100644 ---- a/tests/grpc/thing_service.py -+++ b/tests/grpc/thing_service.py -@@ -1,4 +1,4 @@ --from tests.output_betterproto.service.service import ( -+from tests.output_betterproto.service import ( - DoThingResponse, - DoThingRequest, - GetThingRequest, -diff --git a/tests/inputs/bool/bool.proto b/tests/inputs/bool/bool.proto -index 237e7db..77836b8 100644 ---- a/tests/inputs/bool/bool.proto -+++ b/tests/inputs/bool/bool.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package bool; -+ - message Test { - bool value = 1; - } -diff --git a/tests/inputs/bytes/bytes.proto b/tests/inputs/bytes/bytes.proto -index de677e3..9895468 100644 ---- a/tests/inputs/bytes/bytes.proto -+++ b/tests/inputs/bytes/bytes.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package bytes; -+ - message Test { - bytes data = 1; - } -diff --git a/tests/inputs/casing/casing.proto b/tests/inputs/casing/casing.proto -index ca458b5..2023d93 100644 ---- a/tests/inputs/casing/casing.proto -+++ b/tests/inputs/casing/casing.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package casing; -+ - enum my_enum { - ZERO = 0; - ONE = 1; -diff --git a/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto b/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto -index 9964dfa..c6d42c3 100644 ---- a/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto -+++ b/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package casing_message_field_uppercase; -+ - message Test { - int32 UPPERCASE = 1; - int32 UPPERCASE_V2 = 2; -diff --git a/tests/inputs/deprecated/deprecated.proto b/tests/inputs/deprecated/deprecated.proto -index aa1f818..d7102d0 100644 ---- a/tests/inputs/deprecated/deprecated.proto -+++ b/tests/inputs/deprecated/deprecated.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package deprecated; -+ - // Some documentation about the Test message. - message Test { - // Some documentation about the value. -diff --git a/tests/inputs/deprecated_field/deprecated_field.proto b/tests/inputs/deprecated_field/deprecated_field.proto -index 04de1a9..d303c8d 100644 ---- a/tests/inputs/deprecated_field/deprecated_field.proto -+++ b/tests/inputs/deprecated_field/deprecated_field.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package deprecated_field; -+ - // Some documentation about the Test message. - message Test { - // Some documentation about the value. -diff --git a/tests/inputs/double/double.proto b/tests/inputs/double/double.proto -index 88525d9..66aea95 100644 ---- a/tests/inputs/double/double.proto -+++ b/tests/inputs/double/double.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package double; -+ - message Test { - double count = 1; - } -diff --git a/tests/inputs/empty_repeated/empty_repeated.proto b/tests/inputs/empty_repeated/empty_repeated.proto -index 3be831a..f787301 100644 ---- a/tests/inputs/empty_repeated/empty_repeated.proto -+++ b/tests/inputs/empty_repeated/empty_repeated.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package empty_repeated; -+ - message MessageA { - repeated float values = 1; - } -diff --git a/tests/inputs/enum/enum.proto b/tests/inputs/enum/enum.proto -index a2dfe43..97e12b4 100644 ---- a/tests/inputs/enum/enum.proto -+++ b/tests/inputs/enum/enum.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package enum; -+ - // Tests that enums are correctly serialized and that it correctly handles skipped and out-of-order enum values - message Test { - Choice choice = 1; -diff --git a/tests/inputs/example/example.proto b/tests/inputs/example/example.proto -index 3111058..56bd364 100644 ---- a/tests/inputs/example/example.proto -+++ b/tests/inputs/example/example.proto -@@ -39,6 +39,8 @@ - - syntax = "proto2"; - -+package example; -+ - // package google.protobuf; - - option go_package = "google.golang.org/protobuf/types/descriptorpb"; -diff --git a/tests/inputs/example_service/test_example_service.py b/tests/inputs/example_service/test_example_service.py -index a770ed5..49c58f6 100644 ---- a/tests/inputs/example_service/test_example_service.py -+++ b/tests/inputs/example_service/test_example_service.py -@@ -2,8 +2,8 @@ from typing import AsyncIterable, AsyncIterator - - import pytest - from grpclib.testing import ChannelFor - --from tests.output_betterproto.example_service.example_service import ( -+from tests.output_betterproto.example_service import ( - TestBase, - TestStub, - ExampleRequest, -diff --git a/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto b/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto -index 50fd590..81a0fc4 100644 ---- a/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto -+++ b/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package field_name_identical_to_type; -+ - // Tests that messages may contain fields with names that are identical to their python types (PR #294) - - message Test { -diff --git a/tests/inputs/fixed/fixed.proto b/tests/inputs/fixed/fixed.proto -index 50dad84..0f0ffb4 100644 ---- a/tests/inputs/fixed/fixed.proto -+++ b/tests/inputs/fixed/fixed.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package fixed; -+ - message Test { - fixed32 foo = 1; - sfixed32 bar = 2; -diff --git a/tests/inputs/float/float.proto b/tests/inputs/float/float.proto -index 79922af..fea12b3 100644 ---- a/tests/inputs/float/float.proto -+++ b/tests/inputs/float/float.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package float; -+ - // Some documentation about the Test message. - message Test { - double positive = 1; -diff --git a/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto b/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto -index 31b6bd3..5357a7c 100644 ---- a/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto -+++ b/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package google_impl_behavior_equivalence; -+ - message Foo{ - int64 bar = 1; - } -diff --git a/tests/inputs/googletypes/googletypes.proto b/tests/inputs/googletypes/googletypes.proto -index ba3db12..ef8cb4a 100644 ---- a/tests/inputs/googletypes/googletypes.proto -+++ b/tests/inputs/googletypes/googletypes.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package googletypes; -+ - import "google/protobuf/duration.proto"; - import "google/protobuf/timestamp.proto"; - import "google/protobuf/wrappers.proto"; -diff --git a/tests/inputs/googletypes_response/googletypes_response.proto b/tests/inputs/googletypes_response/googletypes_response.proto -index 9b0be5c..8917d1c 100644 ---- a/tests/inputs/googletypes_response/googletypes_response.proto -+++ b/tests/inputs/googletypes_response/googletypes_response.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package googletypes_response; -+ - import "google/protobuf/wrappers.proto"; - - // Tests that wrapped values can be used directly as return values -diff --git a/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto b/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto -index 89ae4cc..47284e3 100644 ---- a/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto -+++ b/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package googletypes_response_embedded; -+ - import "google/protobuf/wrappers.proto"; - - // Tests that wrapped values are supported as part of output message -diff --git a/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto b/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto -index c454691..2153ad5 100644 ---- a/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto -+++ b/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package googletypes_service_returns_empty; -+ - import "google/protobuf/empty.proto"; - - service Test { -diff --git a/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto b/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto -index 49b2a55..457707b 100644 ---- a/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto -+++ b/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package googletypes_service_returns_googletype; -+ - import "google/protobuf/empty.proto"; - import "google/protobuf/struct.proto"; - -diff --git a/tests/inputs/googletypes_struct/googletypes_struct.proto b/tests/inputs/googletypes_struct/googletypes_struct.proto -index 1dbd64a..2b8b5c5 100644 ---- a/tests/inputs/googletypes_struct/googletypes_struct.proto -+++ b/tests/inputs/googletypes_struct/googletypes_struct.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package googletypes_struct; -+ - import "google/protobuf/struct.proto"; - - message Test { -diff --git a/tests/inputs/googletypes_value/googletypes_value.proto b/tests/inputs/googletypes_value/googletypes_value.proto -index 379d336..d5089d5 100644 ---- a/tests/inputs/googletypes_value/googletypes_value.proto -+++ b/tests/inputs/googletypes_value/googletypes_value.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package googletypes_value; -+ - import "google/protobuf/struct.proto"; - - // Tests that fields of type google.protobuf.Value can contain arbitrary JSON-values. -diff --git a/tests/inputs/import_capitalized_package/capitalized.proto b/tests/inputs/import_capitalized_package/capitalized.proto -index 0b73bab..e80c95c 100644 ---- a/tests/inputs/import_capitalized_package/capitalized.proto -+++ b/tests/inputs/import_capitalized_package/capitalized.proto -@@ -1,7 +1,7 @@ - syntax = "proto3"; - - --package Capitalized; -+package import_capitalized_package.Capitalized; - - message Message { - -diff --git a/tests/inputs/import_capitalized_package/test.proto b/tests/inputs/import_capitalized_package/test.proto -index f94bbc9..38c9b2d 100644 ---- a/tests/inputs/import_capitalized_package/test.proto -+++ b/tests/inputs/import_capitalized_package/test.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_capitalized_package; -+ - import "capitalized.proto"; - - // Tests that we can import from a package with a capital name, that looks like a nested type, but isn't. -diff --git a/tests/inputs/import_child_package_from_package/child.proto b/tests/inputs/import_child_package_from_package/child.proto -index 0865fc8..d99c7c3 100644 ---- a/tests/inputs/import_child_package_from_package/child.proto -+++ b/tests/inputs/import_child_package_from_package/child.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package package.childpackage; -+package import_child_package_from_package.package.childpackage; - - message ChildMessage { - -diff --git a/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto b/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto -index 0d09132..66e0aa8 100644 ---- a/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto -+++ b/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_child_package_from_package; -+ - import "package_message.proto"; - - // Tests generated imports when a message in a package refers to a message in a nested child package. -diff --git a/tests/inputs/import_child_package_from_package/package_message.proto b/tests/inputs/import_child_package_from_package/package_message.proto -index 943282c..79d66f3 100644 ---- a/tests/inputs/import_child_package_from_package/package_message.proto -+++ b/tests/inputs/import_child_package_from_package/package_message.proto -@@ -2,7 +2,7 @@ syntax = "proto3"; - - import "child.proto"; - --package package; -+package import_child_package_from_package.package; - - message PackageMessage { - package.childpackage.ChildMessage c = 1; -diff --git a/tests/inputs/import_child_package_from_root/child.proto b/tests/inputs/import_child_package_from_root/child.proto -index c874e14..2a46d5f 100644 ---- a/tests/inputs/import_child_package_from_root/child.proto -+++ b/tests/inputs/import_child_package_from_root/child.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package childpackage; -+package import_child_package_from_root.childpackage; - - message Message { - -diff --git a/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto b/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto -index d0c111f..6299831 100644 ---- a/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto -+++ b/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_child_package_from_root; -+ - import "child.proto"; - - // Tests generated imports when a message in root refers to a message in a child package. -diff --git a/tests/inputs/import_circular_dependency/import_circular_dependency.proto b/tests/inputs/import_circular_dependency/import_circular_dependency.proto -index 7d02aad..8b159e2 100644 ---- a/tests/inputs/import_circular_dependency/import_circular_dependency.proto -+++ b/tests/inputs/import_circular_dependency/import_circular_dependency.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_circular_dependency; -+ - import "root.proto"; - import "other.proto"; - -diff --git a/tests/inputs/import_circular_dependency/other.proto b/tests/inputs/import_circular_dependency/other.proto -index 2b936a9..833b869 100644 ---- a/tests/inputs/import_circular_dependency/other.proto -+++ b/tests/inputs/import_circular_dependency/other.proto -@@ -1,7 +1,7 @@ - syntax = "proto3"; - - import "root.proto"; --package other; -+package import_circular_dependency.other; - - message OtherPackageMessage { - RootPackageMessage rootPackageMessage = 1; -diff --git a/tests/inputs/import_circular_dependency/root.proto b/tests/inputs/import_circular_dependency/root.proto -index 63d15bf..7383947 100644 ---- a/tests/inputs/import_circular_dependency/root.proto -+++ b/tests/inputs/import_circular_dependency/root.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_circular_dependency; -+ - message RootPackageMessage { - - } -diff --git a/tests/inputs/import_cousin_package/cousin.proto b/tests/inputs/import_cousin_package/cousin.proto -index 4361545..2870dfe 100644 ---- a/tests/inputs/import_cousin_package/cousin.proto -+++ b/tests/inputs/import_cousin_package/cousin.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package cousin.cousin_subpackage; -+package import_cousin_package.cousin.cousin_subpackage; - - message CousinMessage { - } -diff --git a/tests/inputs/import_cousin_package/test.proto b/tests/inputs/import_cousin_package/test.proto -index 53f3b7f..89ec3d8 100644 ---- a/tests/inputs/import_cousin_package/test.proto -+++ b/tests/inputs/import_cousin_package/test.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package test.subpackage; -+package import_cousin_package.test.subpackage; - - import "cousin.proto"; - -diff --git a/tests/inputs/import_cousin_package_same_name/cousin.proto b/tests/inputs/import_cousin_package_same_name/cousin.proto -index 9253b95..84b6a40 100644 ---- a/tests/inputs/import_cousin_package_same_name/cousin.proto -+++ b/tests/inputs/import_cousin_package_same_name/cousin.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package cousin.subpackage; -+package import_cousin_package_same_name.cousin.subpackage; - - message CousinMessage { - } -diff --git a/tests/inputs/import_cousin_package_same_name/test.proto b/tests/inputs/import_cousin_package_same_name/test.proto -index fe31b5f..7b420d3 100644 ---- a/tests/inputs/import_cousin_package_same_name/test.proto -+++ b/tests/inputs/import_cousin_package_same_name/test.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package test.subpackage; -+package import_cousin_package_same_name.test.subpackage; - - import "cousin.proto"; - -diff --git a/tests/inputs/import_packages_same_name/import_packages_same_name.proto b/tests/inputs/import_packages_same_name/import_packages_same_name.proto -index c1f28e9..dff7efe 100644 ---- a/tests/inputs/import_packages_same_name/import_packages_same_name.proto -+++ b/tests/inputs/import_packages_same_name/import_packages_same_name.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_packages_same_name; -+ - import "users_v1.proto"; - import "posts_v1.proto"; - -diff --git a/tests/inputs/import_packages_same_name/posts_v1.proto b/tests/inputs/import_packages_same_name/posts_v1.proto -index 506bf11..d3b9b1c 100644 ---- a/tests/inputs/import_packages_same_name/posts_v1.proto -+++ b/tests/inputs/import_packages_same_name/posts_v1.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package posts.v1; -+package import_packages_same_name.posts.v1; - - message Post { - -diff --git a/tests/inputs/import_packages_same_name/users_v1.proto b/tests/inputs/import_packages_same_name/users_v1.proto -index 6e46ba8..d3a17e9 100644 ---- a/tests/inputs/import_packages_same_name/users_v1.proto -+++ b/tests/inputs/import_packages_same_name/users_v1.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package users.v1; -+package import_packages_same_name.users.v1; - - message User { - -diff --git a/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto b/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto -index c43c1bc..edc4736 100644 ---- a/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto -+++ b/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto -@@ -2,7 +2,7 @@ syntax = "proto3"; - - import "parent_package_message.proto"; - --package parent.child; -+package import_parent_package_from_child.parent.child; - - // Tests generated imports when a message refers to a message defined in its parent package - -diff --git a/tests/inputs/import_parent_package_from_child/parent_package_message.proto b/tests/inputs/import_parent_package_from_child/parent_package_message.proto -index cea3066..fb3fd31 100644 ---- a/tests/inputs/import_parent_package_from_child/parent_package_message.proto -+++ b/tests/inputs/import_parent_package_from_child/parent_package_message.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package parent; -+package import_parent_package_from_child.parent; - - message ParentPackageMessage { - } -diff --git a/tests/inputs/import_root_package_from_child/child.proto b/tests/inputs/import_root_package_from_child/child.proto -index d2b29cc..bd51967 100644 ---- a/tests/inputs/import_root_package_from_child/child.proto -+++ b/tests/inputs/import_root_package_from_child/child.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package child; -+package import_root_package_from_child.child; - - import "root.proto"; - -diff --git a/tests/inputs/import_root_package_from_child/root.proto b/tests/inputs/import_root_package_from_child/root.proto -index 650b29b..6ae955a 100644 ---- a/tests/inputs/import_root_package_from_child/root.proto -+++ b/tests/inputs/import_root_package_from_child/root.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_root_package_from_child; -+ - - message RootMessage { - } -diff --git a/tests/inputs/import_root_sibling/import_root_sibling.proto b/tests/inputs/import_root_sibling/import_root_sibling.proto -index 1d671b8..759e606 100644 ---- a/tests/inputs/import_root_sibling/import_root_sibling.proto -+++ b/tests/inputs/import_root_sibling/import_root_sibling.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_root_sibling; -+ - import "sibling.proto"; - - // Tests generated imports when a message in the root package refers to another message in the root package -diff --git a/tests/inputs/import_root_sibling/sibling.proto b/tests/inputs/import_root_sibling/sibling.proto -index 870baff..6b6ba2e 100644 ---- a/tests/inputs/import_root_sibling/sibling.proto -+++ b/tests/inputs/import_root_sibling/sibling.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_root_sibling; -+ - message SiblingMessage { - - } -diff --git a/tests/inputs/import_service_input_message/child_package_request_message.proto b/tests/inputs/import_service_input_message/child_package_request_message.proto -index 6380db2..54fc112 100644 ---- a/tests/inputs/import_service_input_message/child_package_request_message.proto -+++ b/tests/inputs/import_service_input_message/child_package_request_message.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package child; -+package import_service_input_message.child; - - message ChildRequestMessage { - int32 child_argument = 1; -diff --git a/tests/inputs/import_service_input_message/import_service_input_message.proto b/tests/inputs/import_service_input_message/import_service_input_message.proto -index 7ca9c46..cbf48fa 100644 ---- a/tests/inputs/import_service_input_message/import_service_input_message.proto -+++ b/tests/inputs/import_service_input_message/import_service_input_message.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_service_input_message; -+ - import "request_message.proto"; - import "child_package_request_message.proto"; - -diff --git a/tests/inputs/import_service_input_message/request_message.proto b/tests/inputs/import_service_input_message/request_message.proto -index 5bfceed..36a6e78 100644 ---- a/tests/inputs/import_service_input_message/request_message.proto -+++ b/tests/inputs/import_service_input_message/request_message.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package import_service_input_message; -+ - message RequestMessage { - int32 argument = 1; - } -\ No newline at end of file -diff --git a/tests/inputs/int32/int32.proto b/tests/inputs/int32/int32.proto -index cae0dc7..4721c23 100644 ---- a/tests/inputs/int32/int32.proto -+++ b/tests/inputs/int32/int32.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package int32; -+ - // Some documentation about the Test message. - message Test { - // Some documentation about the count. -diff --git a/tests/inputs/map/map.proto b/tests/inputs/map/map.proto -index 669e287..ecef3cc 100644 ---- a/tests/inputs/map/map.proto -+++ b/tests/inputs/map/map.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package map; -+ - message Test { - map<string, int32> counts = 1; - } -diff --git a/tests/inputs/mapmessage/mapmessage.proto b/tests/inputs/mapmessage/mapmessage.proto -index 07dcce5..2c704a4 100644 ---- a/tests/inputs/mapmessage/mapmessage.proto -+++ b/tests/inputs/mapmessage/mapmessage.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package mapmessage; -+ - message Test { - map<string, Nested> items = 1; - } -diff --git a/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto b/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto -index 636bb55..71cb029 100644 ---- a/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto -+++ b/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package namespace_builtin_types; -+ - // Tests that messages may contain fields with names that are python types - - message Test { -diff --git a/tests/inputs/namespace_keywords/namespace_keywords.proto b/tests/inputs/namespace_keywords/namespace_keywords.proto -index 6d1a7c5..ac3e5c5 100644 ---- a/tests/inputs/namespace_keywords/namespace_keywords.proto -+++ b/tests/inputs/namespace_keywords/namespace_keywords.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package namespace_keywords; -+ - // Tests that messages may contain fields that are Python keywords - // - // Generated with Python 3.7.6 -diff --git a/tests/inputs/nested/nested.proto b/tests/inputs/nested/nested.proto -index 98bafd9..043cee0 100644 ---- a/tests/inputs/nested/nested.proto -+++ b/tests/inputs/nested/nested.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package nested; -+ - // A test message with a nested message inside of it. - message Test { - // This is the nested type. -diff --git a/tests/inputs/nested2/nested2.proto b/tests/inputs/nested2/nested2.proto -index 3e39918..cd6510c 100644 ---- a/tests/inputs/nested2/nested2.proto -+++ b/tests/inputs/nested2/nested2.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package nested2; -+ - import "package.proto"; - - message Game { -diff --git a/tests/inputs/nested2/package.proto b/tests/inputs/nested2/package.proto -index 4466256..e12abb1 100644 ---- a/tests/inputs/nested2/package.proto -+++ b/tests/inputs/nested2/package.proto -@@ -1,6 +1,6 @@ - syntax = "proto3"; - --package equipment; -+package nested2.equipment; - - message Weapon { - -diff --git a/tests/inputs/nestedtwice/nestedtwice.proto b/tests/inputs/nestedtwice/nestedtwice.proto -index 7e9c206..9a54a86 100644 ---- a/tests/inputs/nestedtwice/nestedtwice.proto -+++ b/tests/inputs/nestedtwice/nestedtwice.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package nestedtwice; -+ - message Test { - message Top { - message Middle { -diff --git a/tests/inputs/oneof/oneof.proto b/tests/inputs/oneof/oneof.proto -index 1f9c4b2..21aa6c6 100644 ---- a/tests/inputs/oneof/oneof.proto -+++ b/tests/inputs/oneof/oneof.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package oneof; -+ - message Test { - oneof foo { - int32 pitied = 1; -diff --git a/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto b/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto -index 44163c7..f7ac6fe 100644 ---- a/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto -+++ b/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package oneof_default_value_serialization; -+ - import "google/protobuf/duration.proto"; - import "google/protobuf/timestamp.proto"; - import "google/protobuf/wrappers.proto"; -diff --git a/tests/inputs/oneof_empty/oneof_empty.proto b/tests/inputs/oneof_empty/oneof_empty.proto -index 45ca371..ca51d5a 100644 ---- a/tests/inputs/oneof_empty/oneof_empty.proto -+++ b/tests/inputs/oneof_empty/oneof_empty.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package oneof_empty; -+ - message Nothing {} - - message MaybeNothing { -diff --git a/tests/inputs/oneof_enum/oneof_enum.proto b/tests/inputs/oneof_enum/oneof_enum.proto -index dfe19d4..906abcb 100644 ---- a/tests/inputs/oneof_enum/oneof_enum.proto -+++ b/tests/inputs/oneof_enum/oneof_enum.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package oneof_enum; -+ - message Test { - oneof action { - Signal signal = 1; -diff --git a/tests/inputs/proto3_field_presence/proto3_field_presence.proto b/tests/inputs/proto3_field_presence/proto3_field_presence.proto -index d647843..f28123d 100644 ---- a/tests/inputs/proto3_field_presence/proto3_field_presence.proto -+++ b/tests/inputs/proto3_field_presence/proto3_field_presence.proto -@@ -1,3 +1,5 @@ - syntax = "proto3"; - -+package proto3_field_presence; -+ - message InnerTest { -diff --git a/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto b/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto -index c4dc9d4..caa76ec 100644 ---- a/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto -+++ b/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package proto3_field_presence_oneof; -+ - message Test { - oneof kind { - Nested nested = 1; -diff --git a/tests/inputs/recursivemessage/recursivemessage.proto b/tests/inputs/recursivemessage/recursivemessage.proto -index f988316..1da2b57 100644 ---- a/tests/inputs/recursivemessage/recursivemessage.proto -+++ b/tests/inputs/recursivemessage/recursivemessage.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package recursivemessage; -+ - message Test { - string name = 1; - Test child = 2; -diff --git a/tests/inputs/ref/ref.proto b/tests/inputs/ref/ref.proto -index e09fb15..6945590 100644 ---- a/tests/inputs/ref/ref.proto -+++ b/tests/inputs/ref/ref.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package ref; -+ - import "repeatedmessage.proto"; - - message Test { -diff --git a/tests/inputs/repeated/repeated.proto b/tests/inputs/repeated/repeated.proto -index 42c1132..4f3c788 100644 ---- a/tests/inputs/repeated/repeated.proto -+++ b/tests/inputs/repeated/repeated.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package repeated; -+ - message Test { - repeated string names = 1; - } -diff --git a/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto b/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto -index 7b7bf36..38f1eaa 100644 ---- a/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto -+++ b/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package repeated_duration_timestamp; -+ - import "google/protobuf/duration.proto"; - import "google/protobuf/timestamp.proto"; - -diff --git a/tests/inputs/repeatedpacked/repeatedpacked.proto b/tests/inputs/repeatedpacked/repeatedpacked.proto -index ea86dde..a037d1b 100644 ---- a/tests/inputs/repeatedpacked/repeatedpacked.proto -+++ b/tests/inputs/repeatedpacked/repeatedpacked.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package repeatedpacked; -+ - message Test { - repeated int32 counts = 1; - repeated sint64 signed = 2; -diff --git a/tests/inputs/service_separate_packages/messages.proto b/tests/inputs/service_separate_packages/messages.proto -index add0ed8..270b188 100644 ---- a/tests/inputs/service_separate_packages/messages.proto -+++ b/tests/inputs/service_separate_packages/messages.proto -@@ -3,7 +3,7 @@ syntax = "proto3"; - import "google/protobuf/duration.proto"; - import "google/protobuf/timestamp.proto"; - --package things.messages; -+package service_separate_packages.things.messages; - - message DoThingRequest { - string name = 1; -diff --git a/tests/inputs/service_separate_packages/service.proto b/tests/inputs/service_separate_packages/service.proto -index 48acc25..950eab4 100644 ---- a/tests/inputs/service_separate_packages/service.proto -+++ b/tests/inputs/service_separate_packages/service.proto -@@ -2,7 +2,7 @@ syntax = "proto3"; - - import "messages.proto"; - --package things.service; -+package service_separate_packages.things.service; - - service Test { - rpc DoThing (things.messages.DoThingRequest) returns (things.messages.DoThingResponse); -diff --git a/tests/inputs/signed/signed.proto b/tests/inputs/signed/signed.proto -index 23fc9ee..b40aad4 100644 ---- a/tests/inputs/signed/signed.proto -+++ b/tests/inputs/signed/signed.proto -@@ -1,5 +1,7 @@ - syntax = "proto3"; - -+package signed; -+ - message Test { - // todo: rename fields after fixing bug where 'signed_32_positive' will map to 'signed_32Positive' as output json - sint32 signed32 = 1; // signed_32_positive -diff --git a/tests/test_features.py b/tests/test_features.py -index 0fedce2..7dc3f35 100644 ---- a/tests/test_features.py -+++ b/tests/test_features.py -@@ -480,7 +480,7 @@ def test_iso_datetime_list(): - - - def test_enum_service_argument__expected_default_value(): -- from tests.output_betterproto.service.service import ThingType, TestStub -+ from tests.output_betterproto.service import ThingType, TestStub - - sig = signature(TestStub.do_thing) - assert sig.parameters["type"].default == ThingType.UNKNOWN -diff --git a/tests/test_inputs.py b/tests/test_inputs.py -index dbcf197..278a4da 100644 ---- a/tests/test_inputs.py -+++ b/tests/test_inputs.py -@@ -23,8 +23,6 @@ from tests.util import ( - # break things because we can't properly reset the symbol database. - os.environ["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = "python" - --from google.protobuf import symbol_database --from google.protobuf.descriptor_pool import DescriptorPool - from google.protobuf.json_format import Parse - - -@@ -125,14 +123,9 @@ def dict_replace_nans(input_dict: Dict[Any, Any]) -> Dict[Any, Any]: - - - @pytest.fixture --def test_data(request): -+def test_data(request, reset_sys_path): - test_case_name = request.param - -- # Reset the internal symbol database so we can import the `Test` message -- # multiple times. Ugh. -- sym = symbol_database.Default() -- sym.pool = DescriptorPool() -- - reference_module_root = os.path.join( - *reference_output_package.split("."), test_case_name - ) -@@ -158,8 +151,6 @@ def test_data(request): - ) - ) - -- sys.path.remove(reference_module_root) -- - - @pytest.mark.parametrize("test_data", test_cases.messages, indirect=True) - def test_message_can_instantiated(test_data: TestData) -> None: --- -2.40.0 - diff --git a/dev-python/betterproto/metadata.xml b/dev-python/betterproto/metadata.xml deleted file mode 100644 index f52a95675fe8..000000000000 --- a/dev-python/betterproto/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>antonin.riha@protonmail.com</email> - <name>AntonÃn ŘÃha</name> - </maintainer> - <upstream> - <bugs-to>https://github.com/danielgtaylor/python-betterproto/issues</bugs-to> - </upstream> - <origin>gentoo-guru-overlay</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest index 9ea98d964c55..a1333f1e47f1 100644 --- a/dev-python/cattrs/Manifest +++ b/dev-python/cattrs/Manifest @@ -1 +1,2 @@ DIST cattrs-23.2.3.gh.tar.gz 612120 BLAKE2B a227cc50cb23a76931562f17444fcfb4a5532cac74f80b478a8abb6d113cbb0a06c471c3ca7ee256f74640486464762f4a13387ccfc1cd144cfd1a9bfecddd8e SHA512 76a75ea0893bb1549dd5178436c4823ae5b918c16f0d8195203c48e894438ec792cee77698d783f7e43c07445c46a6041a309c3d3bbcadcff95d9c4079e3d622 +DIST cattrs-6290cacdb7f9d195b4f96ce0ab036c8eebf35d94.gh.tar.gz 426769 BLAKE2B 61851be04434e55d627aac6fd73d72d9d4d8a150bedb6110f4b99068dd58ed29fd23ff083c595eb508b144546d8e4d1e926831dc51985775773ab86a86d98815 SHA512 f1034ae0c57a0618c6568ebac0696928e125121431e965c0ceeda82070a21b448630e3188cc03a8d7a44447126a4a2623b8604ef856a89268e1c0802761d89b9 diff --git a/dev-python/cattrs/cattrs-23.2.3_p20240627.ebuild b/dev-python/cattrs/cattrs-23.2.3_p20240627.ebuild new file mode 100644 index 000000000000..0253407800fb --- /dev/null +++ b/dev-python/cattrs/cattrs-23.2.3_p20240627.ebuild @@ -0,0 +1,101 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 ) + +inherit distutils-r1 + +EGIT_COMMIT="6290cacdb7f9d195b4f96ce0ab036c8eebf35d94" +MY_P=cattrs-${EGIT_COMMIT} + +DESCRIPTION="Composable complex class support for attrs and dataclasses" +HOMEPAGE=" + https://pypi.org/project/cattrs/ + https://github.com/python-attrs/cattrs/ +" +SRC_URI=" + https://github.com/python-attrs/cattrs/archive/${EGIT_COMMIT}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="test-rust" + +RDEPEND=" + >=dev-python/attrs-20.1.0[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) +" +BDEPEND=" + dev-python/hatch-vcs[${PYTHON_USEDEP}] + test? ( + >=dev-python/cbor2-5.4.6[${PYTHON_USEDEP}] + >=dev-python/hypothesis-6.54.5[${PYTHON_USEDEP}] + >=dev-python/immutables-0.18[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}] + >=dev-python/pymongo-4.2.0[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}] + >=dev-python/tomlkit-0.11.4[${PYTHON_USEDEP}] + >=dev-python/ujson-5.4.0[${PYTHON_USEDEP}] + test-rust? ( + $(python_gen_cond_dep ' + >=dev-python/orjson-3.5.2[${PYTHON_USEDEP}] + ' 'python*') + ) + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +PATCHES=( + # https://github.com/python-attrs/cattrs/pull/543 + "${FILESDIR}/${P}-py313.patch" +) + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_p/+} + +python_test() { + local EPYTEST_IGNORE=( + # requires msgspec + tests/preconf/test_msgspec_cpython.py + ) + local EPYTEST_DESELECT=( + # these require msgspec + tests/test_preconf.py::test_msgspec_json_unstruct_collection_overrides + tests/test_preconf.py::test_msgspec_json_unions + tests/test_preconf.py::test_msgspec_json_converter + ) + + if ! has_version "dev-python/orjson[${PYTHON_USEDEP}]"; then + EPYTEST_DESELECT+=( + tests/test_preconf.py::test_orjson + tests/test_preconf.py::test_orjson_converter + tests/test_preconf.py::test_orjson_converter_unstruct_collection_overrides + ) + fi + + case ${EPYTHON} in + python3.13) + EPYTEST_DESELECT+=( + tests/preconf/test_pyyaml.py::test_pyyaml + tests/preconf/test_pyyaml.py::test_pyyaml_converter + tests/test_converter.py::test_simple_roundtrip + tests/test_gen_dict.py::test_unmodified_generated_structuring + tests/test_generics.py::test_unstructure_deeply_nested_generics_list + tests/test_unstructure_collections.py::test_collection_unstructure_override_mapping + ) + ;; + esac + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest -o addopts= tests +} diff --git a/dev-python/cattrs/files/cattrs-23.2.3_p20240627-py313.patch b/dev-python/cattrs/files/cattrs-23.2.3_p20240627-py313.patch new file mode 100644 index 000000000000..1ea85a653a32 --- /dev/null +++ b/dev-python/cattrs/files/cattrs-23.2.3_p20240627-py313.patch @@ -0,0 +1,74 @@ +From b0ff7b1e40f4e3c1865da2cd04251eed6b64cd36 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tin=20Tvrtkovi=C4=87?= <tinchester@gmail.com> +Date: Fri, 21 Jun 2024 01:25:15 +0200 +Subject: [PATCH] Fix some tests for 3.13 + +--- + tests/test_converter.py | 7 ++++--- + tests/test_gen_dict.py | 4 +++- + tests/typed.py | 5 ++++- + 3 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/tests/test_converter.py b/tests/test_converter.py +index b401860c..63a6502b 100644 +--- a/tests/test_converter.py ++++ b/tests/test_converter.py +@@ -54,8 +54,8 @@ def test_simple_roundtrip(cls_and_vals, detailed_validation): + + + @given( +- simple_typed_classes(kw_only=False, newtypes=False) +- | simple_typed_dataclasses(newtypes=False), ++ simple_typed_classes(kw_only=False, newtypes=False, allow_nan=False) ++ | simple_typed_dataclasses(newtypes=False, allow_nan=False), + booleans(), + ) + def test_simple_roundtrip_tuple(cls_and_vals, dv: bool): +@@ -103,7 +103,8 @@ def test_simple_roundtrip_defaults_tuple(attr_and_vals): + + + @given( +- simple_typed_classes(newtypes=False) | simple_typed_dataclasses(newtypes=False), ++ simple_typed_classes(newtypes=False, allow_nan=False) ++ | simple_typed_dataclasses(newtypes=False, allow_nan=False), + unstructure_strats, + ) + def test_simple_roundtrip_with_extra_keys_forbidden(cls_and_vals, strat): +diff --git a/tests/test_gen_dict.py b/tests/test_gen_dict.py +index 16911d51..5395b9e9 100644 +--- a/tests/test_gen_dict.py ++++ b/tests/test_gen_dict.py +@@ -185,7 +185,9 @@ def test_unmodified_generated_structuring(cl_and_vals, dv: bool): + + + @given( +- simple_typed_classes(min_attrs=1) | simple_typed_dataclasses(min_attrs=1), data() ++ simple_typed_classes(min_attrs=1, allow_nan=False) ++ | simple_typed_dataclasses(min_attrs=1, allow_nan=False), ++ data(), + ) + def test_renaming(cl_and_vals, data): + converter = Converter() +diff --git a/tests/typed.py b/tests/typed.py +index 7589c9a6..fa2573af 100644 +--- a/tests/typed.py ++++ b/tests/typed.py +@@ -82,7 +82,9 @@ def simple_typed_classes( + ).flatmap(partial(_create_hyp_class, frozen=frozen)) + + +-def simple_typed_dataclasses(defaults=None, min_attrs=0, frozen=False, newtypes=True): ++def simple_typed_dataclasses( ++ defaults=None, min_attrs=0, frozen=False, newtypes=True, allow_nan=None ++): + """Yield tuples of (class, values).""" + return lists_of_typed_attrs( + defaults, +@@ -90,6 +92,7 @@ def simple_typed_dataclasses(defaults=None, min_attrs=0, frozen=False, newtypes= + for_frozen=frozen, + allow_mutable_defaults=False, + newtypes=newtypes, ++ allow_nan=allow_nan, + ).flatmap(partial(_create_dataclass, frozen=frozen)) + + diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest index 6f4e4a91dc78..016c6e760bbd 100644 --- a/dev-python/cbor2/Manifest +++ b/dev-python/cbor2/Manifest @@ -1,2 +1 @@ -DIST cbor2-5.6.3.tar.gz 100224 BLAKE2B bccdca4fb2659c201663897a27801b7ae040fecc1c734356d4e4859df94eb65ef122bdda68384670102ee40476135d0c781c9f966b7c2845babb2bbd9729bc78 SHA512 1ab6a88a95cde178b21a75275fb286038f15d2fbd752059f9fc6fdb64e23eca90f65f7e443cae4bdbb7f451378711b20963909136c06b3bb4f054d52a7a95207 DIST cbor2-5.6.4.tar.gz 100865 BLAKE2B e15227a5ff802f41c488fc410ee495a7b1b986cdca42f84926b525ec9d7110aae851f0da8278d630360462793a15733662b19663aa04acc470b7a6b0ad1c2f4e SHA512 794a7b646d7672c8cae9b2fe14e817812dc2afef46664f9be810258fcd1cab132dd28f3d05a036bd188aa510ebf44972f8f175b9acb6eec7339aebe608544b2c diff --git a/dev-python/cbor2/cbor2-5.6.3.ebuild b/dev-python/cbor2/cbor2-5.6.3.ebuild deleted file mode 100644 index 22a8b47dffef..000000000000 --- a/dev-python/cbor2/cbor2-5.6.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support" -HOMEPAGE=" - https://github.com/agronholm/cbor2/ - https://pypi.org/project/cbor2/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+native-extensions" - -BDEPEND=" - >=dev-python/setuptools-61[${PYTHON_USEDEP}] - >=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}] - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - # remove pytest-cov dep - sed -i -e "s/--cov//" pyproject.toml || die - distutils-r1_python_prepare_all -} - -python_compile() { - local -x CBOR2_BUILD_C_EXTENSION=1 - # pypy3 not supported upstream - if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then - CBOR2_BUILD_C_EXTENSION=0 - fi - distutils-r1_python_compile -} diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest index fd43c1eda6fc..fc0f68b92bc8 100644 --- a/dev-python/coverage/Manifest +++ b/dev-python/coverage/Manifest @@ -1,3 +1,2 @@ -DIST coverage-7.4.4.tar.gz 783727 BLAKE2B e7d7af92ddcb3d7b5857cc83d8e14bb16ea2bde720eba63b082d35358934047ef7285ac70a6cd8fcb4720a9ddea5c22cf4cb14404ac2800794c49650ff5a1dd4 SHA512 26d4715ce69556ca12d1b65db5f21807c08733810b4398750280184812ebfb698e7b424b9e30f55e7524323861a22d4581db0524e9e285ca858132359fd24d28 DIST coverage-7.5.3.tar.gz 786184 BLAKE2B 014a21273bf302a7e10d3239edda1a95b99674abd0b7b769a688a4e576d0b9e5ce9189ee38e8c53b0cbd5ea7bd2c7f7583704455f6842c9a19e77cc19aae3de1 SHA512 6c72525b19b0efbf6a23b8a2860e056613c8119a5306978a67bc11b8598bac693e7541a9ca206bb9394511c9a84097a7f450ebf38e7c1c40e914fd71cf7546ce DIST coverage-7.5.4.tar.gz 793238 BLAKE2B a53967307ce9cbb72d89810575574a7a1358c988e5e02cfa2a982ba8e68e7efd477c2d902c2037c67f18309c54777f3422db845b7753da49ccb69855289c13de SHA512 363658864f9a5116e49bd10a45a8ceeb0bb62c70458e0c0ce7ae90f3ddea0659d67af1a35a44a47e673b256cdad8ea0963339110dabfd7031d6b98ba483f3606 diff --git a/dev-python/coverage/coverage-7.4.4.ebuild b/dev-python/coverage/coverage-7.4.4.ebuild deleted file mode 100644 index 20df16b0cbc1..000000000000 --- a/dev-python/coverage/coverage-7.4.4.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 ) -PYTHON_REQ_USE="threads(+),sqlite(+)" - -inherit distutils-r1 pypi - -DESCRIPTION="Code coverage measurement for Python" -HOMEPAGE=" - https://coverage.readthedocs.io/en/latest/ - https://github.com/nedbat/coveragepy/ - https://pypi.org/project/coverage/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{9..10}) -" -BDEPEND=" - test? ( - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die - distutils-r1_src_prepare -} - -test_tracer() { - local -x COVERAGE_CORE=${1} - einfo " Testing with the ${COVERAGE_CORE} core ..." - epytest -p flaky -p hypothesis -p xdist tests -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO: fails because of additional "Terminated" print on SIGTERM - tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data - # broken because of pytest plugins explicity loaded - tests/test_debug.py::ShortStackTest::test_short_stack{,_skip} - # these expect specific availability of C extension matching - # COVERAGE_CORE (which breaks testing pytracer on CPython) - tests/test_cmdline.py::CmdLineStdoutTest::test_version - tests/test_debug.py::DebugTraceTest::test_debug_sys_ctracer - ) - local EPYTEST_IGNORE=( - # pip these days insists on fetching build deps from Internet - tests/test_venv.py - ) - - "${EPYTHON}" igor.py zip_mods || die - - local -x COVERAGE_TESTING=True - # TODO: figure out why they can't be imported inside test env - local -x COVERAGE_NO_CONTRACTS=1 - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - - local prev_opt=$(shopt -p nullglob) - shopt -s nullglob - local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so ) - ${prev_opt} - - if [[ -n ${c_ext} ]]; then - cp "${c_ext}" coverage/ || die - test_tracer ctrace - fi - - test_tracer pytrace - - case ${EPYTHON} in - python3.1[01]|pypy3) - ;; - *) - # available since Python 3.12 - test_tracer sysmon - ;; - esac - - if [[ -n ${c_ext} ]]; then - rm coverage/*.so || die - fi -} diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest index 92e85be2ada5..47f0caba5947 100644 --- a/dev-python/fonttools/Manifest +++ b/dev-python/fonttools/Manifest @@ -1,3 +1,2 @@ -DIST fonttools-4.51.0.gh.tar.gz 3826324 BLAKE2B 84485874ce373ef759746104f8c0593d63e2955427a1606404e56ae006342fef39e3fe9468d85b974741ae26a8cceba23ea46e33fff0e2648c154074b01b5eac SHA512 3a9984b56a8ed1e918781c8503dd8901276ae7e20659777ff0a9bf799a42b4ec112a6cfd31deb81f73f7f19c03145a66962187fb243b2580db9d3ef7011d3d82 DIST fonttools-4.53.0.gh.tar.gz 3847778 BLAKE2B 31cf6e495441aeee90f96d6f96b9eedb581f3ee7e5e6f00f7df41547738e7da24d58b4aeac691c44961f842bbf347b32965b052d84ced88c7ade9c0d95c0367a SHA512 f810c428680c4203af3450c4a4b3a1d0f3f5e06ec7d7aac65e1e4aadf5d1e98f9efa5fed75388c8b0a0dcef5094d9b0586c0a71587360bafc91ad683a961698a DIST fonttools-4.53.1.gh.tar.gz 3850978 BLAKE2B 9c6b5af2cbde939b82043e29ffbbb23434c7b4bb7d7ce68385de701cdf97792bfb58b39acf5e0843493d4b4c3b70f76df6194c9a2ba4f4dfa7ec46155b9f8ce0 SHA512 c51a439c4c760bc929359ff3010612d00280ff1bfa8e6dd5248f181b3244239b82089727b4b6c81594fec57407f4c20f95497e0e26fe0e75fde30f8680022d07 diff --git a/dev-python/fonttools/fonttools-4.51.0.ebuild b/dev-python/fonttools/fonttools-4.51.0.ebuild deleted file mode 100644 index 2a58b639d265..000000000000 --- a/dev-python/fonttools/fonttools-4.51.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 virtualx - -DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts" -HOMEPAGE=" - https://github.com/fonttools/fonttools/ - https://pypi.org/project/fonttools/ -" -SRC_URI=" - https://github.com/fonttools/fonttools/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="+native-extensions" - -RDEPEND=" - >=dev-python/fs-2.4.9[${PYTHON_USEDEP}] -" -BDEPEND=" - native-extensions? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - ' 'python*') - ) - test? ( - dev-python/brotlicffi[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - app-arch/zopfli - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # When dev-python/pytest-shutil is installed, we get weird import errors. - # This is due to incomplete nesting in the Tests/ tree: - # - # Tests/feaLib/__init__.py - # Tests/ufoLib/__init__.py - # Tests/svgLib/path/__init__.py - # Tests/otlLib/__init__.py - # Tests/varLib/__init__.py - # - # This tree requires an __init__.py in Tests/svgLib/ too, bug #701148. - touch Tests/svgLib/__init__.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - local -x FONTTOOLS_WITH_CYTHON=$(usex native-extensions) - [[ ${EPYTHON} == pypy3 ]] && FONTTOOLS_WITH_CYTHON=0 - distutils-r1_python_compile -} - -src_test() { - # virtualx used when matplotlib is installed causing plot module tests to run - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # flaky test - Tests/ttLib/woff2_test.py::WOFF2ReaderTest::test_get_normal_tables - ) - - if [[ ${EPYTHON} == pypy3 ]] && - has_version "dev-python/pyxattr[${PYTHON_USEDEP}]" && - { - has_version "<dev-python/pypy3_10-exe-7.3.13_p2" || - has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2" - } - then - EPYTEST_DESELECT+=( - # affected by a bug in PyPy/pyxattr - # https://github.com/iustin/pyxattr/issues/41 - Tests/t1Lib/t1Lib_test.py::ReadWriteTest::test_read_with_path - ) - fi - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - nonfatal epytest \ - -p rerunfailures --reruns=5 \ - Tests fontTools || die -n "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/grpclib/Manifest b/dev-python/grpclib/Manifest deleted file mode 100644 index 689aaf9b9323..000000000000 --- a/dev-python/grpclib/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST grpclib-0.4.2.gh.tar.gz 116997 BLAKE2B 8a3ad3022a4963f0539c212b66af615f4c1a73cec49801118af25ad141741aed692e16389687f690f885d9f85dc53a5e1b8208a5d8af111c2e50fdefef0684ce SHA512 a25ee2286431d294dd4b07b3ac34387608ca3dbabdf6d54a09b1a33fe66c75ba88f3f5e90160a55dc614871c93bc6ccfb884d149bbd624e13d792b44271b534f -DIST grpclib-0.4.3.gh.tar.gz 106619 BLAKE2B 2ea5ae37c0f9e7c0aaf278922144135d536007d23a676298beb770c6f357887f383053a5c611a31cb55fb9dd7078a40c8ba0528425c039b473bd9f8cd022428a SHA512 2de4d95c26663eaf55e70cf1b2a0b5e44538b7543518702725616c6658d79a246996e4520cb1440f5910e3f353db7fb157812c57d42c2659c018c46ebff92224 diff --git a/dev-python/grpclib/files/grpclib-add_css_file.patch b/dev-python/grpclib/files/grpclib-add_css_file.patch deleted file mode 100644 index 25243b932766..000000000000 --- a/dev-python/grpclib/files/grpclib-add_css_file.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/docs/conf.py b/docs/conf.py -index 7ccef26..766b77d 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -27,4 +27,4 @@ html_theme_options = { - - - def setup(app): -- app.add_stylesheet('style.css') -+ app.add_css_file('style.css') diff --git a/dev-python/grpclib/grpclib-0.4.2.ebuild b/dev-python/grpclib/grpclib-0.4.2.ebuild deleted file mode 100644 index b9a48034c0b3..000000000000 --- a/dev-python/grpclib/grpclib-0.4.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit distutils-r1 - -DESCRIPTION="Pure-Python gRPC implementation for asyncio" -HOMEPAGE="https://github.com/vmagamedov/grpclib" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmagamedov/grpclib" -else - MY_PV="${PV/_rc/rc}" - S="${WORKDIR}/${PN}-${MY_PV}" - SRC_URI="https://github.com/vmagamedov/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -PATCHES=( - "${FILESDIR}/${PN}-add_css_file.patch" -) - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - >=dev-python/h2-4.1.0[${PYTHON_USEDEP}] - >=dev-python/hpack-4.0.0[${PYTHON_USEDEP}] - >=dev-python/hyperframe-6.0.1[${PYTHON_USEDEP}] - >=dev-python/multidict-6.0.2[${PYTHON_USEDEP}] - >=dev-python/grpcio-tools-1.43.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/async-timeout[${PYTHON_USEDEP}] - dev-python/googleapis-common-protos[${PYTHON_USEDEP}] - dev-python/Faker[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - 'dev-python/sphinx-rtd-theme' - -python_test() { - [[ ${EPYTHON} == python3.10 ]] && local EPYTEST_DESELECT=( - # does not work in python3.10 due to the bug in ssl https://bugs.python.org/issue46067 - 'tests/test_client_channel.py::test_default_ssl_context' - ) - epytest -} diff --git a/dev-python/grpclib/grpclib-0.4.3.ebuild b/dev-python/grpclib/grpclib-0.4.3.ebuild deleted file mode 100644 index 97c33eabfdf3..000000000000 --- a/dev-python/grpclib/grpclib-0.4.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit distutils-r1 - -DESCRIPTION="Pure-Python gRPC implementation for asyncio" -HOMEPAGE="https://github.com/vmagamedov/grpclib" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmagamedov/grpclib" -else - MY_PV="${PV/_rc/rc}" - S="${WORKDIR}/${PN}-${MY_PV}" - SRC_URI="https://github.com/vmagamedov/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -PATCHES=( - "${FILESDIR}/${PN}-add_css_file.patch" -) - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - >=dev-python/h2-4.1.0[${PYTHON_USEDEP}] - >=dev-python/hpack-4.0.0[${PYTHON_USEDEP}] - >=dev-python/hyperframe-6.0.1[${PYTHON_USEDEP}] - >=dev-python/multidict-6.0.2[${PYTHON_USEDEP}] - >=dev-python/grpcio-tools-1.43.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/async-timeout[${PYTHON_USEDEP}] - dev-python/googleapis-common-protos[${PYTHON_USEDEP}] - dev-python/Faker[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - 'dev-python/sphinx-rtd-theme' diff --git a/dev-python/grpclib/metadata.xml b/dev-python/grpclib/metadata.xml deleted file mode 100644 index 204efcfd87fc..000000000000 --- a/dev-python/grpclib/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>antonin.riha@protonmail.com</email> - <name>AntonÃn ŘÃha</name> - </maintainer> - <upstream> - <bugs-to>https://github.com/vmagamedov/grpclib/issues</bugs-to> - </upstream> - <origin>gentoo-guru-overlay</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest index af36861aac64..582a1079db8e 100644 --- a/dev-python/iminuit/Manifest +++ b/dev-python/iminuit/Manifest @@ -1,3 +1 @@ -DIST iminuit-2.21.3.tar.gz 437827 BLAKE2B 5196e896769f6312bb6ba9af8d6f03bea6023a9459ccbe8553e4c10ba5dc2ed90e4e4b57bdd104f7b72e7514a50c0d4c717c76adf206d7eaddcd3c4c54c4d210 SHA512 5e48d4451caf56688143fa4590528fb4ed0660e144dbb3d1c409b84f793593478979728b4af9748b7bbdb7063e2ef7e05476a2ecd52af089f351522aadfc9ba4 -DIST iminuit-2.25.2.tar.gz 2929388 BLAKE2B e7e7a8c1d27538a95b527dcd8c01eeefac98914c568dcc58a234e37224cee5234bc107c6774a08f1117e28cf7919147ca832f6f3f150f95eaf0b03c5ce1ea312 SHA512 110eb0920262f9599defb1db984de6266200de5998fa81d2015e81bc1bb3e0b26524a706c060666f1e6248bc95ff17df7453bb53d20f703522b90889bedc1dc4 DIST iminuit-2.26.0.tar.gz 2945757 BLAKE2B 361c84731ab3ddb01d940d5082b7170cde73ee1f1015724ea78e8dc9d910dcf4614c2ac7eb508a7efaed2abc259b5ffe09103ba921cd3f29c56daf227226e54f SHA512 6caa59c1dd3446f650bae490ef2c24b3f512284745d75e1acf714a3c440964017a68455fcc008b4176c5cbb9a4fadfc699bc01c7734a5b94ff521fe24a1b579a diff --git a/dev-python/iminuit/files/iminuit-2.21.3-gcc-13.patch b/dev-python/iminuit/files/iminuit-2.21.3-gcc-13.patch deleted file mode 100644 index 765b2f555ac4..000000000000 --- a/dev-python/iminuit/files/iminuit-2.21.3-gcc-13.patch +++ /dev/null @@ -1,21 +0,0 @@ -From c26e9b3882d68fbef471bd67c7ea0eeb5a26c481 Mon Sep 17 00:00:00 2001 -From: andriish <andriish@users.noreply.github.com> -Date: Thu, 4 May 2023 19:08:37 +0200 -Subject: [PATCH] Update fcn.hpp - ---- - src/fcn.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/fcn.hpp b/src/fcn.hpp -index 3e2ff80c..0c53e1be 100644 ---- a/src/fcn.hpp -+++ b/src/fcn.hpp -@@ -1,6 +1,7 @@ - #include <Minuit2/FCNGradientBase.h> - #include <pybind11/pytypes.h> - #include <vector> -+#include <cstdint> - - namespace py = pybind11; - diff --git a/dev-python/iminuit/iminuit-2.21.3.ebuild b/dev-python/iminuit/iminuit-2.21.3.ebuild deleted file mode 100644 index 7b4444dc4960..000000000000 --- a/dev-python/iminuit/iminuit-2.21.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -# forced implicitly -CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake distutils-r1 virtualx pypi - -DESCRIPTION="Minuit numerical function minimization in Python" -HOMEPAGE="https://github.com/scikit-hep/iminuit/ - https://pypi.org/project/iminuit/" - -SLOT="0" -LICENSE="MIT LGPL-2.1" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - test? ( - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - ) -" - -PATCHES=( "${FILESDIR}"/${P}-gcc-13.patch ) - -distutils_enable_tests pytest - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - epytest -p no:pytest-describe || die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/iminuit/iminuit-2.25.2.ebuild b/dev-python/iminuit/iminuit-2.25.2.ebuild deleted file mode 100644 index 93edfe9bfe73..000000000000 --- a/dev-python/iminuit/iminuit-2.25.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=scikit-build-core -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit cmake distutils-r1 virtualx pypi - -DESCRIPTION="Minuit numerical function minimization in Python" -HOMEPAGE=" - https://github.com/scikit-hep/iminuit/ - https://pypi.org/project/iminuit/ -" - -LICENSE="MIT LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/pybind11[${PYTHON_USEDEP}] -" -BDEPEND=" - ${BDEPEND} - dev-python/cython[${PYTHON_USEDEP}] - test? ( - dev-python/annotated-types[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # precision error - tests/test_cost.py::test_Template_with_model_2D - - # TODO - tests/test_describe.py::test_with_pydantic_types - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # nonfatal implied by virtx - nonfatal epytest || die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/ipython/ipython-8.25.0.ebuild b/dev-python/ipython/ipython-8.25.0.ebuild index c06942db625c..2972f33b44a2 100644 --- a/dev-python/ipython/ipython-8.25.0.ebuild +++ b/dev-python/ipython/ipython-8.25.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="examples notebook nbconvert qt5 +smp test" RESTRICT="!test? ( test )" diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 495752279678..3f5e79091727 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,4 +1,3 @@ DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b -DIST matplotlib-3.8.4.tar.gz 35934425 BLAKE2B e449f1d71a3152a9cf34cf13c70489d2664c8734c8e8ae0ed5dec2ed5111e0210d679f7e6a1e0b707499d9968b945a7f91573186b82c6d036238aadb5c9da006 SHA512 d4c6a5b3484927dbae1b1203e9984b67d08c958c4a5136abaa805f1eb221146fb1211e5f20456e281d41fc09c94917a796ffacfdb185c58eeeb6d19e60c78b1a DIST matplotlib-3.9.0.tar.gz 36069890 BLAKE2B 02ddb25901b5a93a8daf6f26c98b92d5e35abe2e98783b039928338abb1d628adbf3fd4786c08cb1610bf405cb558ca31fc12dbde77ec5f2a633143c7ea659a1 SHA512 135ee2f97c26cb60479cc10bf8a833384c393993d8a905ab869f4c73b91a50ffa596f84ce349af7f1a0b08a21e1906394cf6a702bb567a9c3999d40f54974326 DIST matplotlib-3.9.1.tar.gz 36084124 BLAKE2B b7cc9e219664849411cc3133afbdb676f956c943f92d447ba5cca0467da56d1575796fe1046e7503e6d7c4dfdfad6e5181404f331ed7ac1397c8c61f4a30bd23 SHA512 a1d48c42a5f4f04b57e34d25df842917e6380b8d6b6d1018c9b630cbbea4619b1d75729a218a6f52b63d4a61c2204bb26ad8f741566f84e41ca73190e419f672 diff --git a/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch b/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch deleted file mode 100644 index ab377e7f19b2..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7382d6205bfdc647a8e47c8e417c991d3822eace Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 4 Jan 2021 10:03:32 +0100 -Subject: [PATCH] Disable -flto - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 6e1d19d..ed85d14 100644 ---- a/setup.py -+++ b/setup.py -@@ -147,7 +147,7 @@ class BuildExtraLibraries(BuildExtCommand): - ranlib = True - else: - ranlib = shutil.which('llvm-ranlib') -- if ranlib and has_flag(self.compiler, '-flto'): -+ if False and ranlib and has_flag(self.compiler, '-flto'): - for ext in self.extensions: - ext.extra_compile_args.append('-flto') - cppflags.append('-flto') --- -2.30.0 - diff --git a/dev-python/matplotlib/files/matplotlib-3.8.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.8.0-test.patch deleted file mode 100644 index 5653ed6a697e..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.8.0-test.patch +++ /dev/null @@ -1,263 +0,0 @@ -From a39e8395b7f1a6388c4c0897aade3a176b7644a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 14 Feb 2023 20:46:30 +0100 -Subject: [PATCH] Adjust tolerances to make tests pass on real hardware - ---- - lib/matplotlib/tests/test_arrow_patches.py | 6 +++--- - lib/matplotlib/tests/test_axes.py | 9 +++++---- - lib/matplotlib/tests/test_colorbar.py | 2 +- - lib/matplotlib/tests/test_constrainedlayout.py | 8 ++++---- - lib/matplotlib/tests/test_contour.py | 3 +-- - lib/matplotlib/tests/test_figure.py | 2 +- - lib/matplotlib/tests/test_image.py | 2 +- - lib/matplotlib/tests/test_legend.py | 6 +++--- - lib/matplotlib/tests/test_lines.py | 2 +- - lib/matplotlib/tests/test_units.py | 4 ++-- - lib/matplotlib/tests/test_usetex.py | 5 +++-- - 11 files changed, 25 insertions(+), 24 deletions(-) - -diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py -index 8d573b4adb..dfc42efcb9 100644 ---- a/lib/matplotlib/tests/test_arrow_patches.py -+++ b/lib/matplotlib/tests/test_arrow_patches.py -@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test(): - - - @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02, -+ tol=0.015 if platform.machine() == 'x86_64' else 0.02, - savefig_kwarg=dict(dpi=100)) - def test_fancyarrow_dpi_cor_100dpi(): - """ -@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi(): - - - @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02, -+ tol=0.018 if platform.machine() == 'x86_64' else 0.02, - savefig_kwarg=dict(dpi=200)) - def test_fancyarrow_dpi_cor_200dpi(): - """ -@@ -115,7 +115,7 @@ def test_fancyarrow_dash(): - - - @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.005) -+ tol=0.005) - def test_arrow_styles(): - styles = mpatches.ArrowStyle.get_styles() - -diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 30992d5780..0a254c95ca 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -1132,7 +1132,7 @@ def test_imshow(): - - @image_comparison( - ['imshow_clip'], style='mpl20', -- tol=1.24 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=1.24) - def test_imshow_clip(): - # As originally reported by Gellule Xg <gellule.xg@free.fr> - # use former defaults to match existing baseline image -@@ -2502,7 +2502,7 @@ def test_contour_hatching(): - - @image_comparison( - ['contour_colorbar'], style='mpl20', -- tol=0.54 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.54) - def test_contour_colorbar(): - x, y, z = contour_dat() - -@@ -4856,7 +4856,7 @@ def test_vertex_markers(): - - - @image_comparison(['vline_hline_zorder', 'errorbar_zorder'], -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ tol=0.015 if platform.machine() == 'x86_64' else 0.02) - def test_eb_line_zorder(): - x = list(range(10)) - -@@ -8709,7 +8709,8 @@ def test_zorder_and_explicit_rasterization(): - fig.savefig(b, format='pdf') - - --@image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20") -+@image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20", -+ tol=0.02) - def test_preset_clip_paths(): - fig, ax = plt.subplots() - -diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py -index 73c4dab9a8..ddae80c449 100644 ---- a/lib/matplotlib/tests/test_colorbar.py -+++ b/lib/matplotlib/tests/test_colorbar.py -@@ -236,7 +236,7 @@ def test_colorbar_single_ax_panchor_east(constrained): - - @image_comparison( - ['contour_colorbar.png'], remove_text=True, -- tol=0.01 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.01) - def test_contour_colorbar(): - fig, ax = plt.subplots(figsize=(4, 2)) - data = np.arange(1200).reshape(30, 40) - 500 -diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py -index 6703dfe315..da7770b7c7 100644 ---- a/lib/matplotlib/tests/test_constrainedlayout.py -+++ b/lib/matplotlib/tests/test_constrainedlayout.py -@@ -652,11 +652,11 @@ def test_compressed1(): - fig.draw_without_rendering() - - pos = axs[0, 0].get_position() -- np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3) -- np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3) -+ np.testing.assert_allclose(pos.x0, 0.06195, atol=2e-3) -+ np.testing.assert_allclose(pos.y1, 0.8537, atol=2e-3) - pos = axs[1, 2].get_position() -- np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3) -- np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3) -+ np.testing.assert_allclose(pos.x1, 0.8618, atol=2e-3) -+ np.testing.assert_allclose(pos.y0, 0.1934, atol=2e-3) - - - @pytest.mark.parametrize('arg, state', [ -diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py -index 4a32fdc6ce..e745abb9dc 100644 ---- a/lib/matplotlib/tests/test_contour.py -+++ b/lib/matplotlib/tests/test_contour.py -@@ -383,8 +383,7 @@ def test_contourf_log_extension(split_collections): - @pytest.mark.parametrize("split_collections", [False, True]) - @image_comparison( - ['contour_addlines.png'], remove_text=True, style='mpl20', -- tol=0.15 if platform.machine() in ('aarch64', 'ppc64le', 's390x') -- else 0.03) -+ tol=0.15) - # tolerance is because image changed minutely when tick finding on - # colorbars was cleaned up... - def test_contour_addlines(split_collections): -diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py -index 6d6a3d772f..d6b5797b52 100644 ---- a/lib/matplotlib/tests/test_figure.py -+++ b/lib/matplotlib/tests/test_figure.py -@@ -27,7 +27,7 @@ import matplotlib.dates as mdates - - - @image_comparison(['figure_align_labels'], extensions=['png', 'svg'], -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_align_labels(): - fig = plt.figure(layout='tight') - gs = gridspec.GridSpec(3, 3) -diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py -index aeeebd136b..2e5a44a9e6 100644 ---- a/lib/matplotlib/tests/test_image.py -+++ b/lib/matplotlib/tests/test_image.py -@@ -1352,7 +1352,7 @@ def test_nonuniform_and_pcolor(): - - @image_comparison( - ['rgba_antialias.png'], style='mpl20', remove_text=True, -- tol=0.007 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.007) - def test_rgba_antialias(): - fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False, - sharey=False, constrained_layout=True) -diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 759ac6aada..fc35d42542 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -173,7 +173,7 @@ def test_multiple_keys(): - - - @image_comparison(['rgba_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_alpha_rgba(): - fig, ax = plt.subplots() - ax.plot(range(10), lw=5) -@@ -182,7 +182,7 @@ def test_alpha_rgba(): - - - @image_comparison(['rcparam_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_alpha_rcparam(): - fig, ax = plt.subplots() - ax.plot(range(10), lw=5) -@@ -210,7 +210,7 @@ def test_fancy(): - - - @image_comparison(['framealpha'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ tol=0.02) - def test_framealpha(): - x = np.linspace(1, 100, 100) - y = x -diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py -index 4f23e6969b..952c643e35 100644 ---- a/lib/matplotlib/tests/test_lines.py -+++ b/lib/matplotlib/tests/test_lines.py -@@ -187,7 +187,7 @@ def test_set_drawstyle(): - - @image_comparison( - ['line_collection_dashes'], remove_text=True, style='mpl20', -- tol=0.65 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.65) - def test_set_line_coll_dash_image(): - fig, ax = plt.subplots() - np.random.seed(0) -diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py -index d3b8c5a716..56a1d0a0a4 100644 ---- a/lib/matplotlib/tests/test_units.py -+++ b/lib/matplotlib/tests/test_units.py -@@ -79,7 +79,7 @@ def quantity_converter(): - # Tests that the conversion machinery works properly for classes that - # work as a facade over numpy arrays (like pint) - @image_comparison(['plot_pint.png'], style='mpl20', -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.002 if platform.machine() == 'x86_64' else 0.01) - def test_numpy_facade(quantity_converter): - # use former defaults to match existing baseline image - plt.rcParams['axes.formatter.limits'] = -7, 7 -@@ -106,7 +106,7 @@ def test_numpy_facade(quantity_converter): - - # Tests gh-8908 - @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20', -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_plot_masked_units(): - data = np.linspace(-5, 5) - data_masked = np.ma.array(data, mask=(data > -2) & (data < 2)) -diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py -index 342face450..c7256586bc 100644 ---- a/lib/matplotlib/tests/test_usetex.py -+++ b/lib/matplotlib/tests/test_usetex.py -@@ -15,6 +15,7 @@ import matplotlib.pyplot as plt - pytestmark = needs_usetex - - -+@pytest.mark.skip(reason="TODO: broken") - @image_comparison( - baseline_images=['test_usetex'], - extensions=['pdf', 'png'], -@@ -65,7 +66,7 @@ def test_mathdefault(): - fig.canvas.draw() - - --@image_comparison(['eqnarray.png']) -+@image_comparison(['eqnarray.png'], tol=23) - def test_multiline_eqnarray(): - text = ( - r'\begin{eqnarray*}' -@@ -163,7 +164,7 @@ except mpl.ExecutableNotFoundError: - - - @image_comparison(baseline_images=['rotation'], extensions=['eps', 'pdf', 'png', 'svg'], -- style='mpl20', tol=3.91 if _old_gs_version else 0) -+ style='mpl20', tol=30) - def test_rotation(): - mpl.rcParams['text.usetex'] = True - --- -2.42.0 - diff --git a/dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild b/dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild deleted file mode 100644 index a7043086960e..000000000000 --- a/dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild +++ /dev/null @@ -1,380 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic prefix pypi toolchain-funcs virtualx - -FT_PV=2.6.1 -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE=" - https://matplotlib.org/ - https://github.com/matplotlib/matplotlib/ - https://pypi.org/project/matplotlib/ -" -SRC_URI+=" - test? ( - https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz - ) -" - -# Main license: matplotlib -# Some modules: BSD -# matplotlib/backends/qt4_editor: MIT -# Fonts: BitstreamVera, OFL-1.1 -LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="cairo doc excel gtk3 latex qt5 tk webagg wxwidgets" - -DEPEND=" - >=dev-python/numpy-1.25:=[${PYTHON_USEDEP}] - media-libs/freetype:2 - >=media-libs/qhull-2013:= -" -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - ${DEPEND} - >=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}] - >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] - >=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}] - >=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - media-fonts/dejavu - media-fonts/stix-fonts - media-libs/libpng:0 - virtual/imagemagick-tools[jpeg,tiff] - cairo? ( - dev-python/cairocffi[${PYTHON_USEDEP}] - ) - excel? ( - dev-python/xlwt[${PYTHON_USEDEP}] - ) - gtk3? ( - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - latex? ( - virtual/latex-base - app-text/dvipng - app-text/ghostscript-gpl - app-text/poppler[utils] - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-luatex - dev-texlive/texlive-xetex - ) - qt5? ( - $(python_gen_cond_dep ' - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ' 'python3*') - ) - webagg? ( - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{10..11}) - ) -" - -BDEPEND=" - ${RDEPEND} - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/setuptools-scm-7[${PYTHON_USEDEP}] - virtual/pkgconfig - doc? ( - >=app-text/dvipng-1.15-r1 - >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}] - >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}] - >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}] - >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}] - >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}] - virtual/latex-base - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-luatex - dev-texlive/texlive-xetex - >=media-gfx/graphviz-2.42.3[cairo] - ) - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - !hppa? ( !s390? ( - || ( - media-video/ffmpeg[openh264] - media-video/ffmpeg[x264] - ) - ) ) - gtk3? ( - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -use_setup() { - local uword="${2:-${1}}" - if use "${1}"; then - echo "${uword} = True" - echo "${uword}agg = True" - else - echo "${uword} = False" - echo "${uword}agg = False" - fi -} - -python_prepare_all() { -# Generates test failures, but fedora does it -# local PATCHES=( -# "${FILESDIR}"/${P}-unbundle-pycxx.patch -# "${FILESDIR}"/${P}-unbundle-agg.patch -# ) -# rm -r agg24 CXX || die -# rm -r agg24 || die - - # Affects installed _version.py, bug #854600 - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - - local PATCHES=( - "${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch - "${FILESDIR}"/matplotlib-3.8.0-test.patch - ) - - # increase lock timeout to 30 s - sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die - - hprefixify setupext.py - - rm -rf libqhull || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - append-cppflags -DNDEBUG # or get old trying to do triangulation - tc-export PKG_CONFIG - - unset DISPLAY # bug #278524 - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die -} - -python_configure() { - mkdir -p "${BUILD_DIR}" || die - - # create setup.cfg (see setup.cfg.template for any changes). - - # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die - [directories] - basedirlist = ${EPREFIX}/usr - [provide_packages] - pytz = False - dateutil = False - [libs] - system_freetype = True - system_qhull = True - [packages] - tests = True - [gui_support] - agg = True - gtk = False - gtkagg = False - macosx = False - pyside = False - pysideagg = False - qt4 = False - qt4agg = False - $(use_setup cairo) - $(use_setup gtk3) - $(use_setup qt5) - $(use_setup tk) - $(use_setup wxwidgets wx) - EOF - - if use gtk3 && use cairo; then - echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die - else - echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die - fi -} - -wrap_setup() { - local MAKEOPTS=-j1 - local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg - "$@" -} - -python_compile() { - wrap_setup distutils-r1_python_compile - find "${BUILD_DIR}" -name '*.pth' -delete || die -} - -python_compile_all() { - if use doc; then - cd doc || die - - VARTEXFONTS="${T}"/fonts \ - emake SPHINXOPTS= O=-Dplot_formats=png:100 html - fi -} - -src_test() { - mkdir build || die - ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # broken by -Wdefault - "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]" - "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]" - tests/test_testing.py::test_warn_to_fail - # TODO? - tests/test_backend_qt.py::test_fig_sigint_override - # leak tests are fragile - tests/test_backends_interactive.py::test_figure_leak_20490 - # major "images not close", new texlive perhaps - tests/test_contour.py::test_all_algorithms - # "no warnings" - tests/test_backend_pdf.py::test_invalid_metadata - tests/test_figure.py::test_too_many_figures - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # TODO: warning isn't passed through - tests/test_image.py::test_large_image - # TODO - tests/test_pickle.py::test_complete - tests/test_pickle.py::test_no_pyplot - tests/test_pickle.py::test_pickle_load_from_subprocess - tests/test_pickle.py::test_simple - tests/test_texmanager.py::test_openin_any_paranoid - tests/test_widgets.py::test_check_buttons - tests/test_widgets.py::test_check_buttons_lines - tests/test_widgets.py::test_check_radio_buttons_image - tests/test_widgets.py::test_radio_buttons - ) - if has_version "<dev-python/pypy3_10-exe-7.3.13_p2" || - has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2" - then - EPYTEST_DESELECT+=( - # TypeError is raised when exception is raised in a starred - # expression referencing a generator that uses "yield from" - # and raises -- non-critical, since some exception is raised - # after all - # https://foss.heptapod.net/pypy/pypy/-/issues/4032 - tests/test_axes.py::test_bad_plot_args - tests/test_axes.py::test_plot_errors - tests/test_axes.py::test_plot_format_errors - ) - fi - ;; - python3.11) - EPYTEST_DESELECT+=( - # https://github.com/matplotlib/matplotlib/issues/23384 - "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]" - "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]" - ) - ;; - python3.12) - EPYTEST_DESELECT+=( - tests/test_constrainedlayout.py::test_compressed1 - ) - ;; - esac - - case "${ABI}" in - alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) - EPYTEST_DESELECT+=( - # too large for 32-bit platforms - 'tests/test_axes.py::test_psd_csd[png]' - ) - ;; - *) - ;; - esac - - if use hppa ; then - EPYTEST_DESELECT+=( - 'tests/test_mathtext.py::test_mathtext_exceptions[hspace without value]' - 'tests/test_mathtext.py::test_mathtext_exceptions[hspace with invalid value]' - 'tests/test_mathtext.py::test_mathtext_exceptions[function without space]' - 'tests/test_mathtext.py::test_mathtext_exceptions[accent without space]' - 'tests/test_mathtext.py::test_mathtext_exceptions[frac without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[frac with empty parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[binom without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[binom with empty parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[genfrac without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[genfrac with empty parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[sqrt without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[sqrt with invalid value]' - 'tests/test_mathtext.py::test_mathtext_exceptions[overline without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[overline with empty parameter]' - 'tests/test_mathtext.py::test_mathtext_exceptions[left with invalid delimiter]' - 'tests/test_mathtext.py::test_mathtext_exceptions[right with invalid delimiter]' - 'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses with sizing]' - 'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses without sizing]' - 'tests/test_mathtext.py::test_mathtext_exceptions[dfrac without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[dfrac with empty parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[overset without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[underset without parameters]' - 'tests/test_mathtext.py::test_mathtext_exceptions[unknown symbol]' - 'tests/test_mathtext.py::test_mathtext_exceptions[double superscript]' - 'tests/test_mathtext.py::test_mathtext_exceptions[double subscript]' - 'tests/test_mathtext.py::test_mathtext_exceptions[super on sub without braces]' - 'tests/test_quiver.py::test_barbs[png]' - 'tests/test_quiver.py::test_barbs_pivot[png]' - 'tests/test_quiver.py::test_barbs_flip[png]' - 'tests/test_text.py::test_parse_math' - 'tests/test_text.py::test_parse_math_rcparams' - ) - fi - - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - grep -v system_freetype "${BUILD_DIR}"/setup.cfg \ - > "${BUILD_DIR}"/test-setup.cfg || die - local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg - - esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib - local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH} - - # speed tests up - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # pretend we're on CI to increase timeouts - local -x CI=1 - nonfatal epytest --pyargs matplotlib -m "not network" \ - -p rerunfailures --reruns=3 \ - -o tmp_path_retention_policy=all || die -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/mrcfile/Manifest b/dev-python/mrcfile/Manifest index 6cc2db5e4196..6a0bde5cf502 100644 --- a/dev-python/mrcfile/Manifest +++ b/dev-python/mrcfile/Manifest @@ -1 +1,2 @@ DIST mrcfile-1.5.0.gh.tar.gz 148148453 BLAKE2B 45cb7483e0aa5d6a2ac4e077bd0e2a9a8a265c4fdb69fc467e1dd3bab79960478d69ed0ec5e4f97ff528a02255c1c0b3e839e808ff0380e7ea2926b569a5478f SHA512 90e85e74c413b74e9ea86996b9e1ed4ac8f8cc0e7537f1916482d5e89d1fa99814c23ad2e51d912485a02644eeb65925067190bb3a7b222310aca4946b037ecc +DIST mrcfile-1.5.1.gh.tar.gz 148148989 BLAKE2B 335a30b5e69bb4bb0348da421c721d27dcf6d1b1d1ab37bd2038e57c5c7499348e9bd183aa5b21280a8009b68e64cec03b08bde4ff3509084873ebffa2fd3b1a SHA512 8553c435c640d814b26f14253ea8954ddd54fab737879e53714cee0be77b9a929e870d2c49a5244c49b9261e2946fbfb0ac1294af6cd3888c6884d476af3ad7a diff --git a/dev-python/mrcfile/mrcfile-1.5.1.ebuild b/dev-python/mrcfile/mrcfile-1.5.1.ebuild new file mode 100644 index 000000000000..f476d539ed73 --- /dev/null +++ b/dev-python/mrcfile/mrcfile-1.5.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) + +inherit distutils-r1 + +DESCRIPTION="MRC2014 file format I/O library" +HOMEPAGE=" + https://pypi.org/project/mrcfile/ + https://github.com/ccpem/mrcfile/ +" +SRC_URI=" + https://github.com/ccpem/mrcfile/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=" + >=dev-python/numpy-1.16.0[${PYTHON_USEDEP}] +" + +distutils_enable_tests unittest diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest index b4b02f3563f5..4a211a356ecf 100644 --- a/dev-python/pudb/Manifest +++ b/dev-python/pudb/Manifest @@ -1 +1,2 @@ +DIST pudb-2024.1.1.tar.gz 226273 BLAKE2B 850a7732e5da24bf7736eaa27de49cdb300641acb5fc6404716b7d41cd990303a5ddec4c732883e69307be0953e73c15eda10d5ad5ce5aae8d0b6146fc4118ce SHA512 3f69668a79e1cfd13e79d9b023bffc1a5d9e25c1ea34a0cb292004290c1b56e8981af2a54478ed0ad00b12b1167d604cc4d1a13041e10346b338ea7fce693348 DIST pudb-2024.1.tar.gz 226023 BLAKE2B ea1c2653c526d53f16362a074cb77a1c076d5311fda99517220f179d4431bec615b0fdd37eeb282c3f89e3b5ff43dd5b0c4950d0e23b06bc9caec98cea0c9658 SHA512 1e07e21a12fe8d970079faf54a26fbe5c9b71552fa8e246f9606a91384304170b8c292788c282363a486cfc5775cad23346f54b89e4a9d2d7b113abf550b0200 diff --git a/dev-python/pudb/pudb-2024.1.1.ebuild b/dev-python/pudb/pudb-2024.1.1.ebuild new file mode 100644 index 000000000000..37a52c0975e5 --- /dev/null +++ b/dev-python/pudb/pudb-2024.1.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) + +inherit distutils-r1 pypi optfeature + +DESCRIPTION="A full-screen, console-based Python debugger" +HOMEPAGE=" + https://documen.tician.de/pudb/ + https://github.com/inducer/pudb/ + https://pypi.org/project/pudb/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + >=dev-python/urwid-2.4[${PYTHON_USEDEP}] + dev-python/urwid-readline[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest-mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +pkg_postinst() { + optfeature_header "Install the following packages for additional functionality:" + optfeature "Auto-complete support" dev-python/jedi +} diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest index af931f99d430..3b66a91ffd11 100644 --- a/dev-python/puremagic/Manifest +++ b/dev-python/puremagic/Manifest @@ -1 +1,2 @@ DIST puremagic-1.25.gh.tar.gz 309788 BLAKE2B cc24e10ef59ce6299e7fb90b12b4d379d320d5795d475f9509301a050591c3404499227a64d6ed8395c8ab7f424561895966a3fe5dd1f90154fdb8be50fcab51 SHA512 7b9a8af827537ed9af38b80422744c7ee8b48b95f3344a79b6641cc7d55082160f20884659846a608d04d040acb06b0273fb8b51e5b92db14f92ff6d576c0e0d +DIST puremagic-1.26.gh.tar.gz 310727 BLAKE2B ccb07fc646c90778bea98adc4bb63bcb24dd7e588134d12fae02b846e532ec3cfa0f29037ee9143ebdd9baf71703c73b1447886b86f4d7ca5a5b4097988a3570 SHA512 b081ab7b7ddc5ecfcf9b3f2a19535222ace2eed4e88872580eaae69f9635f59357d49ddcb01e7d88fa46556320e9c8906e7a44cb614288c88266f5f7d0109d49 diff --git a/dev-python/puremagic/puremagic-1.26.ebuild b/dev-python/puremagic/puremagic-1.26.ebuild new file mode 100644 index 000000000000..51b9731459c1 --- /dev/null +++ b/dev-python/puremagic/puremagic-1.26.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) + +inherit distutils-r1 + +DESCRIPTION="Pure python implementation of magic file detection" +HOMEPAGE=" + https://github.com/cdgriffith/puremagic/ + https://pypi.org/project/puremagic/ +" +SRC_URI=" + https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DOCS=( CHANGELOG.md README.rst ) + +distutils_enable_tests pytest + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} diff --git a/dev-python/pytest-twisted/pytest-twisted-1.14.2.ebuild b/dev-python/pytest-twisted/pytest-twisted-1.14.2.ebuild index 0b248d13ffc9..1117c4b04ada 100644 --- a/dev-python/pytest-twisted/pytest-twisted-1.14.2.ebuild +++ b/dev-python/pytest-twisted/pytest-twisted-1.14.2.ebuild @@ -52,11 +52,5 @@ python_test() { local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 local -x PYTEST_PLUGINS=pytest_twisted - local EPYTEST_DESELECT=( - # regression with pytest-8.2 - # https://github.com/pytest-dev/pytest-twisted/issues/176 - testing/test_basic.py::test_async_fixture_module_scope - ) - epytest -p pytester } diff --git a/dev-python/python-statemachine/python-statemachine-2.3.3.ebuild b/dev-python/python-statemachine/python-statemachine-2.3.3.ebuild index a47ca73f883a..b4cf90f7ae8c 100644 --- a/dev-python/python-statemachine/python-statemachine-2.3.3.ebuild +++ b/dev-python/python-statemachine/python-statemachine-2.3.3.ebuild @@ -24,12 +24,25 @@ RDEPEND="dev-python/pydot[${PYTHON_USEDEP}]" BDEPEND=" ${RDEPEND} test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/pytest-django[${PYTHON_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] ) " distutils_enable_tests pytest +EPYTEST_DESELECT=( + tests/test_mixins.py::test_mixin_should_instantiate_a_machine +) + +EPYTEST_IGNORE=( + tests/test_profiling.py + tests/django_project/workflow/tests.py +) + python_test() { - epytest -o 'addopts=""' --ignore=tests/test_profiling.py + epytest -o 'addopts=""' + } diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest index d33967f99cd5..3588adea381f 100644 --- a/dev-python/pythran/Manifest +++ b/dev-python/pythran/Manifest @@ -1,3 +1 @@ -DIST pythran-0.15.0.gh.tar.gz 3676474 BLAKE2B 2b9c08d773f7848cf43c804ffa9a84eb19d20dbc40668657daea9698fb468e62ec86226f39aa3b8ff07b48a3120604b44a9d6a6c9e7f2b5f0f41ba2e9a201231 SHA512 2abba0ab5328e60d622512aa6c5442fcc28edb4da4209db50ede64961b58c91c2109b7bb90e5872c5c0d487542f669dc2ca3e721c28229e283f6e0130f95aee0 -DIST pythran-0.16.0.gh.tar.gz 3680823 BLAKE2B b0bd65b79831b2a64503d25a71b41ba493281e36d2a147f301ba81ffb9f2f40de07b89d300df2768ffc3eeb49ff3ad6698f6a12d92c68150c1e51655a8e983aa SHA512 8d65f10df6f73518f3a2606a796ee91480d654a17269651e05ee79c0d0c68b9d583c211caa8ef348c8d11cef49da36b560da6e8889accfad8c9b3a8b51eeff57 DIST pythran-0.16.1.gh.tar.gz 3680817 BLAKE2B 2a4b928e9d0ce68248eb543c97da5afca900d81bc660377313617149c5aae7529a371bfd3604dd9feb6e38f834360fef881c8324ae72b585d8ab86e867c2f6b3 SHA512 7a89546b52bdae9bdaeba42768ac822c584a3714b8f4e32417d793454dc0b5492342dfd393d92f8ecee12c854bc39e418f5860aadd00d328afef7b17ebddec99 diff --git a/dev-python/pythran/pythran-0.15.0-r2.ebuild b/dev-python/pythran/pythran-0.15.0-r2.ebuild deleted file mode 100644 index f0409464919c..000000000000 --- a/dev-python/pythran/pythran-0.15.0-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -inherit distutils-r1 - -MY_P=${P/_p/.post} -DESCRIPTION="Ahead of Time compiler for numeric kernels" -HOMEPAGE=" - https://pypi.org/project/pythran/ - https://github.com/serge-sans-paille/pythran/ -" -SRC_URI=" - https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86" - -RDEPEND=" - dev-libs/boost - dev-cpp/xsimd - =dev-python/beniget-0.4*[${PYTHON_USEDEP}] - =dev-python/gast-0.5*[${PYTHON_USEDEP}] - <dev-python/numpy-2[${PYTHON_USEDEP}] - >=dev-python/ply-3.4[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] -" -DEPEND=" - test? ( - dev-libs/boost - dev-cpp/xsimd - ) -" -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - dev-python/wheel[${PYTHON_USEDEP}] - virtual/cblas - !!dev-python/setuptools-declarative-requirements - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_configure() { - # vendored C++ headers -- use system copies - rm -r pythran/{boost,xsimd} || die - - if use test ; then - # https://bugs.gentoo.org/916461 - sed -i \ - -e 's|blas=blas|blas=cblas|' \ - -e 's|libs=|libs=cblas|' \ - pythran/pythran-*.cfg || die - fi -} - -python_test() { - local -x COLUMNS=80 - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -} diff --git a/dev-python/pythran/pythran-0.16.0.ebuild b/dev-python/pythran/pythran-0.16.0.ebuild deleted file mode 100644 index ad1354802d8b..000000000000 --- a/dev-python/pythran/pythran-0.16.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -inherit distutils-r1 - -MY_P=${P/_p/.post} -DESCRIPTION="Ahead of Time compiler for numeric kernels" -HOMEPAGE=" - https://pypi.org/project/pythran/ - https://github.com/serge-sans-paille/pythran/ -" -SRC_URI=" - https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=" - dev-libs/boost - dev-cpp/xsimd - =dev-python/beniget-0.4*[${PYTHON_USEDEP}] - =dev-python/gast-0.5*[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - >=dev-python/ply-3.4[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] -" -DEPEND=" - test? ( - dev-libs/boost - dev-cpp/xsimd - ) -" -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/cblas - !!dev-python/setuptools-declarative-requirements - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_configure() { - # vendored C++ headers -- use system copies - rm -r pythran/{boost,xsimd} || die - - if use test ; then - # https://bugs.gentoo.org/916461 - sed -i \ - -e 's|blas=blas|blas=cblas|' \ - -e 's|libs=|libs=cblas|' \ - pythran/pythran-*.cfg || die - fi -} - -python_test() { - local -x COLUMNS=80 - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - - local EPYTEST_DESELECT=( - # TODO - pythran/tests/test_numpy_ufunc_unary.py::TestNumpyUFuncUnary::test_signbit0 - ) - - if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - pythran/tests/test_distutils.py::TestDistutils::test_setup_bdist_install3 - pythran/tests/test_distutils.py::TestDistutils::test_setup_build3 - pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install - pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install2 - pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install3 - pythran/tests/test_exception.py::TestException::test_multiple_tuple_exception_register - pythran/tests/test_ndarray.py::TestNdarray::test_ndarray_fancy_indexing1 - pythran/tests/test_numpy_fft.py::TestNumpyFFTN::test_fftn_1 - pythran/tests/test_numpy_func0.py::TestNumpyFunc0::test_ravel0 - pythran/tests/test_numpy_func3.py::TestNumpyFunc3::test_list_imag0 - pythran/tests/test_set.py::TestSet::test_fct_symmetric_difference_update - ) - ;; - esac - fi - - epytest -} diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest index b45462f9f872..07ce59b290c7 100644 --- a/dev-python/sentry-sdk/Manifest +++ b/dev-python/sentry-sdk/Manifest @@ -2,3 +2,4 @@ DIST sentry-python-1.45.0.gh.tar.gz 475425 BLAKE2B 8dc46154dfc1c7c9104a706be032b DIST sentry-python-2.6.0.gh.tar.gz 519912 BLAKE2B 065aa2a633c24f163e483fe6ace9696b3bb088caae2eedaff7bbfc09213bec593f1db5a70b41f9771db602ece77d7107f51945683799de35ad59aa2c10f0a47f SHA512 f69ccc15154ea10302610329bc9d80fb9cf249a9996b99b34268468b010a24e90ca46e62b223b3331518a2ee57c6e3e028e6d6b2d1e0c9bbac4f11176403c790 DIST sentry-python-2.7.1.gh.tar.gz 528495 BLAKE2B 7846e726aaca3d916a5b901aa1cde6ac04e79c32f71a631955a354143fc9937ba8881ccf1e3ed387ec12afcd4e6734ea4eee0614512447bcd58d8875fe97cd35 SHA512 afe034553ddb5eeefa00db26e13cebe82d946f990eb62f8cfde670ad5d9d5c93c0ffb2d0ed5f01f55ac533dca66ab6f53553e5b8f011e08705213cb515146516 DIST sentry-python-2.8.0.gh.tar.gz 529314 BLAKE2B b5017cd8f7cb17174e16902f8fa8c18dfeabb807a85eb9bd2e7ac0009328b3b4a3d49b7a32d81abe4315204e416599d8a518dedd3cf6abfc7761a5df30da8857 SHA512 cd67efd18fa140032da4d1cf1aecb7025b0fece980daf1c6a21c4dbeb459c3bd6ba2c29f80a8e26325dc3f211c6d5cbc9d769e5a1098871058cec6e3e9c0ef03 +DIST sentry-python-2.9.0.gh.tar.gz 531490 BLAKE2B 8b67caa6911fd44e58c2a1d1206e6ecb9dc31f81c15c66763a04f1a65fc89d4667e60f27e055016342c6b4cac5470729c802ffb046e6e0796d5bfd7044caf27d SHA512 aed112a2ee35e23a1431486ff18e67772476ecfc63eacc388d17454a723b98f6e05cfa95a6c9db2cb6be572eed73d249951a411c60184b20eb251520071a4254 diff --git a/dev-python/sentry-sdk/sentry-sdk-2.9.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.9.0.ebuild new file mode 100644 index 000000000000..79da2b2a5760 --- /dev/null +++ b/dev-python/sentry-sdk/sentry-sdk-2.9.0.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) + +inherit distutils-r1 + +MY_P=sentry-python-${PV} +DESCRIPTION="Python client for Sentry" +HOMEPAGE=" + https://sentry.io/ + https://github.com/getsentry/sentry-python/ + https://pypi.org/project/sentry-sdk/ +" +SRC_URI=" + https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +RDEPEND=" + dev-python/urllib3[${PYTHON_USEDEP}] + dev-python/certifi[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/asttokens[${PYTHON_USEDEP}] + dev-python/executing[${PYTHON_USEDEP}] + dev-python/fakeredis[${PYTHON_USEDEP}] + dev-python/flask-login[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/pyrsistent[${PYTHON_USEDEP}] + <dev-python/pytest-8[${PYTHON_USEDEP}] + dev-python/pytest-aiohttp[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + dev-python/pytest-localserver[${PYTHON_USEDEP}] + dev-python/python-socks[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + dev-python/werkzeug[${PYTHON_USEDEP}] + dev-python/zope-event[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch" +) + +python_test() { + local EPYTEST_IGNORE=( + # tests require Internet access + tests/integrations/httpx/test_httpx.py + tests/integrations/requests/test_requests.py + tests/integrations/django/test_basic.py + tests/integrations/socket/test_socket.py + # wtf is it supposed to do?! + tests/integrations/gcp/test_gcp.py + # TODO + tests/integrations/bottle + # TODO: most of them hang + tests/integrations/starlette + # TODO + tests/integrations/tornado + # requires mockupdb + tests/integrations/pymongo + # requires AWS access + tests/integrations/aws_lambda + # requires quart_auth + tests/integrations/quart + # TODO: require opentelemetry (with py3.10) + tests/integrations/opentelemetry + # broken (incompatible rq version?) + tests/integrations/rq + ) + + local EPYTEST_DESELECT=( + # hangs + tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub + # broken teardown? + tests/test_client.py::test_uwsgi_warnings + # too many dependencies installed, sigh + tests/test_new_scopes_compat_event.py + # Internet + tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers + tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk + tests/integrations/aiohttp/test_aiohttp.py::test_span_origin + tests/integrations/stdlib/test_httplib.py::test_span_origin + tests/integrations/stdlib/test_subprocess.py::test_subprocess_span_origin + # TODO + tests/integrations/aiohttp/test_aiohttp.py::test_basic + tests/integrations/django + tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries + tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source + tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions + tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic + tests/integrations/threading/test_threading.py + tests/integrations/wsgi/test_wsgi.py + tests/test_basics.py::test_auto_enabling_integrations_catches_import_error + tests/test_client.py::test_databag_breadth_stripping + tests/test_client.py::test_databag_depth_stripping + tests/test_client.py::test_databag_string_stripping + tests/test_utils.py::test_default_release + tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled + tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled + tests/utils/test_contextvars.py::test_leaks + # pointless, fragile to packages being installed in parallel + tests/test_utils.py::test_installed_modules + # TODO + tests/profiler/test_continuous_profiler.py::test_continuous_profiler_auto_start_and_manual_stop + tests/profiler/test_continuous_profiler.py::test_continuous_profiler_manual_start_and_stop + tests/profiler/test_transaction_profiler.py::test_minimum_unique_samples_required + tests/profiler/test_transaction_profiler.py::test_profile_captured + tests/profiler/test_transaction_profiler.py::test_profiles_sample_rate + tests/profiler/test_transaction_profiler.py::test_profiles_sampler + ) + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest -p asyncio -p aiohttp -p pytest_forked -o addopts= +} diff --git a/dev-python/sip/sip-6.8.5.ebuild b/dev-python/sip/sip-6.8.5.ebuild index 5fa58665e798..cda9a97ca1af 100644 --- a/dev-python/sip/sip-6.8.5.ebuild +++ b/dev-python/sip/sip-6.8.5.ebuild @@ -25,7 +25,7 @@ SRC_URI+=" LICENSE="|| ( GPL-2 GPL-3 SIP )" SLOT="5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" RDEPEND=" dev-python/packaging[${PYTHON_USEDEP}] diff --git a/dev-python/sphinxext-opengraph/Manifest b/dev-python/sphinxext-opengraph/Manifest deleted file mode 100644 index aae23a22aa96..000000000000 --- a/dev-python/sphinxext-opengraph/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sphinxext-opengraph-0.9.1.tar.gz 1034511 BLAKE2B 3967c98a53f0e2a55be659741efe29ecc167413de570ba58d54cbe5f14679f1f5ba9613e4579372fb38ff602a7ef4744a6d00793bec5ca0eda800cf6f1e1ba4e SHA512 0f23e5269baccd675d67588597175adf0322942bf0c8ca76b4f22bd14b4574f1f4d2328e476293253bc9b92aec7b9311c17ac301b762ec3d4c2a6c3cd072cb91 diff --git a/dev-python/sphinxext-opengraph/metadata.xml b/dev-python/sphinxext-opengraph/metadata.xml deleted file mode 100644 index 2b34f501d234..000000000000 --- a/dev-python/sphinxext-opengraph/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gasc@eurecom.fr</email> - <name>Gasc Henri</name> - </maintainer> - <upstream> - <doc>https://sphinxext-opengraph.readthedocs.io</doc> - </upstream> - <origin>gentoo-guru-overlay</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-python/sphinxext-opengraph/sphinxext-opengraph-0.9.1.ebuild b/dev-python/sphinxext-opengraph/sphinxext-opengraph-0.9.1.ebuild deleted file mode 100644 index f6afccbb9b7a..000000000000 --- a/dev-python/sphinxext-opengraph/sphinxext-opengraph-0.9.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Sphinx extension to generate unique OpenGraph metadata" -HOMEPAGE="https://github.com/wpilibsuite/sphinxext-opengraph" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -RDEPEND=" - >=dev-python/sphinx-4.0[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] -" -BDEPEND=" - doc? ( - media-fonts/roboto - dev-python/furo[${PYTHON_USEDEP}] - dev-python/myst-parser[${PYTHON_USEDEP}] - dev-python/sphinx-design[${PYTHON_USEDEP}] - ) - test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] ) -" - -distutils_enable_tests pytest - -python_compile_all() { - use doc && emake -C docs man -} - -python_install_all() { - distutils-r1_python_install_all - use doc && doman "${S}/docs/build/man/${PN}.1" -} diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest index 207e07ed61a5..0cdc5267bfd9 100644 --- a/dev-python/translate-toolkit/Manifest +++ b/dev-python/translate-toolkit/Manifest @@ -1,3 +1,4 @@ DIST translate-3.12.2.gh.tar.gz 1202828 BLAKE2B fdfc6ea91d0e0fe9f36e1352247463fe04ff3f4cdd13dd969077ccf0dde984250303872f6bb605dcd1628a1089d81dd98b36dfd68e92c3030c740d65899a70ba SHA512 7488f45521f1744d8d457ce5f74a4955a0e4468af8b3f5be06410667f2c1e52a3dacd3b959330e6c2eb5b3a443c1e2c761538896352576f5090ce27dbfc8edab DIST translate-3.13.0.gh.tar.gz 1171837 BLAKE2B 9c6212d26749eac652369e94d2b653f67b364afc9f9125c5125d19e3cabc1bb36bd27bc172ad93d28cb6cdf57ed2b245336664b6b4954db9bbbfb4a8ad92b3f9 SHA512 7c6f87ec32c81a14d1775dc24d43e49b79fdf8473a4380c93a2af1532bed32a9733ee755641ce26852b1bd63acffa2110598c5fc3010bbf9de40e8a0f32af308 DIST translate-3.13.1.gh.tar.gz 1172830 BLAKE2B 9ca2a3a30a6266a9f713fdb1e504a45263763bce2107196d2091d216db079e16eb03f4dab87627692253c64177e7c6ca9b70bc9a82b719c94fdea984adb66efb SHA512 afa0b98235cf1bc9fc5ffe50057851495e35f6acaa2ba0858fce7d01207929590112e5e5c06452b3ca2cb14a63fdaa2a66d8afe53e29112f5970680935378af7 +DIST translate-3.13.2.gh.tar.gz 1172735 BLAKE2B b4109d16e367dc42a16d26542759aecce66c3eb6bae019e24cb64940cf864620fe6c59cdd03bab7f6ebb2386bfd46b1988c18bf0c73a400389521a1968ceb8d2 SHA512 ea9772a9d010a9097c1cadc91b9c33cee241d61a25210abe5442644cea648bd0940f42aab4327b4057df128ccc16a011fa00c180b60a5ecf4357774f97272cd6 diff --git a/dev-python/translate-toolkit/translate-toolkit-3.13.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.2.ebuild new file mode 100644 index 000000000000..008062ca7d0b --- /dev/null +++ b/dev-python/translate-toolkit/translate-toolkit-3.13.2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) +PYTHON_REQ_USE="sqlite" + +inherit distutils-r1 + +MY_P=translate-${PV} +DESCRIPTION="Toolkit to convert between many translation formats" +HOMEPAGE=" + https://github.com/translate/translate/ + https://pypi.org/project/translate-toolkit/ +" +SRC_URI=" + https://github.com/translate/translate/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+html +ical +ini +subtitles +yaml" + +RDEPEND=" + app-text/iso-codes + >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}] + dev-python/cheroot[${PYTHON_USEDEP}] + >=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}] + >=dev-python/lxml-4.3.1[${PYTHON_USEDEP}] + >=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}] + >=dev-python/pyparsing-3[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + >=dev-python/wcwidth-0.2.10[${PYTHON_USEDEP}] + sys-devel/gettext + html? ( dev-python/utidylib[${PYTHON_USEDEP}] ) + ical? ( dev-python/vobject[${PYTHON_USEDEP}] ) + ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] ) + subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] ) + yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] ) +" +# Technically, the test suite also has undeclared dependency +# on dev-python/snapshottest but all the tests using it are broken +# anyway, so we skip them. +BDEPEND=" + test? ( + dev-python/phply[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_test() { + # unfortunately, this bad quality package doesn't support XDG_DATA_DIRS + # correctly, so we need to reassemble all data files in a single directory + local -x XDG_DATA_HOME=${T}/share + cp -r translate/share "${T}/" || die + cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die + + distutils-r1_src_test +} + +python_test() { + local EPYTEST_DESELECT=( + # Fails with network-sandbox (and even with it off but w/ softer fail) + 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff' + 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff' + # all tests based on snapshottest are broken and I'm too tired + # to figure this out + tests/translate/tools/test_pocount.py::test_{cases,output} + tests/translate/tools/test_junitmsgfmt.py::test_output + ) + local EPYTEST_IGNORE=( + # unpackaged fluent.* + tests/translate/storage/test_fluent.py + # changes directory and does not change it back, sigh + tests/odf_xliff/test_odf_xliff.py + ) + + if ! use ini; then + EPYTEST_IGNORE+=( + translate/convert/test_ini2po.py + translate/convert/test_po2ini.py + ) + fi + + if ! use subtitles; then + EPYTEST_IGNORE+=( + translate/storage/test_subtitles.py + ) + fi + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /usr + doins -r translate/share + + if ! use html; then + rm "${ED}"/usr/bin/{html2po,po2html} || die + fi + if ! use ical; then + rm "${ED}"/usr/bin/{ical2po,po2ical} || die + fi + if ! use ini; then + rm "${ED}"/usr/bin/{ini2po,po2ini} || die + fi + if ! use subtitles; then + rm "${ED}"/usr/bin/{sub2po,po2sub} || die + fi +} diff --git a/dev-python/types-docutils/Manifest b/dev-python/types-docutils/Manifest index 6d06b0975a6e..9aae0752c9d7 100644 --- a/dev-python/types-docutils/Manifest +++ b/dev-python/types-docutils/Manifest @@ -1,3 +1,2 @@ -DIST types-docutils-0.21.0.20240704.tar.gz 19782 BLAKE2B eaf113c86432951b4d0e6a2b7bf69e8e5fb18717bc8107a55a679c6890ae6afb5b543f968758e2797b089ee96bd05945f1bca01383cdd68e01c2c2c1f144710f SHA512 66bf7eb52643dc46a1a621db5d9be6c68bdf61f0b075896e74eabb19db1edae72810a697e803482e89581131b6c0966d990f3043092136bd7e1d4a9cfcab9075 -DIST types-docutils-0.21.0.20240708.tar.gz 19815 BLAKE2B a8ddf76c8fec9d9facf21f19f64f28731dbef334ba526cf9521559cfdc79e9d8ce0c7da9d0a7cc832624fb3b40d31334624567689c08abead6fdac1200ea62ad SHA512 d5611c3a5cc4e7e2c829d0e72154a6262c13ec233f58f3681645bcc3d4f66383e791bf30e3f181cc5f9a0a684c882b489be372a3840cf5a30fd40a6b2563a38a DIST types-docutils-0.21.0.20240710.tar.gz 19813 BLAKE2B ffe7a9605faf155ad968e6bf190fb2cfec4e09ce09c8b2c9346710c9065e18f169682122c9ba83acd331f166dc9ed925be55626be4320553de2f1f467d2a0e67 SHA512 f870c692666c9966cba11fec7c441cbdf0f5510d586ebea467880bdec859783aeb23a3621dc14fc65021ec3cd917c929116642901048249ea8549ede4ff1c02b +DIST types-docutils-0.21.0.20240711.tar.gz 19857 BLAKE2B db38ce7230323b6710ca0f183eb77d700f6fc895af5956abde65f85e976dc15db920eab6b69483fa7ad3361fef0286069875ec02564d4a855244cdb255e039c0 SHA512 770aa29d2e0fb51c35924239e636ec5d31fe6a9986f3842afd6e7a6414e2ae281d1e88bbce1343d69f9d596381bee056f7471566e051025fb2dd9ad93b188786 diff --git a/dev-python/types-docutils/types-docutils-0.21.0.20240708.ebuild b/dev-python/types-docutils/types-docutils-0.21.0.20240708.ebuild deleted file mode 100644 index 0d86c4835acd..000000000000 --- a/dev-python/types-docutils/types-docutils-0.21.0.20240708.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Typing stubs for docutils" -HOMEPAGE="https://pypi.org/project/types-docutils/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" diff --git a/dev-python/types-docutils/types-docutils-0.21.0.20240704.ebuild b/dev-python/types-docutils/types-docutils-0.21.0.20240711.ebuild index 0d86c4835acd..0d86c4835acd 100644 --- a/dev-python/types-docutils/types-docutils-0.21.0.20240704.ebuild +++ b/dev-python/types-docutils/types-docutils-0.21.0.20240711.ebuild |