aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-11-25 14:46:33 -0500
committerKevin Daudt <kdaudt@alpinelinux.org>2019-11-25 20:46:02 +0000
commit8d11a7d609887687b12409e8be0f042cd9275e42 (patch)
tree96456d2b7c543dcaa7e898049ba17161cef84d58
parentc0c3fbd760141a8ac17891c56cf783c0b93911db (diff)
downloadaports-8d11a7d609887687b12409e8be0f042cd9275e42.tar.bz2
aports-8d11a7d609887687b12409e8be0f042cd9275e42.tar.xz
main/py3-requests: upgrade to 2.22.0
-rw-r--r--main/py3-requests/APKBUILD10
-rw-r--r--main/py3-requests/support-urllib3-1.26.patch40
2 files changed, 4 insertions, 46 deletions
diff --git a/main/py3-requests/APKBUILD b/main/py3-requests/APKBUILD
index 5e5ab99c02..369b1c8140 100644
--- a/main/py3-requests/APKBUILD
+++ b/main/py3-requests/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=py3-requests
_pkgname=requests
-pkgver=2.21.0
-pkgrel=6
+pkgver=2.22.0
+pkgrel=0
pkgdesc="A HTTP request library for Python3"
url="http://www.python-requests.org/"
arch="noarch"
@@ -12,8 +12,7 @@ license="Apache-2.0"
options="!check"
depends="python3 py3-chardet py3-idna py3-certifi py3-urllib3"
makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
- support-urllib3-1.26.patch"
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
replaces="py-requests" # Backwards compatibility
@@ -27,5 +26,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104 requests-2.21.0.tar.gz
-7a52e88706e742f0973fec2f4784b6b51ed9adc8c82bccdb9bec3e7fe102f9794a512a53ccb08cb7460727357103c1dd8687c06bffd48aaf2f2811fd2e184a61 support-urllib3-1.26.patch"
+sha512sums="8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5 requests-2.22.0.tar.gz"
diff --git a/main/py3-requests/support-urllib3-1.26.patch b/main/py3-requests/support-urllib3-1.26.patch
deleted file mode 100644
index de0bb11dbd..0000000000
--- a/main/py3-requests/support-urllib3-1.26.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d6b5b401e8d6141bcefa4a70ff1c836aa085120b Mon Sep 17 00:00:00 2001
-From: Nate Prewitt <Nate.Prewitt@gmail.com>
-Date: Thu, 25 Apr 2019 10:05:02 -0700
-Subject: [PATCH] upgrade support for urllib3 1.25
-
----
- requests/__init__.py | 4 ++--
- setup.py | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/requests/__init__.py b/requests/__init__.py
-index bc168ee53..9a899df67 100644
---- a/requests/__init__.py
-+++ b/requests/__init__.py
-@@ -57,10 +57,10 @@ def check_compatibility(urllib3_version, chardet_version):
- # Check urllib3 for compatibility.
- major, minor, patch = urllib3_version # noqa: F811
- major, minor, patch = int(major), int(minor), int(patch)
-- # urllib3 >= 1.21.1, <= 1.24
-+ # urllib3 >= 1.21.1, <= 1.25
- assert major == 1
- assert minor >= 21
-- assert minor <= 24
-+ assert minor <= 25
-
- # Check chardet for compatibility.
- major, minor, patch = chardet_version.split('.')[:3]
-diff --git a/setup.py b/setup.py
-index 10ce2c621..50925533e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -44,7 +44,7 @@ def run_tests(self):
- requires = [
- 'chardet>=3.0.2,<3.1.0',
- 'idna>=2.5,<2.9',
-- 'urllib3>=1.21.1,<1.25',
-+ 'urllib3>=1.21.1,<1.26,!=1.25.0',
- 'certifi>=2017.4.17'
-
- ]