exclude tests from installation (PR #17)

3 files changed, 42 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e847daa8b393..ebaa8055fc79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 # Generated by mksrcinfo v8
-# Sat Mar 30 01:12:30 UTC 2019
+# Sat Apr 13 17:01:52 UTC 2019
 pkgbase = python-merkletools
 	pkgdesc = Python tools for creating and verifying Merkle trees and proofs
 	pkgver = 1.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Tierion/pymerkletools
 	arch = any
 	license = GPL
 	makedepends = python-setuptools
 	depends = python
 	source = https://pypi.io/packages/source/m/merkletools/merkletools-1.0.3.tar.gz
+	source = 0001-setup.py-exclude-tests-from-installation.patch
 	sha256sums = 346dd10f3c11a8be5045cc3d9089f8d9315c9841deb5c71acfac031a7599b15d
+	sha256sums = 695ffffb284e26446138bcc67783e97b4034fed1b3f4b0919b4a5a577b7c1c82
 
 pkgname = python-merkletools
 
diff --git a/0001-setup.py-exclude-tests-from-installation.patch b/0001-setup.py-exclude-tests-from-installation.patch
new file mode 100644
index 000000000000..2fee7f20f1fb
--- /dev/null
+++ b/0001-setup.py-exclude-tests-from-installation.patch
@@ -0,0 +1,27 @@
+From ab15c6d7af0fa8bcb7da4e7932455bf36ad8e810 Mon Sep 17 00:00:00 2001
+From: redfish <redfish@galactica.pw>
+Date: Sat, 13 Apr 2019 12:52:14 -0400
+Subject: [PATCH] setup.py: exclude tests from installation
+
+Otherwise 'tests' package ends up in site-packages/tests,
+which is no good.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 9c8b83c..25fffb2 100755
+--- a/setup.py
++++ b/setup.py
+@@ -26,7 +26,7 @@ setup(
+     author='Eder Santana',
+     keywords='merkle tree, blockchain, tierion',
+     license="MIT",
+-    packages=find_packages(),
++    packages=find_packages(exclude=['tests']),
+     include_package_data=False,
+     zip_safe=False,
+     install_requires=install_requires
+-- 
+2.21.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 08a07ea988de..2f0cd1c85955 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,23 @@ pkgname=python-merkletools
 _pkgname=merkletools
 _reponame=pymerkletools
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Python tools for creating and verifying Merkle trees and proofs'
 arch=('any')
 url="https://github.com/Tierion/pymerkletools"
 license=('GPL')
 depends=('python')
 makedepends=('python-setuptools')
-source=("https://pypi.io/packages/source/${_pkgname::1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+source=("https://pypi.io/packages/source/${_pkgname::1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
+	"0001-setup.py-exclude-tests-from-installation.patch") # PR #17
 #source=("https://github.com/Tierion/${_reponame}/archive/${pkver}.tar.gz")
 
+prepare() {
+    cd "$_pkgname-$pkgver"
+
+    patch -p1 < ../0001-setup.py-exclude-tests-from-installation.patch
+}
+
 build() {
     cd "$_pkgname-$pkgver"
     python setup.py build
@@ -24,4 +31,5 @@ package() {
     python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }
 
-sha256sums=('346dd10f3c11a8be5045cc3d9089f8d9315c9841deb5c71acfac031a7599b15d')
+sha256sums=('346dd10f3c11a8be5045cc3d9089f8d9315c9841deb5c71acfac031a7599b15d'
+            '695ffffb284e26446138bcc67783e97b4034fed1b3f4b0919b4a5a577b7c1c82')