[arch-commits] Commit in python-requests/repos/community-any (3 files)

Massimiliano Torromeo mtorromeo at archlinux.org
Thu Sep 4 07:26:09 UTC 2014


    Date: Thursday, September 4, 2014 @ 09:26:09
  Author: mtorromeo
Revision: 118235

archrelease: copy trunk to community-any

Added:
  python-requests/repos/community-any/PKGBUILD
  python-requests/repos/community-any/certs.patch
Deleted:
  python-requests/repos/community-any/226b5c7b0aafc3cb744eb79a666d9a1bd0803a47.patch

------------------------------------------------+
 226b5c7b0aafc3cb744eb79a666d9a1bd0803a47.patch |   34 ------------
 PKGBUILD                                       |   62 +++++++++++++++++++++++
 certs.patch                                    |   26 +++++++++
 3 files changed, 88 insertions(+), 34 deletions(-)

Deleted: 226b5c7b0aafc3cb744eb79a666d9a1bd0803a47.patch
===================================================================
--- 226b5c7b0aafc3cb744eb79a666d9a1bd0803a47.patch	2014-09-04 07:24:06 UTC (rev 118234)
+++ 226b5c7b0aafc3cb744eb79a666d9a1bd0803a47.patch	2014-09-04 07:26:09 UTC (rev 118235)
@@ -1,34 +0,0 @@
-From 226b5c7b0aafc3cb744eb79a666d9a1bd0803a47 Mon Sep 17 00:00:00 2001
-From: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-Date: Wed, 3 Sep 2014 09:40:27 +0200
-Subject: [PATCH] Open README and HISTORY as utf-8 encoded files (fixes #2196)
-
----
- setup.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 9540a47..e39d13b 100755
---- a/setup.py
-+++ b/setup.py
-@@ -5,6 +5,8 @@
- 
- import requests
- 
-+from codecs import open
-+
- try:
-     from setuptools import setup
- except ImportError:
-@@ -27,9 +29,9 @@
- 
- requires = ['certifi']
- 
--with open('README.rst') as f:
-+with open('README.rst', 'r', 'utf-8') as f:
-     readme = f.read()
--with open('HISTORY.rst') as f:
-+with open('HISTORY.rst', 'r', 'utf-8') as f:
-     history = f.read()
- 
- setup(

Added: PKGBUILD
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-09-04 07:26:09 UTC (rev 118235)
@@ -0,0 +1,62 @@
+# $Id: PKGBUILD 118233 2014-09-04 07:22:47Z mtorromeo $
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgbase=python-requests
+pkgname=(python-requests python2-requests)
+pkgver=2.4.0
+pkgrel=2
+_libname=requests
+pkgdesc="Python HTTP for Humans."
+url="http://python-requests.org"
+makedepends=('python-setuptools' 'python2-setuptools')
+license=('Apache')
+arch=('any')
+source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz
+        certs.patch
+        226b5c7b0aafc3cb744eb79a666d9a1bd0803a47.patch)
+sha256sums=('7007e03cbc73e357b5055c6ea0ad6e447e2afa00f1a1f843cd792a1ebaa3763e'
+            '23bbd144905192edb23082c017292356eedbb3b41856c2a46505a2acb4ace831'
+            '45cbe79fcf452eebb93444de7b78b35c679a77f268ea7286f5899bdb9ea7153a')
+
+prepare() {
+    cd "$srcdir"/$_libname-$pkgver
+    patch -p1 -i "$srcdir"/certs.patch
+    patch -p1 -i "$srcdir"/226b5c7b0aafc3cb744eb79a666d9a1bd0803a47.patch
+    sed -r 's#(\W|^)requests/cacert\.pem(\W|$)##' -i MANIFEST.in
+    rm -f requests/cacert.pem
+}
+
+build() {
+    cd "$srcdir"/$_libname-$pkgver
+
+    rm -rf ../buildpy3; mkdir ../buildpy3
+    python setup.py build -b ../buildpy3
+
+    rm -rf ../buildpy2; mkdir ../buildpy2
+    python2 setup.py build -b ../buildpy2
+    find ../buildpy2 -name \*.py -exec sed -r 's|^#!(.*)python$|#!\1python2|' -i {} +
+}
+
+check() {
+    cd "$srcdir"/$_libname-$pkgver
+    test -f "$(python -m requests.certs)"
+}
+
+package_python-requests() {
+    depends=(python)
+
+    cd "$srcdir"/$_libname-$pkgver
+    rm -rf build; ln -s ../buildpy3 build
+    python setup.py install --skip-build -O1 --root="$pkgdir"
+    install -m0644 -D "LICENSE" "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python2-requests() {
+    depends=(python2)
+    optdepends=('python2-ndg-httpsclient: HTTPS requests with SNI support'
+                'python2-grequests: asynchronous requests with gevent')
+
+    cd "$srcdir"/$_libname-$pkgver
+    rm -rf build; ln -s ../buildpy2 build
+    python2 setup.py install --skip-build -O1 --root="$pkgdir"
+}

Added: certs.patch
===================================================================
--- certs.patch	                        (rev 0)
+++ certs.patch	2014-09-04 07:26:09 UTC (rev 118235)
@@ -0,0 +1,26 @@
+diff --git a/requests/certs.py b/requests/certs.py
+index 07e6475..33db011 100644
+--- a/requests/certs.py
++++ b/requests/certs.py
+@@ -19,7 +19,7 @@ except ImportError:
+     def where():
+         """Return the preferred certificate bundle."""
+         # vendored bundle inside Requests
+-        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
++        return "/etc/ssl/certs/ca-certificates.crt"
+ 
+ if __name__ == '__main__':
+     print(where())
+diff --git a/setup.py b/setup.py
+index e39d13b..3b86d3c 100755
+--- a/setup.py
++++ b/setup.py
+@@ -27,7 +27,7 @@ packages = [
+     'requests.packages.urllib3.packages.ssl_match_hostname',
+ ]
+ 
+-requires = ['certifi']
++requires = []
+ 
+ with open('README.rst', 'r', 'utf-8') as f:
+     readme = f.read()




More information about the arch-commits mailing list