[arch-commits] Commit in python-urllib3/trunk (PKGBUILD)

[Felix Yan]

    Date: Monday, September 7, 2015 @ 04:51:39
  Author: fyan
Revision: 139428

upgpkg: python-urllib3 1.12-1

Modified:
  python-urllib3/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-07 02:29:42 UTC (rev 139427)
+++ PKGBUILD	2015-09-07 02:51:39 UTC (rev 139428)
@@ -6,7 +6,8 @@
 
 pkgbase=python-urllib3
 pkgname=(python-urllib3 python2-urllib3)
-pkgver=1.11
+pkgver=1.12
+_commit=e91c16169e463118ce662345461933bb3a7dedef
 pkgrel=1
 pkgdesc="HTTP library with thread-safe connection pooling and file post support"
 arch=("any")
@@ -13,50 +14,45 @@
 url="https://github.com/shazow/urllib3"
 license=("MIT")
 makedepends=('python-setuptools' 'python2-setuptools' 'git')
-checkdepends=('python-nose' 'python2-nose' 'python-mock' 'python2-mock' 'python-pyopenssl' 'python2-pyopenssl'
-              'python-tornado' 'python2-tornado' 'python2-ndg-httpsclient' 'python-coverage' 'python2-coverage')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz"
-        LICENSE)
-md5sums=('d85d3c40f0725bbc48f40c354f7cebde'
-         '350846ab4dd11ce105b570c15c1b0764')
+checkdepends=('python-nose' 'python2-nose' 'python-mock' 'python2-mock' 'python-coverage' 'python2-coverage'
+              'python-tornado' 'python2-tornado' 'twine' 'python2-twine')
+source=("git+https://github.com/shazow/urllib3.git#commit=$_commit")
+md5sums=('SKIP')
 
 prepare() {
-  # Hack version requirements for test requirements to run tests - Disabled due to tests not runable
-  #sed -e "s/==.*//" -i $_pkgname/test-requirements.txt
-
-  cp -a urllib3-$pkgver{,-py2}
+  cp -a urllib3{,-py2}
 }
 
 build() {
-  cd urllib3-$pkgver
+  cd urllib3
   python setup.py build
 
-  cd ../urllib3-$pkgver-py2
+  cd ../urllib3-py2
   python2 setup.py build
 }
 
 check() {
-  # Tests stuck
+  # Expected failure when asking for external resources
 
-  cd urllib3-$pkgver
-  # nosetests3 -e "pyopenssl"  # No ndg-httpsclient module to test with
+  cd urllib3
+  nosetests3 || warning "Tests failed"
 
-  cd ../urllib3-$pkgver-py2
-  # nosetests2
+  cd ../urllib3-py2
+  nosetests2 || warning "Tests failed"
 }
 
 package_python-urllib3() {
   depends=('python')
 
-  cd urllib3-$pkgver
+  cd urllib3
   python setup.py install --root="${pkgdir}"
-  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }
 
 package_python2-urllib3() {
   depends=('python2')
 
-  cd urllib3-$pkgver-py2
+  cd urllib3-py2
   python2 setup.py install --root="${pkgdir}"
-  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }