update to 1.0.7.dev20160607111203

3 files changed, 23 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1cba16fa2f9..47a21c84cfb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 # Generated by mksrcinfo v8
-# Sat May 14 08:46:36 UTC 2016
+# Sun Jun 19 20:45:38 UTC 2016
 pkgbase = python-jira
 	pkgdesc = Python library for interacting with JIRA via REST APIs
-	pkgver = 1.0.3
-	pkgrel = 4
+	pkgver = 1.0.7.dev20160607111203
+	pkgrel = 1
 	url = https://pypi.python.org/pypi/jira
 	arch = any
 	license = BSD
-	makedepends = python-pip
-	makedepends = python2-pip
-	source = https://pypi.python.org/packages/2.7/j/jira/jira-1.0.3-py2.py3-none-any.whl
+	source = https://pypi.python.org/packages/27/b9/29ec48d8d5c010335cfc9bc492ec601fc3cbbf95e223e8e5cd9994ad9455/jira-1.0.7.dev20160607111203.tar.gz
 	source = client.patch
-	md5sums = a4eb7a250cd8fc2adb00e2245a68a528
-	md5sums = cad99b6b79027699605b3a626e49f085
+	md5sums = 57774afc6133bc3565cee0362e3c7840
+	md5sums = db49a4545cf5e2b987ffadadcbfedb4f
 
 pkgname = python-jira
 	depends = python
diff --git a/PKGBUILD b/PKGBUILD
index 1cb011c3e346..01620e8abbcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,47 +5,42 @@ pkgbase=python-jira
 pkgname=('python-jira'
   'python2-jira')
 pkgdesc="Python library for interacting with JIRA via REST APIs"
-pkgver=1.0.3
-pkgrel=4
+pkgver="1.0.7.dev20160607111203"
+pkgrel=1
 url="https://pypi.python.org/pypi/jira"
 license=('BSD')
 arch=('any')
-source=("https://pypi.python.org/packages/2.7/j/jira/jira-${pkgver}-py2.py3-none-any.whl"
+source=("https://pypi.python.org/packages/27/b9/29ec48d8d5c010335cfc9bc492ec601fc3cbbf95e223e8e5cd9994ad9455/jira-${pkgver}.tar.gz"
   'client.patch')
-makedepends=('python-pip'
-  'python2-pip')
-md5sums=('a4eb7a250cd8fc2adb00e2245a68a528'
-  'cad99b6b79027699605b3a626e49f085')
+md5sums=('57774afc6133bc3565cee0362e3c7840'
+         'db49a4545cf5e2b987ffadadcbfedb4f')
 
 prepare(){
   patch -p1 -i "${srcdir}/client.patch"
-  cd "${srcdir}"
-  mv jira-${pkgver}.dist-info jira_patched-${pkgver}.dist-info
-  zip jira_patched-${pkgver}-py2.py3-none-any.whl jira/* jira_patched-${pkgver}.dist-info/*
 }
 
 package_python-jira(){
-makedepends=('python-pip')
-  depends=('python'
+depends=('python'
   'python-requests'
   'python-six'
   #'python-tlslite'
   'python-requests-toolbelt'
   'python-requests-oauthlib'
   'python-oauthlib')
-  pip install --no-deps --target "${pkgdir}/usr/lib/python3.5/site-packages" "${srcdir}/jira_patched-${pkgver}-py2.py3-none-any.whl"
+  cd "${srcdir}/jira-${pkgver}"
+  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
 
 package_python2-jira(){
-  makedepends=('python2-pip')
-  depends=('python2'
+depends=('python2'
   'python2-requests'
   'python2-six'
   'python2-tlslite'
   'python2-requests-toolbelt'
   'python2-requests-oauthlib'
   'python2-oauthlib')
-  pip2 install --no-deps --target "${pkgdir}/usr/lib/python2.7/site-packages" "${srcdir}/jira_patched-${pkgver}-py2.py3-none-any.whl"
+  cd "${srcdir}/jira-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
 }
 
diff --git a/client.patch b/client.patch
index c7c780c76721..9f2f66cb7cf2 100644
--- a/client.patch
+++ b/client.patch
@@ -1,11 +1,10 @@
---- src/jira/client.py	2016-01-08 11:50:20.760876262 +0100
-+++ src/jira/client.py	2016-01-08 11:51:58.297811399 +0100
-
-@@ -288,6 +288,7 @@
+--- src/jira-1.0.7.dev20160607111203/jira/client.py	2016-06-19 22:38:03.084330638 +0200
++++ src/jira-1.0.7.dev20160607111203/jira/client.py	2016-06-19 22:39:39.548288776 +0200
+@@ -334,6 +334,7 @@
      def __del__(self):
          session = getattr(self, "_session", None)
          if session is not None:
 +            import sys
-             if sys.version_info < (3, 4, 0):  # workaround for https://github.com/kennethreitz/requests/issues/2303
-                 session.close()
- 
+             if self.sys_version_info < (3, 4, 0):  # workaround for https://github.com/kennethreitz/requests/issues/2303
+                 try:
+                     session.close()