Date: Wednesday, January 22, 2020 @ 06:59:34 Author: felixonmars Revision: 373772
archrelease: copy trunk to extra-any Added: python-urllib3/repos/extra-any/LICENSE (from rev 373771, python-urllib3/trunk/LICENSE) python-urllib3/repos/extra-any/PKGBUILD (from rev 373771, python-urllib3/trunk/PKGBUILD) Deleted: python-urllib3/repos/extra-any/LICENSE python-urllib3/repos/extra-any/PKGBUILD python-urllib3/repos/extra-any/https-test-fix.patch ----------------------+ LICENSE | 64 ++++++++++---------- PKGBUILD | 153 +++++++++++++++++++++++-------------------------- https-test-fix.patch | 11 --- 3 files changed, 105 insertions(+), 123 deletions(-) Deleted: LICENSE =================================================================== --- LICENSE 2020-01-22 06:59:12 UTC (rev 373771) +++ LICENSE 2020-01-22 06:59:34 UTC (rev 373772) @@ -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 373771, python-urllib3/trunk/LICENSE) =================================================================== --- LICENSE (rev 0) +++ LICENSE 2020-01-22 06:59:34 UTC (rev 373772) @@ -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 2020-01-22 06:59:12 UTC (rev 373771) +++ PKGBUILD 2020-01-22 06:59:34 UTC (rev 373772) @@ -1,80 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Patrice Peterson <runiq at archlinux dot us> -# Contributor: Chris Brannon <cmbranno...@gmail.com> -# Contributor: BorgHunter <borghunter at gmail dot com> - -pkgbase=python-urllib3 -pkgname=(python-urllib3 python2-urllib3 python-urllib3-doc) -pkgver=1.25.7 -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' - 'python-brotlipy' 'python2-brotlipy') -checkdepends=('python-pytest-runner' 'python-tornado' 'python-nose' 'python-psutil' 'python-trustme' - 'python-gcp-devrel-py-tools') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz" - https-test-fix.patch - tornado-6.patch::https://github.com/urllib3/urllib3/pull/1747.patch) -sha512sums=('bbf55a1d46fe799b98c311bdb47628c14719d5b3ae00fb27515da774d8f7c043ff79a9684f12b133101574527531d4a79134fe67e28dad518d429e55f82e0c59' - 'e2b6f1910680c4da9fb8afb1a5f15d2aea001b832c6b904feaca635643d61cd2afb97dc535c91d242e3d3aad75c7a44c65573a286df1cbcf361379fd32c4574c' - '65cde58ac3a2ce7eea94ec44693ef131e136e4f98b33b7fc78425aad14b5c89009db67d273de25d4789ddef5001d6ef7f7e8dd447436dee5377c4735dcb59cfd') - -prepare() { - #sed -i 's/pytest/tool:pytest/' urllib3-$pkgver/setup.cfg - patch -d urllib3-$pkgver -p1 -i ../tornado-6.patch - patch -d urllib3-$pkgver -p1 -i ../https-test-fix.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 urllib3-$pkgver - python setup.py pytest -} - -package_python-urllib3() { - depends=('python') - optdepends=('python-pysocks: SOCKS support' - 'python-brotlipy: Brotli support' - 'python-pyopenssl: security 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' - 'python2-brotlipy: Brotli support' - 'python2-pyopenssl: security 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 373771, python-urllib3/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-01-22 06:59:34 UTC (rev 373772) @@ -0,0 +1,73 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Patrice Peterson <runiq at archlinux dot us> +# Contributor: Chris Brannon <cmbranno...@gmail.com> +# Contributor: BorgHunter <borghunter at gmail dot com> + +pkgbase=python-urllib3 +pkgname=(python-urllib3 python2-urllib3 python-urllib3-doc) +pkgver=1.25.8 +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' + 'python-brotlipy' 'python2-brotlipy') +checkdepends=('python-pytest-runner' 'python-tornado' 'python-nose' 'python-psutil' 'python-trustme' + 'python-gcp-devrel-py-tools') +source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz") +sha512sums=('813f8a6d0f848444a7807d9ea46a93b576220ca50d364af2107ca46ff572f828e35c1a076bc477a269f33bf95e430a89d22d8e4de1dc8d8628ae687fa3551d6b') + +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 urllib3-$pkgver + python setup.py pytest +} + +package_python-urllib3() { + depends=('python') + optdepends=('python-pysocks: SOCKS support' + 'python-brotlipy: Brotli support' + 'python-pyopenssl: security 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' + 'python2-brotlipy: Brotli support' + 'python2-pyopenssl: security 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: https-test-fix.patch =================================================================== --- https-test-fix.patch 2020-01-22 06:59:12 UTC (rev 373771) +++ https-test-fix.patch 2020-01-22 06:59:34 UTC (rev 373772) @@ -1,11 +0,0 @@ -diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py -index b322c75c..a54e70e6 100644 ---- a/test/with_dummyserver/test_https.py -+++ b/test/with_dummyserver/test_https.py -@@ -155,6 +155,7 @@ class TestHTTPS(HTTPSDummyServerTestCase): - # Python 3.7.4+ - or "WSAECONNRESET" in str(e) # Windows - or "EPIPE" in str(e) # macOS -+ or "ECONNRESET" in str(e) - ): - raise \ No newline at end of file