From 3fbd9748a313969957a03017b9d9b5476080b129 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 19 May 2019 01:10:53 +0000
Subject: Sun May 19 01:10:53 UTC 2019

a/file-5.37-x86_64-1.txz:  Upgraded.
l/python-requests-2.22.0-x86_64-1.txz:  Upgraded.
n/iputils-20190515-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-60.7.0-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/60.7.0/releasenotes/
---
 .../l/python-requests/python-requests.SlackBuild   |  6 ++---
 .../python-requests/requests.urllib3.version.diff  | 26 ----------------------
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 source/l/python-requests/requests.urllib3.version.diff

(limited to 'source/l')

diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild
index 8ba18ea1d..5f241d5b4 100755
--- a/source/l/python-requests/python-requests.SlackBuild
+++ b/source/l/python-requests/python-requests.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2017  Heinz Wiesinger, Amsterdam, NL
 # All rights reserved.
 #
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python-requests
 VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 SRCNAM=requests
 
@@ -55,8 +55,6 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
 cd $SRCNAM-$VERSION || exit 1
 
-zcat $CWD/requests.urllib3.version.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/source/l/python-requests/requests.urllib3.version.diff b/source/l/python-requests/requests.urllib3.version.diff
deleted file mode 100644
index 59f55c84f..000000000
--- a/source/l/python-requests/requests.urllib3.version.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./setup.py.orig	2018-12-10 00:13:32.000000000 -0600
-+++ ./setup.py	2019-04-28 13:11:33.836514225 -0500
-@@ -44,7 +44,7 @@
- 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',
-     'certifi>=2017.4.17'
- 
- ]
---- ./requests/__init__.py.orig	2018-12-10 00:13:32.000000000 -0600
-+++ ./requests/__init__.py	2019-04-28 13:13:44.711502000 -0500
-@@ -57,10 +57,10 @@
-     # 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.26
-     assert major == 1
-     assert minor >= 21
--    assert minor <= 24
-+    assert minor < 26
- 
-     # Check chardet for compatibility.
-     major, minor, patch = chardet_version.split('.')[:3]
-- 
cgit v1.2.3