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

[Felix Yan]

    Date: Thursday, November 5, 2015 @ 11:53:40
  Author: fyan
Revision: 146025

upgpkg: python-w3lib 1.13.0-1

Modified:
  python-w3lib/trunk/PKGBUILD
Deleted:
  python-w3lib/trunk/LICENSE

----------+
 LICENSE  |   27 ---------------------------
 PKGBUILD |   34 +++++++++++++++-------------------
 2 files changed, 15 insertions(+), 46 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2015-11-05 10:53:25 UTC (rev 146024)
+++ LICENSE	2015-11-05 10:53:40 UTC (rev 146025)
@@ -1,27 +0,0 @@
-Copyright (c) w3lib and Scrapy developers.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice, 
-       this list of conditions and the following disclaimer.
-    
-    2. Redistributions in binary form must reproduce the above copyright 
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    3. Neither the name of Scrapy nor the names of its contributors may be used
-       to endorse or promote products derived from this software without
-       specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-05 10:53:25 UTC (rev 146024)
+++ PKGBUILD	2015-11-05 10:53:40 UTC (rev 146025)
@@ -4,45 +4,41 @@
 
 pkgbase=python-w3lib
 pkgname=('python-w3lib' 'python2-w3lib')
-pkgver=1.12.0
-pkgrel=2
+pkgver=1.13.0
+pkgrel=1
 pkgdesc="Library of web-related functions"
 arch=('any')
 license=('BSD')
 url="http://w3lib.readthedocs.org"
-makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six')
-# checkdepends=('python-pytest' 'python2-pytest')
-source=("https://pypi.python.org/packages/source/w/w3lib/w3lib-${pkgver}.tar.gz"
-        LICENSE)
-md5sums=('c2545617229b3fc72d59afed85b18035'
-         '8a9dbf92a1904187a362d3fe098d4a1f')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six' 'git')
+checkdepends=('python-pytest' 'python2-pytest')
+source=("git+https://github.com/scrapy/w3lib.git#tag=v$pkgver")
+md5sums=('SKIP')
 
 prepare() {
-  cp -a w3lib-$pkgver{,-py2}
+  cp -a w3lib{,-py2}
 }
 
 check() {
-  # Tests not included
+  cd "$srcdir/w3lib"
+  py.test
 
-  cd "$srcdir/w3lib-${pkgver}"
-  # py.test
-
-  cd "$srcdir/w3lib-${pkgver}-py2"
-  # py.test2
+  cd "$srcdir/w3lib-py2"
+  py.test2
 }
 
 package_python-w3lib() {
   depends=('python-six')
 
-  cd "${srcdir}/w3lib-${pkgver}"
+  cd "${srcdir}/w3lib"
   python setup.py install --root="${pkgdir}" --optimize=1
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_python2-w3lib() {
   depends=('python2-six')
 
-  cd "${srcdir}/w3lib-${pkgver}-py2"
+  cd "${srcdir}/w3lib-py2"
   python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }