Commit f4653da3 authored by Justin Berthault's avatar Justin Berthault Committed by Leo
Browse files

main/py3-requests: upgrade to 2.25.1

parent 0a09a1ed
From 516f84f490ccd352672847c6a3d23c67a13b3f98 Mon Sep 17 00:00:00 2001
From: Dan Blanchard <dan.blanchard@gmail.com>
Date: Thu, 10 Dec 2020 20:07:55 -0500
Subject: [PATCH] Upgrade to chardet 4.x
---
requests/__init__.py | 6 ++----
setup.py | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/requests/__init__.py b/requests/__init__.py
index c00f556bbc..f8f94295f9 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -65,10 +65,8 @@ def check_compatibility(urllib3_version, chardet_version):
# Check chardet for compatibility.
major, minor, patch = chardet_version.split('.')[:3]
major, minor, patch = int(major), int(minor), int(patch)
- # chardet >= 3.0.2, < 3.1.0
- assert major == 3
- assert minor < 1
- assert patch >= 2
+ # chardet >= 3.0.2, < 5.0.0
+ assert (3, 0, 2) <= (major, minor, patch) < (5, 0, 0)
def _check_cryptography(cryptography_version):
diff --git a/setup.py b/setup.py
index e714bfa441..7ba4b2a25f 100755
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ def run_tests(self):
packages = ['requests']
requires = [
- 'chardet>=3.0.2,<4',
+ 'chardet>=3.0.2,<5',
'idna>=2.5,<3',
'urllib3>=1.21.1,<1.27',
'certifi>=2017.4.17'
......@@ -2,8 +2,8 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=py3-requests
_pkgname=requests
pkgver=2.25.0
pkgrel=1
pkgver=2.25.1
pkgrel=0
pkgdesc="HTTP request library for Python3"
url="http://www.python-requests.org/"
arch="noarch"
......@@ -19,7 +19,6 @@ source="
https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
certs.patch
0001-don-t-depend-on-certifi.patch
0002-upgrade-chardet-to-4.x.patch
"
builddir="$srcdir/$_pkgname-$pkgver"
......@@ -34,7 +33,6 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
sha512sums="dd13ccb6bcd95bdd31a414dba67e5a0914ff172ae6f5d255849837e8e2a7e404e3c02fc3d07e5ff6dc81c12d0fe56c3b83bc62bc377dd3f504b00b97b144db74 requests-2.25.0.tar.gz
sha512sums="ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45 requests-2.25.1.tar.gz
424a3bb01b23409284f6c9cd2bc22d92df31b85cfd96e1d1b16b5d68adeca670dfed4fff7977d8b10980102b0f780eacc465431021fcd661f3a17168a02a39a3 certs.patch
717b031b837cdbf507fef47b9408ed9c607f82cdc5b786172626e98cb1ac666cd2fb9fafc541a60c551a3fdd22a437056d8faf57fd6b451e34c562d673bee0c6 0001-don-t-depend-on-certifi.patch
056a4b875191d95a8a2596494f86725bf8606e4c9cad3841b31ee37d590050ea9029b93dfd5af41207bb164b8bb5027e124f7230aea2b3c2e3cce26a9cf6c4d6 0002-upgrade-chardet-to-4.x.patch"
717b031b837cdbf507fef47b9408ed9c607f82cdc5b786172626e98cb1ac666cd2fb9fafc541a60c551a3fdd22a437056d8faf57fd6b451e34c562d673bee0c6 0001-don-t-depend-on-certifi.patch"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment