[arch-commits] Commit in python-urllib3/repos/extra-any (5 files)

Felix Yan felixonmars at archlinux.org
Tue Jun 5 04:01:12 UTC 2018


    Date: Tuesday, June 5, 2018 @ 04:01:11
  Author: felixonmars
Revision: 325875

archrelease: copy trunk to extra-any

Added:
  python-urllib3/repos/extra-any/LICENSE
    (from rev 325874, python-urllib3/trunk/LICENSE)
  python-urllib3/repos/extra-any/PKGBUILD
    (from rev 325874, python-urllib3/trunk/PKGBUILD)
Deleted:
  python-urllib3/repos/extra-any/LICENSE
  python-urllib3/repos/extra-any/PKGBUILD
  python-urllib3/repos/extra-any/tornado-4.3.patch

-------------------+
 LICENSE           |   64 +++++++++++-----------
 PKGBUILD          |  151 +++++++++++++++++++++++++---------------------------
 tornado-4.3.patch |   23 -------
 3 files changed, 105 insertions(+), 133 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2018-06-05 04:00:54 UTC (rev 325874)
+++ LICENSE	2018-06-05 04:01:11 UTC (rev 325875)
@@ -1,32 +0,0 @@
-Note from the ArchLinux Packager:
-The urllib3 source doesn't come with a license file.  Its homepage
-does provide a link to the text of the MIT license, so I copied
-the following text to a file when building the package.
-
-------CUT------
-Open Source Initiative OSI - The MIT License:Licensing
-
-
-[OSI Approved License]
-
-The MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

Copied: python-urllib3/repos/extra-any/LICENSE (from rev 325874, python-urllib3/trunk/LICENSE)
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2018-06-05 04:01:11 UTC (rev 325875)
@@ -0,0 +1,32 @@
+Note from the ArchLinux Packager:
+The urllib3 source doesn't come with a license file.  Its homepage
+does provide a link to the text of the MIT license, so I copied
+the following text to a file when building the package.
+
+------CUT------
+Open Source Initiative OSI - The MIT License:Licensing
+
+
+[OSI Approved License]
+
+The MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-05 04:00:54 UTC (rev 325874)
+++ PKGBUILD	2018-06-05 04:01:11 UTC (rev 325875)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Patrice Peterson <runiq at archlinux dot us>
-# Contributor: Chris Brannon <cmbrannon79 at gmail.com>
-# Contributor: BorgHunter <borghunter at gmail dot com>
-
-pkgbase=python-urllib3
-pkgname=(python-urllib3 python2-urllib3 python-urllib3-doc)
-pkgver=1.22
-pkgrel=1
-pkgdesc="HTTP library with thread-safe connection pooling and file post support"
-arch=("any")
-url="https://github.com/shazow/urllib3"
-license=("MIT")
-makedepends=('python-setuptools' 'python2-setuptools' 'python2-sphinx' 'python-ndg-httpsclient'
-             'python2-ndg-httpsclient' 'python-pyasn1' 'python2-pyasn1' 'python-pyopenssl'
-             'python2-pyopenssl' 'python-pysocks' 'python2-pysocks' 'python-mock' 'python2-mock')
-checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-tornado' 'python2-tornado'
-              'python-nose' 'python2-nose' 'python-psutil' 'python2-psutil'
-              'python-gcp-devrel-py-tools' 'python2-gcp-devrel-py-tools')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz"
-        tornado-4.3.patch)
-sha512sums=('1b45a4a64e71847a4fc62b9263235d5b05b62076698fa324454efeb7ad065abd702cc9eadb2d396d9270b07e91e9bad94c52a4b9b115aadccb27f81955e6feab'
-            '7c09acefa963a80379f8b2f3f2c2c7546ec62025058c1ae024bc954d49392d7956b8b3ceaed40b3d3ab06bcf9c74bfb4214425b66cc55c50ffc2642e2d35c498')
-
-prepare() {
-  # https://github.com/shazow/urllib3/pull/1236
-  (cd urllib3-$pkgver; patch -p1 -i ../tornado-4.3.patch)
-
-  cp -a urllib3-$pkgver{,-py2}
-}
-
-build() {
-  cd "$srcdir"/urllib3-$pkgver
-  python setup.py build
-
-  cd "$srcdir"/urllib3-$pkgver-py2
-  python2 setup.py build
-
-  # Build with Python 2 since autodoc produces errors on Python 3
-  cd "$srcdir"/urllib3-$pkgver/docs
-  make SPHINXBUILD=sphinx-build2 html
-}
-
-check() {
-  cd "$srcdir"/urllib3-$pkgver
-  python setup.py pytest
-
-  cd "$srcdir"/urllib3-$pkgver-py2
-  python2 setup.py pytest
-}
-
-package_python-urllib3() {
-  depends=('python')
-  optdepends=('python-pysocks: SOCKS support')
-
-  cd urllib3-$pkgver
-  python setup.py install --root="$pkgdir"
-  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
-}
-
-package_python2-urllib3() {
-  depends=('python2')
-  optdepends=('python2-pysocks: SOCKS support')
-
-  cd urllib3-$pkgver-py2
-  python2 setup.py install --root="$pkgdir"
-  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
-}
-
-package_python-urllib3-doc() {
-  pkgdesc="urllib3 Documentation"
-
-  cd urllib3-$pkgver/docs
-  install -d "$pkgdir"/usr/share/doc
-  cp -r _build/html "$pkgdir"/usr/share/doc/python-urllib3
-  install -Dm644 ../LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
-}

Copied: python-urllib3/repos/extra-any/PKGBUILD (from rev 325874, python-urllib3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-05 04:01:11 UTC (rev 325875)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Patrice Peterson <runiq at archlinux dot us>
+# Contributor: Chris Brannon <cmbrannon79 at gmail.com>
+# Contributor: BorgHunter <borghunter at gmail dot com>
+
+pkgbase=python-urllib3
+pkgname=(python-urllib3 python2-urllib3 python-urllib3-doc)
+pkgver=1.23
+pkgrel=1
+pkgdesc="HTTP library with thread-safe connection pooling and file post support"
+arch=("any")
+url="https://github.com/shazow/urllib3"
+license=("MIT")
+makedepends=('python-setuptools' 'python2-setuptools' 'python2-sphinx' 'python-ndg-httpsclient'
+             'python2-ndg-httpsclient' 'python-pyasn1' 'python2-pyasn1' 'python-pyopenssl'
+             'python2-pyopenssl' 'python-pysocks' 'python2-pysocks' 'python-mock' 'python2-mock')
+checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-tornado' 'python2-tornado'
+              'python-nose' 'python2-nose' 'python-psutil' 'python2-psutil'
+              'python-gcp-devrel-py-tools' 'python2-gcp-devrel-py-tools')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz")
+sha512sums=('1d9eccdd2f939a1029fb6e49c45409b3a493f38b5880bba45a6e8a8088c0478190807b1fe7341b22abe363809ef41c5367de831de9618bcc62f34cb9f0cbc7af')
+
+prepare() {
+  cp -a urllib3-$pkgver{,-py2}
+}
+
+build() {
+  cd "$srcdir"/urllib3-$pkgver
+  python setup.py build
+
+  cd "$srcdir"/urllib3-$pkgver-py2
+  python2 setup.py build
+
+  # Build with Python 2 since autodoc produces errors on Python 3
+  cd "$srcdir"/urllib3-$pkgver/docs
+  make SPHINXBUILD=sphinx-build2 html
+}
+
+check() {
+  cd "$srcdir"/urllib3-$pkgver
+  python setup.py pytest
+
+  cd "$srcdir"/urllib3-$pkgver-py2
+  python2 setup.py pytest
+}
+
+package_python-urllib3() {
+  depends=('python')
+  optdepends=('python-pysocks: SOCKS support')
+
+  cd urllib3-$pkgver
+  python setup.py install --root="$pkgdir"
+  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}
+
+package_python2-urllib3() {
+  depends=('python2')
+  optdepends=('python2-pysocks: SOCKS support')
+
+  cd urllib3-$pkgver-py2
+  python2 setup.py install --root="$pkgdir"
+  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}
+
+package_python-urllib3-doc() {
+  pkgdesc="urllib3 Documentation"
+
+  cd urllib3-$pkgver/docs
+  install -d "$pkgdir"/usr/share/doc
+  cp -r _build/html "$pkgdir"/usr/share/doc/python-urllib3
+  install -Dm644 ../LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}

Deleted: tornado-4.3.patch
===================================================================
--- tornado-4.3.patch	2018-06-05 04:00:54 UTC (rev 325874)
+++ tornado-4.3.patch	2018-06-05 04:01:11 UTC (rev 325875)
@@ -1,23 +0,0 @@
-From 39eebb652db570cf51994f404da3dd91c8a9f4cc Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars at archlinux.org>
-Date: Fri, 21 Jul 2017 23:25:35 +0800
-Subject: [PATCH] Fix compatibility with tornado 4.3+
-
-`HTTPHeaders` is not JSON serializable, so make it a dict first.
----
- dummyserver/handlers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
-index a943b836b..b91fe7215 100644
---- a/dummyserver/handlers.py
-+++ b/dummyserver/handlers.py
-@@ -225,7 +225,7 @@ def encodingrequest(self, request):
-         return Response(data, headers=headers)
- 
-     def headers(self, request):
--        return Response(json.dumps(request.headers))
-+        return Response(json.dumps(dict(request.headers)))
- 
-     def successful_retry(self, request):
-         """ Handler which will return an error and then success



More information about the arch-commits mailing list