[adios] 72/207: refresh
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:38 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 f69ee84eed063096bfcc20c92031bc7520ef11d3
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Dec 9 20:02:59 2013 +0000
refresh
---
debian/patches/python3.patch | 120 ++++++++++++++++++++++++-------------------
1 file changed, 66 insertions(+), 54 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index e68b277..f1fec3a 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: Make the python code python2-3 agnostic.
Last-Updated:2013-12-09
Forwarded: no
-Index: adios.git/utils/skel/bin/skel
+Index: adios-1.5.0/utils/skel/bin/skel
===================================================================
---- adios.git.orig/utils/skel/bin/skel 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/bin/skel 2013-12-09 18:45:13.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/bin/skel 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/bin/skel 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -44,10 +44,10 @@ Index: adios.git/utils/skel/bin/skel
if __name__ == "__main__":
-Index: adios.git/utils/skel/bin/skel_extract.py
+Index: adios-1.5.0/utils/skel/bin/skel_extract.py
===================================================================
---- adios.git.orig/utils/skel/bin/skel_extract.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/bin/skel_extract.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/bin/skel_extract.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/bin/skel_extract.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -64,10 +64,10 @@ Index: adios.git/utils/skel/bin/skel_extract.py
return
#Print the header
-Index: adios.git/utils/skel/lib/skelconf.py
+Index: adios-1.5.0/utils/skel/lib/skelconf.py
===================================================================
---- adios.git.orig/utils/skel/lib/skelconf.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skelconf.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skelconf.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skelconf.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -84,10 +84,10 @@ Index: adios.git/utils/skel/lib/skelconf.py
raise SystemExit
self.config_node = nodes[0]
-Index: adios.git/utils/gpp/ad_config.py
+Index: adios-1.5.0/utils/gpp/ad_config.py
===================================================================
---- adios.git.orig/utils/gpp/ad_config.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/gpp/ad_config.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/gpp/ad_config.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/gpp/ad_config.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -129,10 +129,10 @@ Index: adios.git/utils/gpp/ad_config.py
cleandims = []
for d in dims:
-Index: adios.git/utils/gpp/gpp.py
+Index: adios-1.5.0/utils/gpp/gpp.py
===================================================================
---- adios.git.orig/utils/gpp/gpp.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/gpp/gpp.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/gpp/gpp.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/gpp/gpp.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -171,10 +171,10 @@ Index: adios.git/utils/gpp/gpp.py
raise SystemExit
-Index: adios.git/utils/skel/lib/adios.py
+Index: adios-1.5.0/utils/skel/lib/adios.py
===================================================================
---- adios.git.orig/utils/skel/lib/adios.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/adios.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/adios.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/adios.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import print_function
import xml.dom.minidom
@@ -209,10 +209,10 @@ Index: adios.git/utils/skel/lib/adios.py
cleandims = []
for d in dims:
-Index: adios.git/utils/skel/lib/argparse.py
+Index: adios-1.5.0/utils/skel/lib/argparse.py
===================================================================
---- adios.git.orig/utils/skel/lib/argparse.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/argparse.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/argparse.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/argparse.py 2013-12-09 19:59:55.000000000 +0000
@@ -81,7 +81,6 @@
'ZERO_OR_MORE',
]
@@ -221,10 +221,10 @@ Index: adios.git/utils/skel/lib/argparse.py
import copy as _copy
import os as _os
import re as _re
-Index: adios.git/utils/skel/lib/skel_install.py
+Index: adios-1.5.0/utils/skel/lib/skel_install.py
===================================================================
---- adios.git.orig/utils/skel/lib/skel_install.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_install.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_install.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_install.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -232,10 +232,10 @@ Index: adios.git/utils/skel/lib/skel_install.py
import skel_settings
def main(argv=None):
-Index: adios.git/utils/skel/lib/skel_makefile.py
+Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
===================================================================
---- adios.git.orig/utils/skel/lib/skel_makefile.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_makefile.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_makefile.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -257,20 +257,20 @@ Index: adios.git/utils/skel/lib/skel_makefile.py
generate_makefiles_fortran (params)
-Index: adios.git/utils/skel/lib/skel_params.py
+Index: adios-1.5.0/utils/skel/lib/skel_params.py
===================================================================
---- adios.git.orig/utils/skel/lib/skel_params.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_params.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_params.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_params.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
import sys
import os
import argparse
-Index: adios.git/utils/skel/lib/skel_settings.py
+Index: adios-1.5.0/utils/skel/lib/skel_settings.py
===================================================================
---- adios.git.orig/utils/skel/lib/skel_settings.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_settings.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_settings.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_settings.py 2013-12-09 19:59:55.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -298,10 +298,10 @@ Index: adios.git/utils/skel/lib/skel_settings.py
def main(argv=None):
-Index: adios.git/utils/skel/lib/skel_source.py
+Index: adios-1.5.0/utils/skel/lib/skel_source.py
===================================================================
---- adios.git.orig/utils/skel/lib/skel_source.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_source.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_source.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_source.py 2013-12-09 20:01:16.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -338,6 +338,18 @@ Index: adios.git/utils/skel/lib/skel_source.py
c_file.write (adios.cFormatter.get_initialization (v, params.get_group (g.get_name() ) ) )
if measure.use_sleep_before_open():
+@@ -197,9 +198,9 @@
+
+
+ if measure.use_adios_timing():
+- print "Use adios timing"
++ print("Use adios timing")
+ else:
+- print "Don't use adios timing"
++ print("Don't use adios timing")
+
+
+ # Detailed reporting disabled, use adios timing instead.
@@ -230,7 +231,7 @@
# free the array memory
c_file.write ('\n\n// Free the arrays')
@@ -417,10 +429,10 @@ Index: adios.git/utils/skel/lib/skel_source.py
frees.add ('\nfree (' + v.get_gwrite() + ');')
for f in frees:
-Index: adios.git/utils/skel/lib/skel_submit.py
+Index: adios-1.5.0/utils/skel/lib/skel_submit.py
===================================================================
---- adios.git.orig/utils/skel/lib/skel_submit.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_submit.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_submit.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_submit.py 2013-12-09 19:59:56.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -428,10 +440,10 @@ Index: adios.git/utils/skel/lib/skel_submit.py
import argparse
import os
-Index: adios.git/utils/skel/lib/skel_xml.py
+Index: adios-1.5.0/utils/skel/lib/skel_xml.py
===================================================================
---- adios.git.orig/utils/skel/lib/skel_xml.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_xml.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_xml.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_xml.py 2013-12-09 19:59:56.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -439,20 +451,20 @@ Index: adios.git/utils/skel/lib/skel_xml.py
import argparse
import xml.dom.minidom
-Index: adios.git/wrappers/numpy/example/ncdf2bp.py
+Index: adios-1.5.0/wrappers/numpy/example/ncdf2bp.py
===================================================================
---- adios.git.orig/wrappers/numpy/example/ncdf2bp.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/wrappers/numpy/example/ncdf2bp.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/example/ncdf2bp.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/example/ncdf2bp.py 2013-12-09 19:59:56.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
from adios import *
from scipy.io import netcdf
import numpy as np
-Index: adios.git/wrappers/numpy/test/adios_noxml_test.py
+Index: adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py
===================================================================
---- adios.git.orig/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 19:59:57.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -468,10 +480,10 @@ Index: adios.git/wrappers/numpy/test/adios_noxml_test.py
set_group_size(fd, groupsize)
write_int(fd, "NX", NX)
write_int(fd, "size", size)
-Index: adios.git/wrappers/numpy/test/adios_read_test.py
+Index: adios-1.5.0/wrappers/numpy/test/adios_read_test.py
===================================================================
---- adios.git.orig/wrappers/numpy/test/adios_read_test.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/wrappers/numpy/test/adios_read_test.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_read_test.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_read_test.py 2013-12-09 19:59:57.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
@@ -486,10 +498,10 @@ Index: adios.git/wrappers/numpy/test/adios_read_test.py
+print(v.read())
f.close()
-Index: adios.git/wrappers/numpy/test/adios_write_test.py
+Index: adios-1.5.0/wrappers/numpy/test/adios_write_test.py
===================================================================
---- adios.git.orig/wrappers/numpy/test/adios_write_test.py 2013-12-09 18:45:14.000000000 +0000
-+++ adios.git/wrappers/numpy/test/adios_write_test.py 2013-12-09 18:45:14.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_write_test.py 2013-12-09 19:59:57.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_write_test.py 2013-12-09 19:59:57.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
--
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