[adios] 174/207: Prep for release, with python3 fixes
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit 55e8c531088609e232e6f7d0c3478663277c302c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 16 18:20:55 2014 +0100
Prep for release, with python3 fixes
---
debian/changelog | 11 +++---
debian/patches/python3.patch | 92 +++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 96 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eba5859..79445cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-adios (1.7.0-1) UNRELEASED; urgency=medium
+adios (1.7.0-1) unstable; urgency=medium
* New upstream release.
+ * Add adios.pc pkgconfig file. adios_config now uses this.
- -- Alastair McKinstry <mckinstry at debian.org> Fri, 13 Jun 2014 23:06:38 +0100
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 16 Jun 2014 23:06:38 +0100
adios (1.6.0-7) unstable; urgency=medium
- * Use python3-all-dev to build on all python3 versions.
+ * Use python3-all-dev to build on all python3 versions.
-- Alastair McKinstry <mckinstry at debian.org> Fri, 23 May 2014 03:02:48 +0100
@@ -18,11 +19,11 @@ adios (1.6.0-6) unstable; urgency=medium
adios (1.6.0-5) unstable; urgency=medium
- * Don't depend on infiniband on hurd, kfreebsd-*
+ * Don't depend on infiniband on hurd, kfreebsd-*
* Build with serial HDF5 by default; building with mpicc.openmpi collides
with mpipublic.h internally.
* Prime CMakeCache.txt with PYTHON_MPI4PY_INCLUDE_DIR so it is found
- on all archs to fix FTBFS.
+ on all archs to fix FTBFS.
* Add initial bash_completion.d completions.
-- Alastair McKinstry <mckinstry at debian.org> Thu, 22 May 2014 07:02:04 +0100
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 830e6d8..e5af217 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -227,10 +227,30 @@ Index: adios-1.7.0/utils/skel/lib/skel_makefile.py
#!/usr/bin/env python
+# from __future__ import absolute_import, division, print_function, unicode_literals
-+from __future__ import print_function
++from __future__ import print_function, unicode_literals
import argparse
import os
import sys
+@@ -38,7 +40,7 @@ def generate_makefiles_with_args (parent
+ try:
+ config = adios.adiosConfig (args.project + '_skel.xml')
+ except (IOError):
+- print "XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first."
++ print ("XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first.")
+ return 1
+
+
+@@ -49,8 +51,8 @@ def generate_makefiles_with_args (parent
+ try:
+ params = skelconf.skelConfig (args.project + '_params.xml')
+ except (IOError):
+- print "Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,"
+- print "then check that " + args.project + "_params.xml exists."
++ print("Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,")
++ print("then check that " + args.project + "_params.xml exists.")
+ return
+
+ generate_makefiles (params, config)
@@ -201,10 +203,10 @@ def main(argv=None):
lang = config.get_host_language ()
@@ -254,7 +274,21 @@ Index: adios-1.7.0/utils/skel/lib/skel_params.py
import sys
import os
import argparse
-@@ -43,7 +44,7 @@ def generate_param_file_with_args (paren
+@@ -31,11 +32,11 @@ def pparse_command_line (parent_parser):
+
+ def generate_param_file_with_args (parent_parser):
+ args = pparse_command_line (parent_parser)
+-
++
+ try:
+ config = adios.adiosConfig (args.project + '_skel.xml')
+ except (IOError):
+- print "XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first."
++ print("XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first.")
+ return 1
+
+
+@@ -43,13 +44,13 @@ def generate_param_file_with_args (paren
# Only proceed if outfilename does not already exist, or if -f was used
if os.path.exists (outfilename) and not args.force:
@@ -263,6 +297,13 @@ Index: adios-1.7.0/utils/skel/lib/skel_params.py
return 999
try:
+ config = adios.adiosConfig (args.project + '_skel.xml')
+ except (IOError):
+- print "Error reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first."
++ print( "Error reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first.")
+ return 1
+
+ generate_param_file (args.project, outfilename, config, args.group, args.bpls)
@@ -60,7 +61,7 @@ def generate_param_file (app, outfile, c
param_file = open (outfile, 'w')
@@ -431,6 +472,44 @@ Index: adios-1.7.0/utils/skel/lib/skel_source.py
frees.add ('\nfree (' + v.get_gwrite() + ');')
for f in frees:
+@@ -683,7 +684,7 @@ def create_source_from_yaml (args, confi
+
+ # Only proceed if outfilename does not already exist, or if -f was used
+ if os.path.exists (outfilename) and not args.force:
+- print "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename
++ print( "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename)
+ return 999
+
+ skel_file = open (outfilename, 'w')
+@@ -707,7 +708,7 @@ def create_sources_with_args (parent_par
+ try:
+ config = adios.adiosConfig (args.project + '_skel.xml')
+ except (IOError):
+- print "XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first."
++ print( "XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first.")
+ return 1
+
+
+@@ -715,7 +716,7 @@ def create_sources_with_args (parent_par
+ create_source_from_yaml(args, config)
+ else:
+ if args.noxml:
+- print "NOXML generation only supported with yaml input. Generating XML based code."
++ print( "NOXML generation only supported with yaml input. Generating XML based code.")
+ create_source_from_xml (args, config)
+
+
+@@ -724,8 +725,8 @@ def create_source_from_xml (args, config
+ try:
+ params = skelconf.skelConfig (args.project + '_params.xml')
+ except (IOError):
+- print "Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,"
+- print "then check that " + args.project + "_params.xml exists."
++ print( "Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,")
++ print("then check that " + args.project + "_params.xml exists.")
+ return
+
+ # Determine the target language
Index: adios-1.7.0/utils/skel/lib/skel_submit.py
===================================================================
--- adios-1.7.0.orig/utils/skel/lib/skel_submit.py
@@ -451,6 +530,15 @@ Index: adios-1.7.0/utils/skel/lib/skel_submit.py
return 999
skel_file = open (outfilename, 'w')
+@@ -154,7 +154,7 @@ def generate_submit_scripts_with_args (p
+ try:
+ config = adios.adiosConfig (args.project + '_skel.xml')
+ except (IOError):
+- print "XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first."
++ print( "XXError reading " + args.project + "_skel.xml. Try running skel xml " + args.project + " first.")
+ return 1
+
+
@@ -164,8 +164,8 @@ def generate_submit_scripts_with_args (p
try:
params = skelconf.skelConfig (args.project + '_params.xml')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list