Update virtualenv to 15.03, pypy3 to 3.3

Known bug that urllib.request does not contain HTTPSHandler.

2 files changed, 20 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14aed87203da..1309b2c795ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = pypy-virtualenv
 	pkgdesc = Virtual Python Environment builder for pypy
-	pkgver = 13.1.2
+	pkgver = 15.0.3
 	pkgrel = 1
 	url = https://virtualenv.pypa.io/
 	arch = any
 	license = MIT
 	makedepends = pypy
 	makedepends = pypy3
-	source = http://pypi.python.org/packages/source/v/virtualenv/virtualenv-13.1.2.tar.gz
-	md5sums = b989598f068d64b32dead530eb25589a
-	sha256sums = aabc8ef18cddbd8a2a9c7f92bc43e2fea54b1147330d65db920ef3ce9812e3dc
+	source = https://pypi.io/packages/source/v/virtualenv/virtualenv-15.0.3.tar.gz
+	md5sums = a5a061ad8a37d973d27eb197d05d99bf
+	sha256sums = 6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d
 
 pkgname = pypy-virtualenv
 	depends = pypy
diff --git a/PKGBUILD b/PKGBUILD
index 09357f1e9e73..21ebaa92e072 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,33 @@
 # Contributor: Daniele Paolella <dp@mcrservice.it>
 
 pkgname=('pypy-virtualenv' 'pypy3-virtualenv')
-pkgver=13.1.2
+pkgver=15.0.3
 pkgrel=1
 pkgdesc="Virtual Python Environment builder for pypy"
 url="https://virtualenv.pypa.io/"
 arch=('any')
 license=('MIT')
 makedepends=('pypy' 'pypy3')
-source=("http://pypi.python.org/packages/source/v/virtualenv/virtualenv-$pkgver.tar.gz")
-md5sums=('b989598f068d64b32dead530eb25589a')
-sha256sums=('aabc8ef18cddbd8a2a9c7f92bc43e2fea54b1147330d65db920ef3ce9812e3dc')
+source=("https://pypi.io/packages/source/v/virtualenv/virtualenv-$pkgver.tar.gz")
+md5sums=('a5a061ad8a37d973d27eb197d05d99bf')
+sha256sums=('6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d')
 
 package_pypy-virtualenv() {
   depends=('pypy')
 
   cd "$srcdir/virtualenv-$pkgver"
 
-  /usr/bin/pypy setup.py build
-  /usr/bin/pypy setup.py install --root="$pkgdir"
+  # should report this upstream as still not fixed...
+  sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env pypy|" virtualenv.py
+
+  LANG='en_US.UTF-8' pypy setup.py build
+  LANG='en_US.UTF-8' pypy setup.py install --root="$pkgdir"
 
   mkdir -p "${pkgdir}"/usr/bin
 
   # link to a version with 2 suffix as well
   ln "$pkgdir/opt/pypy/bin/virtualenv" "$pkgdir/usr/bin/virtualenv-pypy2"
-  ln "$pkgdir/opt/pypy/bin/virtualenv-2.7" "$pkgdir/usr/bin/virtualenv-pypy-2.7"
+  ln "$pkgdir/opt/pypy/bin/virtualenv" "$pkgdir/usr/bin/virtualenv-pypy-2.7"
   ln "$pkgdir/usr/bin/virtualenv-pypy2" "$pkgdir/usr/bin/virtualenv-pypy"
 
   install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -37,14 +40,17 @@ package_pypy3-virtualenv() {
 
   cd "$srcdir/virtualenv-$pkgver"
 
-  /usr/bin/pypy3 setup.py build
-  /usr/bin/pypy3 setup.py install --root="$pkgdir"
+  # should report this upstream as still not fixed...
+  sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env pypy3|" virtualenv.py
+
+  LANG='en_US.UTF-8' pypy3 setup.py build
+  LANG='en_US.UTF-8' pypy3 setup.py install --root="$pkgdir"
 
   mkdir -p "${pkgdir}"/usr/bin
 
   # link to a version with 2 suffix as well
   ln "$pkgdir/opt/pypy3/bin/virtualenv" "$pkgdir/usr/bin/virtualenv-pypy3"
-  ln "$pkgdir/opt/pypy3/bin/virtualenv-3.2" "$pkgdir/usr/bin/virtualenv-pypy-3.2"
+  ln "$pkgdir/opt/pypy3/bin/virtualenv" "$pkgdir/usr/bin/virtualenv-pypy-3.3"
 
   install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }