diff --git a/README.md b/README.md index 95be96930..f29692418 100644 --- a/README.md +++ b/README.md @@ -617,12 +617,12 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E ## Licenses This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted. -There are 1654 Ebuilds in total, 1643 of them have in total 1662 (42 different) licenses assigned. +There are 1653 Ebuilds in total, 1642 of them have in total 1661 (42 different) licenses assigned. |License| Ebuilds using it| |-------|-----| |MIT|941| -|Apache-2.0|361| +|Apache-2.0|360| |GPL-3|110| |BSD|93| |LGPL-3|23| diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest deleted file mode 100644 index 6045f5dc2..000000000 --- a/dev-python/requests/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX requests-2.28.0-drop-dependency-warnings.patch 759 BLAKE2B b2cc24d9d3137ad652ab9d8c14a08dd33af7d3f2968433a0f6cb09dda46ee5c98f428e495e5a565d32a142c22afb439e4604e09d2693b945bcceab0475381700 SHA512 2e486d399c311b81522d390ff9eb601fbc31f3ba64c7c3635aa0aa37e959acdba4f0cd4fd87d5ad51e1c50d83057c2f4ea02d9077702d51bda711730ea82e3ce -AUX requests-2.28.1-fix-charsetnormalizer-assert.patch 1345 BLAKE2B ebec5128a84ffc3a8e7197d4fb11e9f0561495675d561749acf777d62681f93e17a3b71ecc9ad3e7671ff56724be7b0ea9a272fbf9747b7b1fb3432ca70c85a7 SHA512 7668b38c43b6e5dd40aaca6b0ffee383569992c66b80c2ab6b9f59fab5dd0fd7bcc8788b9e19a27473b2a7f7b4bd1412638e6316cbbe67130aae428ce905f21c -DIST requests-2.28.2.tar.gz 108206 BLAKE2B fe6c5d78e6abd36b7134c6e424b5a1c4052eba62b55a01b5842f289b94df3af039a5beba71374db563dd52ce42471d5e3650763b9324533ea6ab3bfd8013379b SHA512 3c4ba19a2bb6ba38a4118cf246db3855401869d54ee7ebd9bee40b435420381fb737d4c69768f2bd97914a30d66233c7058cec51aa629af0dff3b04e6f997a3d -EBUILD requests-2.28.2.ebuild 2080 BLAKE2B 6aa2290e6faa32fb212f3d6af604cf1521ddd48249146c3ba7b12a65ceaac2ed8a40bb22b47ad148dc5ce7de400898e4fec7ce562185001b818c180bd48322a1 SHA512 fb1b91136750ccddbcfcb14a2534419250333e7afeddcc043e52e340e3d824b9f5c7e8f4bba682451faa0841a5040b1ba1dbdd1544074de8cebf427e24670e69 -MISC metadata.xml 507 BLAKE2B d70be61e245e5380ac03ce4157a9943a14fe2b18ab0e3d9828301bede431f87b5dc9656933250bf1151d20a40f2e126494b009bab80f92d15030d4b52c937ad0 SHA512 3409044924fc2481d1eb100807bbd94aff37b8b5ba78cf261d156376ac780fe26cb6c558aeaf7b6d0e342b766d572c28dcd2403021d3158439154fe7799b4d9b diff --git a/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch b/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch deleted file mode 100644 index ec3634966..000000000 --- a/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch +++ /dev/null @@ -1,21 +0,0 @@ -Minimal patch to avoid often rebasing. - -We already have tools to try check for these (`pip check` obviously, but also -app-portage/gpyutils provides gpy-verify-deps). ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -106,13 +106,7 @@ try: - urllib3.__version__, chardet_version, charset_normalizer_version - ) - except (AssertionError, ValueError): -- warnings.warn( -- "urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn't match a supported " -- "version!".format( -- urllib3.__version__, chardet_version, charset_normalizer_version -- ), -- RequestsDependencyWarning, -- ) -+ pass - - # Attempt to enable urllib3's fallback for SNI support - # if the standard library doesn't support SNI or the diff --git a/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch b/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch deleted file mode 100644 index 9975072c0..000000000 --- a/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/setup.py b/setup.py -index 23977ed77a..b679181bda 100755 ---- a/setup.py -+++ b/setup.py -@@ -59,7 +59,7 @@ def run_tests(self): - sys.exit() - - requires = [ -- "charset_normalizer>=2,<3", -+ "charset_normalizer>=2,<4", - "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", - "certifi>=2017.4.17", -diff --git a/setup.cfg b/setup.cfg -index 33af66eb15..0c167eb8c9 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -5,7 +5,7 @@ provides-extra = - use_chardet_on_py3 - requires-dist = - certifi>=2017.4.17 -- charset_normalizer>=2,<3 -+ charset_normalizer>=2,<4 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 - -diff --git a/requests/__init__.py b/requests/__init__.py -index 7ac8e297b8..5812c85d8a 100644 ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - elif charset_normalizer_version: - major, minor, patch = charset_normalizer_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) -- # charset_normalizer >= 2.0.0 < 3.0.0 -- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) -+ # charset_normalizer >= 2.0.0 < 4.0.0 -+ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) - else: - raise Exception("You need either charset_normalizer or chardet installed") - diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml deleted file mode 100644 index 614758481..000000000 --- a/dev-python/requests/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - b@edevau.net - Andreas Billmeier - - - requests - psf/requests - - me@kennethreitz.org - Kenneth Reitz - - - diff --git a/dev-python/requests/requests-2.28.2.ebuild b/dev-python/requests/requests-2.28.2.ebuild deleted file mode 100644 index babdf416c..000000000 --- a/dev-python/requests/requests-2.28.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 pypi - -DESCRIPTION="HTTP library for human beings" -HOMEPAGE=" - https://requests.readthedocs.io/ - https://github.com/psf/requests/ - https://pypi.org/project/requests/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="socks5 test-rust" - -RDEPEND=" - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] - =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] ) -" - -BDEPEND=" - test? ( - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] - test-rust? ( - dev-python/trustme[${PYTHON_USEDEP}] - ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch -) - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # Internet (doctests) - requests/__init__.py::requests - requests/api.py::requests.api.request - requests/models.py::requests.models.PreparedRequest - requests/sessions.py::requests.sessions.Session - # require IPv4 interface in 10.* range - tests/test_requests.py::TestTimeout::test_connect_timeout - tests/test_requests.py::TestTimeout::test_total_timeout_connect - # TODO: openssl? - tests/test_requests.py::TestRequests::test_pyopenssl_redirect - # flask-2 - tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect - tests/test_requests.py::TestRequests::test_cookie_removed_on_expire - tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url - ) - - if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - tests/test_requests.py::TestRequests::test_https_warnings - ) - fi - - epytest -}