[arch-commits] Commit in python-flickrapi/repos/community-any (4 files)

[Felix Yan]

    Date: Saturday, November 15, 2014 @ 04:47:18
  Author: fyan
Revision: 122589

archrelease: copy trunk to community-any

Added:
  python-flickrapi/repos/community-any/PKGBUILD
    (from rev 122588, python-flickrapi/trunk/PKGBUILD)
  python-flickrapi/repos/community-any/fix_setuptools.patch
    (from rev 122588, python-flickrapi/trunk/fix_setuptools.patch)
Deleted:
  python-flickrapi/repos/community-any/PKGBUILD
  python-flickrapi/repos/community-any/fix_setuptools.patch

----------------------+
 PKGBUILD             |  105 +++++++++++++++++++++++++++++--------------------
 fix_setuptools.patch |   38 ++++++++---------
 2 files changed, 82 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-15 03:46:47 UTC (rev 122588)
+++ PKGBUILD	2014-11-15 03:47:18 UTC (rev 122589)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Francois Garillot <francois[@]garillot.net>
-# Contributor: György Balló <ballogy at freestart.hu>
-
-pkgname=python2-flickrapi
-_pkgname=flickrapi
-pkgver=1.4.4
-pkgrel=1
-pkgdesc="The official Python interface to the Flickr API"
-arch=('any')
-url="http://stuvel.eu/flickrapi"
-license=('Python')
-depends=('python2')
-makedepends=('python2-docutils' 'python2-setuptools')
-checkdepends=('python2-nose')
-source=("http://pypi.python.org/packages/source/f/$_pkgname/$_pkgname-$pkgver.zip")
-
-prepare() {
-  cd $_pkgname-$pkgver
-  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-}
-
-build() {
-  cd $_pkgname-$pkgver
-  python2 setup.py build
-}
-
-check() {
-  cd $_pkgname-$pkgver
-  nosetests2
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  python2 setup.py install --root=$pkgdir/ --optimize=1
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-sha512sums=('3af0e38ca9368b43d84449cecc8065145e822223e086dd07fb9bdd5af23e55f16961c9e87c867c0a965064d2aac9ee022ca2e0bfb291991439ab53ae425c3bd9')

Copied: python-flickrapi/repos/community-any/PKGBUILD (from rev 122588, python-flickrapi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-15 03:47:18 UTC (rev 122589)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Francois Garillot <francois[@]garillot.net>
+# Contributor: György Balló <ballogy at freestart.hu>
+
+pkgbase=python-flickrapi
+pkgname=(python-flickrapi python2-flickrapi)
+_pkgname=flickrapi
+pkgver=2.0
+pkgrel=1
+pkgdesc="The official Python interface to the Flickr API"
+arch=('any')
+url="http://stuvel.eu/flickrapi"
+license=('Python')
+makedepends=('python-docutils' 'python2-docutils' 'python-setuptools' 'python2-setuptools' 'python-requests-toolbelt' 'python2-requests-toolbelt'
+             'python-requests-oauthlib' 'python2-requests-oauthlib' 'python-six' 'python2-six')
+checkdepends=('python-nose' 'python2-nose')
+source=("http://pypi.python.org/packages/source/f/$_pkgname/$_pkgname-$pkgver.tar.gz")
+sha512sums=('634aede2e33f044265b9332296ab4352670ee00e681d1ebcd5c612ef88b1bed35fb8bcecf4de63b2d6cfa660cb31c6903375ed4b660c39c9c16586fe51708c7a')
+
+prepare() {
+  cp -a $_pkgname-$pkgver{,-py2}
+
+  cd $_pkgname-$pkgver-py2
+  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  python setup.py build
+
+  cd ../$_pkgname-$pkgver-py2
+  python2 setup.py build
+}
+
+check() {
+  # Tests not shipped
+  return
+
+  cd $_pkgname-$pkgver
+  python runtests
+
+  cd ../$_pkgname-$pkgver-py2
+  python2 runtests
+}
+
+package_python-flickrapi() {
+  depends=('python-six' 'python-requests-oauthlib' 'python-requests-toolbelt')
+
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python setup.py install --root=$pkgdir/ --optimize=1
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+}
+
+package_python2-flickrapi() {
+  depends=('python2-six' 'python2-requests-oauthlib' 'python2-requests-toolbelt')
+
+  cd "$srcdir/$_pkgname-$pkgver-py2"
+
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+}

Deleted: fix_setuptools.patch
===================================================================
--- fix_setuptools.patch	2014-11-15 03:46:47 UTC (rev 122588)
+++ fix_setuptools.patch	2014-11-15 03:47:18 UTC (rev 122589)
@@ -1,19 +0,0 @@
---- a/distribute_setup.py	2013-08-17 22:57:41.227220859 +0800
-+++ b/distribute_setup.py	2013-08-17 22:57:29.343673408 +0800
-@@ -133,6 +133,16 @@
-     try:
-         try:
-             import pkg_resources
-+
-+            # Setuptools 0.7b and later is a suitable (and preferable)
-+            # substitute for any Distribute version.
-+            try:
-+                pkg_resources.require("setuptools>=0.7b")
-+                return
-+            except (pkg_resources.DistributionNotFound,
-+                    pkg_resources.VersionConflict):
-+                pass
-+
-             if not hasattr(pkg_resources, '_distribute'):
-                 if not no_fake:
-                     _fake_setuptools()

Copied: python-flickrapi/repos/community-any/fix_setuptools.patch (from rev 122588, python-flickrapi/trunk/fix_setuptools.patch)
===================================================================
--- fix_setuptools.patch	                        (rev 0)
+++ fix_setuptools.patch	2014-11-15 03:47:18 UTC (rev 122589)
@@ -0,0 +1,19 @@
+--- a/distribute_setup.py	2013-08-17 22:57:41.227220859 +0800
++++ b/distribute_setup.py	2013-08-17 22:57:29.343673408 +0800
+@@ -133,6 +133,16 @@
+     try:
+         try:
+             import pkg_resources
++
++            # Setuptools 0.7b and later is a suitable (and preferable)
++            # substitute for any Distribute version.
++            try:
++                pkg_resources.require("setuptools>=0.7b")
++                return
++            except (pkg_resources.DistributionNotFound,
++                    pkg_resources.VersionConflict):
++                pass
++
+             if not hasattr(pkg_resources, '_distribute'):
+                 if not no_fake:
+                     _fake_setuptools()