Run 2to3 for Python 3.x compatibility

3 files changed, 53 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dcaa8d4dbf6e..931b3155c32d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,24 @@
 pkgbase = python-omr
-	pkgdesc = Extract answer choices from scanned jpg
+	pkgdesc = Extract answer choices from scanned jpg bubble forms
 	pkgver = 0.0.73
-	pkgrel = 1
-	url = http://github.com/GregoryCMiller/omr
+	pkgrel = 2
+	url = https://pypi.org/project/omr
 	arch = any
-	license = MIT
-	makedepends = python-setuptools
-	depends = python
-	depends = python-atomicwrites
-	depends = python-attrs
-	depends = python-importlib-metadata
-	depends = python-more-itertools
-	depends = python-opencv
-	depends = python-numpy
-	depends = python-packaging
-	depends = python-pluggy
-	depends = python-py
-	depends = python-pyparsing
-	depends = python-pytest
-	depends = python-six
-	depends = python-wcwidth
-	depends = python-zipp
+	license = Custom
+	depends = python-setuptools
 	source = https://files.pythonhosted.org/packages/source/o/omr/omr-0.0.73.tar.gz
 	sha256sums = 8feca62c1ceab22aeebe74533960f51d32813943195ba0f05dc73f1e3231374f
 
 pkgname = python-omr
-	depends = python
+	depends = python-setuptools
 	depends = python-atomicwrites
-	depends = python-attrs
 	depends = python-importlib-metadata
-	depends = python-more-itertools
 	depends = python-opencv
-	depends = python-numpy
-	depends = python-packaging
-	depends = python-pluggy
+	depends = python-openpyxl
+	depends = python-pillow
 	depends = python-py
 	depends = python-pyparsing
 	depends = python-pytest
 	depends = python-six
 	depends = python-wcwidth
-	depends = python-zipp
-
+	depends = python-yaml
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index d1bef8960f29..671bd6371e2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,50 @@
-# Maintainer: Sebastian Lau <lauseb644@gmail.com>
+# Contributor: Sebastian Lau <lauseb644@gmail.com>
 
-pkgbase='python-omr'
-pkgname=('python-omr')
+pkgname='python-omr'
 _module='omr'
+pkgdesc="Extract answer choices from scanned jpg bubble forms"
 pkgver='0.0.73'
-pkgrel=1
-pkgdesc="Extract answer choices from scanned jpg"
-url="http://github.com/GregoryCMiller/omr"
-depends=('python' 'python-atomicwrites' 'python-attrs' 'python-importlib-metadata' 'python-more-itertools' 'python-opencv' 'python-numpy' 'python-packaging' 'python-pluggy' 'python-py' 'python-pyparsing' 'python-pytest' 'python-six' 'python-wcwidth' 'python-zipp')
-makedepends=('python-setuptools')
-license=('MIT')
+pkgrel=2
+_url='http://github.com/GregoryCMiller/omr'
+url='https://pypi.org/project/omr'
 arch=('any')
-source=("https://files.pythonhosted.org/packages/source/${_module::1}/$_module/$_module-$pkgver.tar.gz")
-sha256sums=('8feca62c1ceab22aeebe74533960f51d32813943195ba0f05dc73f1e3231374f')
+license=('Custom')
+depends=(
+  'python-setuptools'
+)
+makedepends=()
+source=(
+  "https://files.pythonhosted.org/packages/source/${_module::1}/$_module/$_module-$pkgver.tar.gz"
+)
+sha256sums=(
+  '8feca62c1ceab22aeebe74533960f51d32813943195ba0f05dc73f1e3231374f'
+)
+
+prepare() {
+  cd "$srcdir/$_module-$pkgver"
+  2to3 -w */*.py
+}
 
 build() {
-    cd "${srcdir}/${_module}-${pkgver}"
-    python setup.py build
+  cd "$srcdir/$_module-$pkgver"
+  python setup.py build
 }
 
 package() {
-    depends+=()
-    cd "${srcdir}/${_module}-${pkgver}"
-    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  depends+=(
+    'python-atomicwrites'
+    'python-importlib-metadata'
+    'python-opencv'
+    'python-openpyxl'
+    'python-pillow'
+    'python-py'
+    'python-pyparsing'
+    'python-pytest'
+    'python-six'
+    'python-wcwidth'
+    'python-yaml'
+  )
+
+  cd "$srcdir/$_module-$pkgver"
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }