upgpkg: python-torchvision-git 0.2.1.r62.g8bd05e6-1

3 files changed, 29 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed88aa23aa07..28a517b8b3ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,21 @@
-# Generated by mksrcinfo v8
-# Sat Jul 29 18:33:49 UTC 2017
 pkgbase = python-torchvision-git
-	pkgdesc = image and video datasets and models for torch deep learning
-	pkgver = 0.1.8.r22.g85bb16a
+	pkgdesc = Datasets, Transforms and Models specific to Computer Vision
+	pkgver = 0.2.1.r62.g8bd05e6
 	pkgrel = 1
 	url = https://github.com/pytorch/vision
-	arch = x86_64
+	arch = any
 	license = BSD
-	makedepends = python
 	makedepends = python-setuptools
-	makedepends = python2
-	makedepends = python2-setuptools
-	source = git://github.com/pytorch/vision
-	sha256sums = SKIP
-
-pkgname = python-torchvision-git
+	depends = python
+	depends = python-numpy
+	depends = python-pillow
+	depends = python-six
 	depends = python-pytorch
+	depends = python-tqdm
 	provides = python-torchvision
 	conflicts = python-torchvision
+	source = git+https://github.com/pytorch/vision
+	sha256sums = SKIP
 
-pkgname = python2-torchvision-git
-	depends = python2-pytorch
-	provides = python2-torchvision
-	conflicts = python2-torchvision
+pkgname = python-torchvision-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..7b206057777e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vision
diff --git a/PKGBUILD b/PKGBUILD
index 59ba53ac5cbc..91c580773ecd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
-# Maintainer: Stephen Zhang <zsrkmyn at gmail dot com>
-
-pkgbase="python-torchvision-git"
-pkgname=("python-torchvision-git" "python2-torchvision-git")
-_pkgname="vision"
-pkgver=0.1.8.r22.g85bb16a
+# Maintainer: Leo Mao
+pkgname=python-torchvision-git
+_pkgname=vision
+pkgver=0.2.1.r62.g8bd05e6
 pkgrel=1
-pkgdesc="image and video datasets and models for torch deep learning"
-arch=('x86_64')
+pkgdesc="Datasets, Transforms and Models specific to Computer Vision"
+arch=('any')
 url="https://github.com/pytorch/vision"
+_github='pytorch/vision'
 license=('BSD')
-makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
-source=("git://github.com/pytorch/vision")
+depends=('python' 'python-numpy' 'python-pillow' 'python-six' 'python-pytorch' 'python-tqdm')
+makedepends=('python-setuptools')
+provides=('python-torchvision')
+conflicts=('python-torchvision')
+source=("git+$url")
 sha256sums=('SKIP')
 
 pkgver () {
@@ -21,44 +23,16 @@ pkgver () {
   )
 }
 
-
-prepare() {
-  cd "$srcdir/"
-
-  cp -a "${_pkgname}" "${_pkgname}-py2"
-  cd "${_pkgname}"
-  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-      -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-      -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-      -i $(find . -name '*.py')
-}
-
 build() {
-  msg "Building Python 2"
-  cd "$srcdir/${_pkgname}-py2"
-  python2 setup.py build
-
   msg "Building Python 3"
-  cd "$srcdir/${_pkgname}"
+  cd "${srcdir}/${_pkgname}"
   python setup.py build
 }
 
-package_python2-torchvision-git() {
-  conflicts=('python2-torchvision')
-  provides=('python2-torchvision')
-  depends=('python2-pytorch')
-  cd "$srcdir/${_pkgname}-py2"
-  python2 setup.py install --root="$pkgdir"/ --optimize=1 --skip-build
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-}
-
-package_python-torchvision-git() {
-  conflicts=('python-torchvision')
-  provides=('python-torchvision')
-  depends=('python-pytorch')
-  cd "$srcdir/${_pkgname}"
-  python setup.py install --root="$pkgdir"/ --optimize=1 --skip-build
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+package() {
+  cd "${srcdir}/${_pkgname}"
+  python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: