[amp] 01/03: In this commit I am trying to test all Python3 versions.
Muammar El Khatib
muammar at moszumanska.debian.org
Tue Aug 1 19:33:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
muammar pushed a commit to branch master
in repository amp.
commit c26e8d646470d24903d826b7764889bf754bbe24
Author: Muammar El Khatib <muammarelkhatib at gmail.com>
Date: Tue Aug 1 14:22:12 2017 -0400
In this commit I am trying to test all Python3 versions.
---
debian/patches/01_Makefile.patch | 15 +++++++++------
debian/rules | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/debian/patches/01_Makefile.patch b/debian/patches/01_Makefile.patch
index e0b277a..d0b7d3b 100644
--- a/debian/patches/01_Makefile.patch
+++ b/debian/patches/01_Makefile.patch
@@ -5,12 +5,15 @@ Index: amp/amp/Makefile
===================================================================
--- amp.orig/amp/Makefile
+++ amp/amp/Makefile
-@@ -6,7 +6,7 @@ python2:
- python3:
- +$(MAKE) -C model
+@@ -8,6 +8,11 @@ python3:
+$(MAKE) -C descriptor
-- f2py3 -c -m fmodules model.f90 descriptor/cutoffs.f90 descriptor/gaussian.f90 descriptor/zernike.f90 model/neuralnetwork.f90
+ f2py3 -c -m fmodules model.f90 descriptor/cutoffs.f90 descriptor/gaussian.f90 descriptor/zernike.f90 model/neuralnetwork.f90
+
++python3.6:
++ +$(MAKE) -C model
++ +$(MAKE) -C descriptor
+ f2py3.6 -c -m fmodules model.f90 descriptor/cutoffs.f90 descriptor/gaussian.f90 descriptor/zernike.f90 model/neuralnetwork.f90
-
++
AMPDIR:=$(shell pwd)
-
+
+ py2tests:
diff --git a/debian/rules b/debian/rules
index 3253fa3..26d2104 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ GIT = 'https://bitbucket.org/andrewpeterson/amp'
# The full changelog version number, used for the orig.tar.gz
VER=$(shell dpkg-parsechangelog -ldebian/changelog -SVersion | cut -d- -f1)
-export PYBUILD_BEFORE_TEST_python3=cp -r tests {build_dir}; cd amp; make python3; cp *.so *.mod {build_dir}/amp
+export PYBUILD_BEFORE_TEST_python3=cp -r tests {build_dir}; cd amp; make python3; make python3.6; cp *.so *.mod {build_dir}/amp
%:
dh $@ --with python3 --buildsystem=pybuild
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/amp.git
More information about the debian-science-commits
mailing list