From 76f8c57a9357aea3152fa7dd8d9694a0bca922e0 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Thu, 2 Mar 2023 07:12:34 +0100 Subject: [PATCH] dev-python/requests: update EAPI 7 -> 8 Signed-off-by: Andreas Billmeier --- README.md | 8 +++---- dev-python/requests/Manifest | 3 ++- ...ests-2.28.0-drop-dependency-warnings.patch | 21 +++++++++++++++++++ dev-python/requests/requests-2.28.1-r1.ebuild | 6 +++--- 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch diff --git a/README.md b/README.md index ae5b64146..848aefd3a 100644 --- a/README.md +++ b/README.md @@ -573,12 +573,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 1789 Ebuilds in total, 1778 of them have in total 1782 (34 different) licenses assigned. +There are 1792 Ebuilds in total, 1781 of them have in total 1785 (34 different) licenses assigned. |License| Ebuilds using it| |-------|-----| |MIT|1043| -|Apache-2.0|386| +|Apache-2.0|389| |GPL-3|110| |BSD|94| |LGPL-3|26| @@ -612,9 +612,9 @@ There are 1789 Ebuilds in total, 1778 of them have in total 1782 (34 different) |CC0-1.0|1| |GPL-2+|1| -(Last counted: 01/03/2023) +(Last counted: 02/03/2023) I did my best to keep these clean. If a valid license was published on PyPI, it has been automatically merged. Otherwise I took it from GitHub or alternatively from comments/files in the source. Sometimes these differed and have been not unique. All license strings are adjusted to the list in `/usr/portage/gentoo/licenses/`. Some packages do not have any license published. In this case, Authors have been asked for clarification, some did not respond. Following the [official Gentoo Guide](https://devmanual.gentoo.org/general-concepts/licenses/index.html), these then were added with an `all-rights-reserved` license and `RESTRICT="mirror"` was set. Find the appropriate licenses referenced in the Ebuild files and in the corresponding homepages or sources. A big thanks goes to Iris for reviewing this README. -Last updated: 01/03/2023 +Last updated: 02/03/2023 diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest index 5d0581e32..c01455f39 100644 --- a/dev-python/requests/Manifest +++ b/dev-python/requests/Manifest @@ -1,4 +1,5 @@ +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.1.tar.gz 109805 BLAKE2B 2106be5f9e1d9f1a22de5522b5d72084f91c2849e60e33b89b2411b76cae9b1f7faac34947f69c49480d001e9b77e4dce723ee939d51591882854d510db49b59 SHA512 c123ec07171c2c7c34e4173b97750adfa313b4312d91c0d58e4eb8750361604017e5b370c23ec886d2cbf704f9074ec5ad0fa9c2cd8e6f9521532adafff39d41 -EBUILD requests-2.28.1-r1.ebuild 2007 BLAKE2B 7181fc8be0a42c2ad8084a05cd54a3b92cae0bb459ad29c586bdee07200a33c0e09d84794db3aa28b62f3ce6463611e47d7b35307b34dd0feca8dc872601e780 SHA512 fafd90190e0c52d0a46a434c91eded7fa0ff769309170c1a176cfff1d261983724d0be1bc6f561abb10f03b8e2ba376024e6517dfbf6da1e893b65a03e404a92 +EBUILD requests-2.28.1-r1.ebuild 1935 BLAKE2B faac6c59b605ee72432d19446e75dc4e3ee30486eb287c50d5f6210d60e252502eef176855e22092478625c03b6302946df0cd593f8f0fd1d9541a94aa4d018e SHA512 ded461fd7ee6cfeb6b875f26ddc94ddea9798dbf989cc53774fe0c764dabdce182e01d5f1638e7f70abacee37cdfadb00f6f7086e13d9df8d4e06296fcc87bb2 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 new file mode 100644 index 000000000..ec3634966 --- /dev/null +++ b/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch @@ -0,0 +1,21 @@ +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/requests-2.28.1-r1.ebuild b/dev-python/requests/requests-2.28.1-r1.ebuild index acd943c80..bac7f24d4 100644 --- a/dev-python/requests/requests-2.28.1-r1.ebuild +++ b/dev-python/requests/requests-2.28.1-r1.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 +EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 @@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 x86" IUSE="socks5 test-rust" RDEPEND="