[cmor] 147/190: WIP python3: Revert to old-form setup.py call; try again on python3 build
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit 67e0aa5c24a987ed90ea13e88383d0eb8c086c44
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jun 12 14:10:22 2013 +0100
WIP python3: Revert to old-form setup.py call; try again on python3 build
---
debian/patches/python3.patch | 37 +++++++++++++++++--------------------
debian/rules | 4 ++--
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 484122c..a5607d2 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -5,17 +5,14 @@ Forwarded: no
Index: cmor-2.8.3/Lib/git2svn.py
===================================================================
---- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-12 12:22:15.000000000 +0100
-+++ cmor-2.8.3/Lib/git2svn.py 2013-06-12 12:22:21.000000000 +0100
-@@ -1,5 +1,7 @@
+--- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-12 13:33:07.000000000 +0100
++++ cmor-2.8.3/Lib/git2svn.py 2013-06-12 14:08:47.000000000 +0100
+@@ -1,3 +1,4 @@
++from __future__ import print_function
import os,sys
-+from __future__ import print_function
-+
svn=sys.argv[1]
-
- git = os.popen("git status").readlines()
-@@ -17,15 +19,15 @@
+@@ -17,15 +18,15 @@
for f in modfiles+newfiles:
cmd = "cp -pf %s %s/%s" % (f,svn,f)
@@ -36,8 +33,8 @@ Index: cmor-2.8.3/Lib/git2svn.py
os.popen(cmd).readlines()
Index: cmor-2.8.3/Lib/pywrapper.py
===================================================================
---- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-12 12:22:15.000000000 +0100
-+++ cmor-2.8.3/Lib/pywrapper.py 2013-06-12 13:17:10.000000000 +0100
+--- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-12 13:33:07.000000000 +0100
++++ cmor-2.8.3/Lib/pywrapper.py 2013-06-12 13:33:12.000000000 +0100
@@ -1,4 +1,3 @@
-
import cmor_const,numpy,os,_cmor
@@ -711,8 +708,8 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if (file_name is False):
Index: cmor-2.8.3/Lib/__init__.py
===================================================================
---- cmor-2.8.3.orig/Lib/__init__.py 2013-06-12 12:22:15.000000000 +0100
-+++ cmor-2.8.3/Lib/__init__.py 2013-06-12 13:08:32.000000000 +0100
+--- cmor-2.8.3.orig/Lib/__init__.py 2013-06-12 13:33:07.000000000 +0100
++++ cmor-2.8.3/Lib/__init__.py 2013-06-12 13:33:12.000000000 +0100
@@ -1,9 +1,9 @@
-from cmor_const import *
-
@@ -731,8 +728,8 @@ Index: cmor-2.8.3/Lib/__init__.py
pass
Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
===================================================================
---- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-12 12:22:15.000000000 +0100
-+++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-12 13:32:05.000000000 +0100
+--- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-12 13:33:07.000000000 +0100
++++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-12 13:33:12.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cdms2
@@ -1155,8 +1152,8 @@ Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
Index: cmor-2.8.3/Test/check_results.py
===================================================================
---- cmor-2.8.3.orig/Test/check_results.py 2013-06-12 12:22:15.000000000 +0100
-+++ cmor-2.8.3/Test/check_results.py 2013-06-12 12:22:21.000000000 +0100
+--- cmor-2.8.3.orig/Test/check_results.py 2013-06-12 13:33:07.000000000 +0100
++++ cmor-2.8.3/Test/check_results.py 2013-06-12 13:33:12.000000000 +0100
@@ -2,6 +2,8 @@
from in_files import input_tables
import sys,os
@@ -1210,8 +1207,8 @@ Index: cmor-2.8.3/Test/check_results.py
+ raise CMORResultCheckError(["Error checking output files for test: Test/%s.f90 we could only find %i files when %i were expected.\n\n Expected files: \n\t%s\n\nPresent files: \n\t%s\n\nMissing files: \n\t%s\n" % (test,nfiles,len(outfiles),repr(outfiles),repr(gotfiles),repr(missing)),])
Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-12 12:22:15.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-12 12:22:21.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-12 13:33:07.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-12 13:33:12.000000000 +0100
@@ -1,11 +1,13 @@
import cmor,numpy,sys,os
+
@@ -1289,8 +1286,8 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
f.close()
Index: cmor-2.8.3/setup.py.in
===================================================================
---- cmor-2.8.3.orig/setup.py.in 2013-06-12 12:22:15.000000000 +0100
-+++ cmor-2.8.3/setup.py.in 2013-06-12 12:22:21.000000000 +0100
+--- cmor-2.8.3.orig/setup.py.in 2013-06-12 13:33:07.000000000 +0100
++++ cmor-2.8.3/setup.py.in 2013-06-12 13:33:12.000000000 +0100
@@ -1,8 +1,10 @@
+from __future__ import print_function # to be python2/python3 agnostic
import numpy
diff --git a/debian/rules b/debian/rules
index 9d5e593..3206c12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,8 +40,8 @@ endif
override_dh_auto_install:
$(MAKE) install DESTDIR=`pwd`/debian/tmp
$(MAKE) install_shlib DESTDIR=`pwd`/debian/tmp
- for p in $(PYVERS) ; do \
- $$p ./setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb ; \
+ for p in $(PYVERS) $(PY3VERS) ; do \
+ $$p ./setup.py install --prefix==$(CURDIR)/debian/tmp ; \
done
dh_numpy
dh_install -p libcmor2 libcmor.so.2 $(LIBDIR)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list