[amp] 03/18: I have added python3 pyinstall file.

[Muammar El Khatib]

This is an automated email from the git hooks/post-receive script.

muammar pushed a commit to branch master
in repository amp.

commit 905aa254498a6eb104b24de7dc98af44ecdcd8c1
Author: Muammar El Khatib <muammarelkhatib at gmail.com>
Date:   Sat Jul 29 20:42:41 2017 -0400

    I have added python3 pyinstall file.
---
 debian/control               |  5 +++--
 debian/python3-amp.pyinstall |  6 ++++++
 debian/rules                 | 20 +++++++++++---------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 29c21aa..1a16d87 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: debhelper (>= 9),
                python3-pexpect,
                python3-zmq
 X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 Standards-Version: 3.9.6
 Homepage: https://bitbucket.org/andrewpeterson/amp
 
@@ -56,10 +57,10 @@ Architecture: any
 Depends: python3-ase (>= 3.9.0~),
          python3-scipy,
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          ${shlibs:Depends}
 Recommends: python3-matplotlib
-Breaks: ${python:Breaks}
+Breaks: ${python3:Breaks}
 Description: Atomistic Machine-learning Package
  Amp is an open-source package designed to easily bring machine-learning to
  atomistic calculations. This project is being developed at Brown University in
diff --git a/debian/python3-amp.pyinstall b/debian/python3-amp.pyinstall
new file mode 100644
index 0000000..ac71b0d
--- /dev/null
+++ b/debian/python3-amp.pyinstall
@@ -0,0 +1,6 @@
+amp/*.py
+amp/descriptor/*.py
+amp/model/*.py
+amp/regression/*.py
+amp/*.so
+tests/*.py
diff --git a/debian/rules b/debian/rules
index 26d4430..420b1d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,6 @@ VER=$(shell dpkg-parsechangelog -ldebian/changelog -SVersion | cut -d- -f1)
 
 override_dh_auto_build:
 	cd $(CURDIR)/amp/model; \
-	gfortran -c neuralnetwork.f90; \
-	mv neuralnetwork.mod $(CURDIR)/amp/; \
 	cd $(CURDIR)/amp/; \
 	make python2
 	cd $(CURDIR)/amp/; \
@@ -21,23 +19,27 @@ override_dh_auto_build:
 
 override_dh_python2:
 	dh_python2
-	dh_python3
 	dh_numpy
 
-override_dh_auto_test:
-	cd $(CURDIR)/amp/; \
-	make py2tests
-	cd $(CURDIR)/amp/; \
-	make py3tests
+override_dh_python3:
+	dh_python3
+	dh_numpy
 
+#override_dh_auto_test:
+#	cd $(CURDIR)/amp/; \
+#	make py2tests
+#	cd $(CURDIR)/amp/; \
+#	make py3tests
+#
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf BPnoforce_test BP_test cartesian_test neural/fmodules.so
+	rm -rf amp.egg-info/
 	find . -name "*.json" -delete
 	find . -name "*-train-log.txt" -delete
 	find . -name "*.pyc" -delete
 	find . -name "*.o" -delete
 	find . -name "*.mod" -delete
+	find . -name "*.so" -delete
 
 get-orig-source:
 	rm -rf amp-$(VER)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/amp.git