[silo-llnl] 57/96: WIP; testing python3
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository silo-llnl.
commit 1e60140d1eca1840bca26210291264af9a0921eb
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Jul 5 20:34:52 2013 +0100
WIP; testing python3
---
debian/changelog | 2 +-
debian/patches/python3.patch | 193 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
4 files changed, 196 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 36259f6..41efc45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ silo-llnl (4.8-14) UNRELEASED; urgency=low
* Add Python3 support
* Update qt version support patch for 4.8.4+
- -- Alastair McKinstry <mckinstry at debian.org> Sun, 13 Jan 2013 17:06:45 +0000
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 21 Jun 2013 17:06:45 +0100
silo-llnl (4.8-13) unstable; urgency=low
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
new file mode 100644
index 0000000..1c0f3d5
--- /dev/null
+++ b/debian/patches/python3.patch
@@ -0,0 +1,193 @@
+Index: silo-llnl-4.8/tests/test_error.py
+===================================================================
+--- silo-llnl-4.8.orig/tests/test_error.py 2013-06-11 20:21:50.000000000 +0100
++++ silo-llnl-4.8/tests/test_error.py 2013-06-21 15:52:17.000000000 +0100
+@@ -47,6 +47,7 @@
+ # reflect those of the United States Government or Lawrence Livermore
+ # National Security, LLC, and shall not be used for advertising or
+ # product endorsement purposes.
++from __future__ import print_function
+ import os
+ import Silo
+
+@@ -56,33 +57,33 @@
+ file = "multi_ucd3d.h5"
+
+ db = Silo.Open(file)
+-print "db = ",db
++print( "db = ",db)
+
+ try:
+- print "Trying to set a bad directory"
++ print ("Trying to set a bad directory")
+ db.SetDir("Magrathea")
+ except:
+- print " -- Caught error"
++ print (" -- Caught error")
+
+ try:
+- print "Trying to read a bad variable"
++ print ("Trying to read a bad variable")
+ db.GetVar("Arkleseizure")
+ except:
+- print " -- Caught error"
++ print (" -- Caught error")
+
+-print "Closing...."
++print ("Closing....")
+ db.Close()
+
+-print "db = ",db
++print ("db = ",db)
+
+ try:
+- print "Trying to set a directory on a closed file"
++ print ("Trying to set a directory on a closed file")
+ db.SetDir("domain0")
+ except:
+- print " -- Caught error"
++ print (" -- Caught error")
+
+ try:
+- print "Trying to read a variable on a closed file"
++ print ("Trying to read a variable on a closed file")
+ db.SetDir("dtime")
+ except:
+- print " -- Caught error"
++ print (" -- Caught error")
+Index: silo-llnl-4.8/tests/test_read.py
+===================================================================
+--- silo-llnl-4.8.orig/tests/test_read.py 2013-06-11 20:21:50.000000000 +0100
++++ silo-llnl-4.8/tests/test_read.py 2013-06-21 15:59:31.000000000 +0100
+@@ -47,6 +47,7 @@
+ # reflect those of the United States Government or Lawrence Livermore
+ # National Security, LLC, and shall not be used for advertising or
+ # product endorsement purposes.
++from __future__ import print_function
+ import os
+ import Silo
+
+@@ -57,31 +58,31 @@
+ file = "multi_ucd3d.h5"
+
+ db = Silo.Open(file)
+-print "db = ",db
+-print "db.filename = '%s'"%db.filename
++print ("db = ",db)
++print ("db.filename = '%s'"%db.filename)
+
+ toc = db.GetToc()
+-print "\n-- TOC --\n",toc
++print ("\n-- TOC --\n",toc)
+
+-print "cycle='%d'"%db.GetVar("cycle")
+-print "dtime='%f'"%db.GetVar("dtime")
+-print "_fileinfo='%s'"%db.GetVar("_fileinfo")
+-print "d_vartypes=",db.GetVar("d_vartypes")
+-print "d_varnames=",db.GetVar("d_varnames")
++print ("cycle='%d'"%db.GetVar("cycle"))
++print ("dtime='%f'"%db.GetVar("dtime"))
++print ("_fileinfo='%s'"%db.GetVar("_fileinfo"))
++print ("d_vartypes=",db.GetVar("d_vartypes"))
++print ("d_varnames=",db.GetVar("d_varnames"))
+
+ db.SetDir("block0")
+ toc = db.GetToc()
+-print "mesh1_coord0=",db.GetVar("mesh1_coord0")[1:10]
+-print "v_data=",db.GetVar("v_data")[1:10]
++print ("mesh1_coord0=",db.GetVar("mesh1_coord0")[1:10])
++print ("v_data=",db.GetVar("v_data")[1:10])
+
+ db.SetDir("../block7")
+ toc = db.GetToc()
+-print "mesh1_coord0=",db.GetVar("mesh1_coord0")[1:10]
+-print "v_data=",db.GetVar("v_data")[1:10]
++print ("mesh1_coord0=",db.GetVar("mesh1_coord0")[1:10])
++print ("v_data=",db.GetVar("v_data")[1:10])
+
+ db.Close()
+
+-print "\n"
++print ("\n")
+
+ # ---- file 2 ----
+ if os.access("multi_rect3d.pdb",os.R_OK):
+@@ -90,23 +91,23 @@
+ file = "multi_rect3d.h5"
+
+ db = Silo.Open(file)
+-print "db = ",db
++print ("db = ",db)
+
+ toc = db.GetToc()
+-print "\n-- TOC --\n",toc
++print ("i\n-- TOC --\n",toc)
+
+-print "cycle='%d'"%db.GetVar("cycle")
+-print "time='%f'"%db.GetVar("time")
+-print "_fileinfo='%s'"%db.GetVar("_fileinfo")
+-print "defvars_defns='%s'"%db.GetVar("defvars_defns")
++print ("cycle='%d'"%db.GetVar("cycle"))
++print ("time='%f'"%db.GetVar("time"))
++print ("_fileinfo='%s'"%db.GetVar("_fileinfo"))
++print ("defvars_defns='%s'"%db.GetVar("defvars_defns"))
+
+ db.SetDir("block0")
+ toc = db.GetToc()
+-print "mesh1_coord0=",db.GetVar("mesh1_coord0")
++print ("mesh1_coord0=",db.GetVar("mesh1_coord0"))
+
+ db.SetDir("/block7")
+ toc = db.GetToc()
+-print "mesh1_coord0=",db.GetVar("mesh1_coord0")
++print ("mesh1_coord0=",db.GetVar("mesh1_coord0"))
+
+ db.SetDir("/")
+ toc = db.GetToc()
+Index: silo-llnl-4.8/tests/test_write.py
+===================================================================
+--- silo-llnl-4.8.orig/tests/test_write.py 2013-06-21 15:27:27.000000000 +0100
++++ silo-llnl-4.8/tests/test_write.py 2013-06-21 15:55:30.000000000 +0100
+@@ -47,6 +47,7 @@
+ # reflect those of the United States Government or Lawrence Livermore
+ # National Security, LLC, and shall not be used for advertising or
+ # product endorsement purposes.
++from __future__ import silo
+ import Silo
+
+ db = Silo.Create("foo.silo", "test file")
+@@ -70,11 +71,11 @@
+ db.Close()
+
+ db2=Silo.Open("foo.silo")
+-print "toc=%s"%db2.GetToc()
+-print "t2='%s'"%db2.GetVar("t2")
+-print "#t6= (1.2, 10.199999999999999)"
+-print "a/t8='%s'"%db2.GetVar("a/t8")
++print ("toc=%s"%db2.GetToc())
++print ("t2='%s'"%db2.GetVar("t2"))
++print ("#t6= (1.2, 10.199999999999999)")
++print ("a/t8='%s'"%db2.GetVar("a/t8")_)
+ db2.SetDir("a")
+-print "t9=%s"%db2.GetVar("t9")
+-print "#/t5= (1.2, 10.0)"
++print ("t9=%s"%db2.GetVar("t9"))
++print ("#/t5= (1.2, 10.0)")
+ db2.Close()
+Index: silo-llnl-4.8/tools/python/pydbtoc.cpp
+===================================================================
+--- silo-llnl-4.8.orig/tools/python/pydbtoc.cpp 2013-06-21 15:27:27.000000000 +0100
++++ silo-llnl-4.8/tools/python/pydbtoc.cpp 2013-06-21 17:33:15.000000000 +0100
+@@ -48,6 +48,12 @@
+ // National Security, LLC, and shall not be used for advertising or
+ // product endorsement purposes.
+
++#if PY_MAJOR_VERSION >= 3
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8String
++#define PyString_FromString
++#endif
++
+ #include "pydbtoc.h"
+
+ // ****************************************************************************
diff --git a/debian/patches/series b/debian/patches/series
index a41f445..922043c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ version-script.patch
autoreconf.patch
security-fix.patch
spell.patch
+python3.patch
diff --git a/debian/rules b/debian/rules
index 8fe8ba0..1b3b075 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install
# move the python modules to where dh_pysupport will spot them ...
- set -e; for p in $(PYVERS); do \
+ set -e; for p in $(PYVERS) $(PY3VERS); do \
mkdir -p debian/python-silo/usr/lib/$$p/site-packages ; \
chrpath -d debian/Silo.so.$$p ; \
cp debian/Silo.so.$$p debian/python-silo/usr/lib/$$p/site-packages/Silo.so ; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list