From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1207829-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 41E6C13835C
for <garchives@archives.gentoo.org>; Sun, 20 Sep 2020 10:47:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 55D8DE08E0;
Sun, 20 Sep 2020 10:47:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2C4E8E08C4
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Sep 2020 10:47:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CEBDE341047
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Sep 2020 10:47:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 55A6C364
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Sep 2020 10:47:03 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1600598816.bbbf8d20a2d4f437c07b7c6519408bc98325b224.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/urllib3/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/urllib3/urllib3-1.24.2-r1.ebuild dev-python/urllib3/urllib3-1.24.2.ebuild dev-python/urllib3/urllib3-1.25.10-r1.ebuild dev-python/urllib3/urllib3-1.25.10.ebuild
X-VCS-Directories: dev-python/urllib3/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: bbbf8d20a2d4f437c07b7c6519408bc98325b224
X-VCS-Branch: master
Date: Sun, 20 Sep 2020 10:47:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 221e5322-179e-4e30-b2e2-e3e75f73ccf6
X-Archives-Hash: 2b3036977b71ef1fed378c71d254a2ad
commit: bbbf8d20a2d4f437c07b7c6519408bc98325b224
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 10:27:07 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 10:46:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbf8d20
dev-python/urllib3: Remove python2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../{urllib3-1.24.2.ebuild => urllib3-1.24.2-r1.ebuild} | 5 +----
.../{urllib3-1.25.10.ebuild => urllib3-1.25.10-r1.ebuild} | 10 +---------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
similarity index 93%
rename from dev-python/urllib3/urllib3-1.24.2.ebuild
rename to dev-python/urllib3/urllib3-1.24.2-r1.ebuild
index 82e56036616..e2c7aedf480 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
PYTHON_REQ_USE="ssl(+)"
inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/ipaddress[${PYTHON_USEDEP}]
- ' -2)
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild
similarity index 84%
rename from dev-python/urllib3/urllib3-1.25.10.ebuild
rename to dev-python/urllib3/urllib3-1.25.10-r1.ebuild
index 911f80d2650..e6ad8daf3d3 100644
--- a/dev-python/urllib3/urllib3-1.25.10.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
PYTHON_REQ_USE="ssl(+)"
inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/ipaddress[${PYTHON_USEDEP}]
- ' -2)
brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
"
BDEPEND="
@@ -64,11 +61,6 @@ python_test() {
local -x CI=1
# FIXME: get tornado ported
case ${EPYTHON} in
- python2*)
- ewarn "Tests are being skipped for Python 2 in order to reduce the number"
- ewarn "of circular dependencies for Python 2 removal. Please test"
- ewarn "manually in a virtualenv."
- ;;
python3*)
pytest -vv || die "Tests fail with ${EPYTHON}"
;;