[adios] 61/207: refresh for 1.5.0
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:37 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 27c49f5d51a88e6c37bf483941484067a6c329d0
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Dec 9 15:47:49 2013 +0000
refresh for 1.5.0
---
debian/patches/python3.patch | 147 ++++++++++++++++++++-----------------------
1 file changed, 68 insertions(+), 79 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index d2b786b..69bf1f3 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Make the python code python2-3 agnostic.
-Last-Updated:2013-10-25
+Last-Updated:2013-12-09
Forwarded: no
-Index: adios-1.4.1/utils/skel/bin/skel
+Index: adios-1.5.0/utils/skel/bin/skel
===================================================================
---- adios-1.4.1.orig/utils/skel/bin/skel 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/bin/skel 2013-10-24 14:22:33.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/bin/skel 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/bin/skel 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -44,10 +44,10 @@ Index: adios-1.4.1/utils/skel/bin/skel
if __name__ == "__main__":
-Index: adios-1.4.1/utils/skel/bin/skel_extract.py
+Index: adios-1.5.0/utils/skel/bin/skel_extract.py
===================================================================
---- adios-1.4.1.orig/utils/skel/bin/skel_extract.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/bin/skel_extract.py 2013-10-24 14:28:42.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/bin/skel_extract.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/bin/skel_extract.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -55,7 +55,7 @@ Index: adios-1.4.1/utils/skel/bin/skel_extract.py
import argparse
import xml.dom.minidom
import sys
-@@ -45,7 +46,7 @@
+@@ -46,7 +47,7 @@
# check the selected fields
for field in selected_fields:
if not field in keys:
@@ -64,18 +64,18 @@ Index: adios-1.4.1/utils/skel/bin/skel_extract.py
return
#Print the header
-Index: adios-1.4.1/utils/skel/lib/skelconf.py
+Index: adios-1.5.0/utils/skel/lib/skelconf.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skelconf.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skelconf.py 2013-10-24 14:28:28.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skelconf.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skelconf.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
-
import skel_settings
+ import skel_have_adios_timing
-
-@@ -9,7 +9,7 @@
+@@ -10,7 +10,7 @@
nodes = doc.childNodes
if (nodes.length != 1):
@@ -84,19 +84,19 @@ Index: adios-1.4.1/utils/skel/lib/skelconf.py
raise SystemExit
self.config_node = nodes[0]
-Index: adios-1.4.1/utils/gpp/ad_config.py
+Index: adios-1.5.0/utils/gpp/ad_config.py
===================================================================
---- adios-1.4.1.orig/utils/gpp/ad_config.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/gpp/ad_config.py 2013-10-24 14:37:04.000000000 +0100
+--- adios-1.5.0.orig/utils/gpp/ad_config.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/gpp/ad_config.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
import type_mapper
-Index: adios-1.4.1/utils/gpp/gpp.py
+Index: adios-1.5.0/utils/gpp/gpp.py
===================================================================
---- adios-1.4.1.orig/utils/gpp/gpp.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/gpp/gpp.py 2013-10-24 14:36:54.000000000 +0100
+--- adios-1.5.0.orig/utils/gpp/gpp.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/gpp/gpp.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -104,10 +104,10 @@ Index: adios-1.4.1/utils/gpp/gpp.py
import sys
import os
-Index: adios-1.4.1/utils/skel/lib/adios.py
+Index: adios-1.5.0/utils/skel/lib/adios.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/adios.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/adios.py 2013-10-24 17:40:35.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/adios.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/adios.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import print_function
import xml.dom.minidom
@@ -142,10 +142,10 @@ Index: adios-1.4.1/utils/skel/lib/adios.py
cleandims = []
for d in dims:
-Index: adios-1.4.1/utils/skel/lib/argparse.py
+Index: adios-1.5.0/utils/skel/lib/argparse.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/argparse.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/argparse.py 2013-10-24 17:37:47.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/argparse.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/argparse.py 2013-12-09 15:26:24.000000000 +0000
@@ -81,7 +81,6 @@
'ZERO_OR_MORE',
]
@@ -154,21 +154,10 @@ Index: adios-1.4.1/utils/skel/lib/argparse.py
import copy as _copy
import os as _os
import re as _re
-Index: adios-1.4.1/utils/skel/lib/skel_cat.py
-===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_cat.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_cat.py 2013-10-24 14:34:48.000000000 +0100
-@@ -1,5 +1,5 @@
- #!/usr/bin/env python
--
-+from __future__ import absolute_import, division, print_function, unicode_literals
- import argparse
- import os
- import os.path
-Index: adios-1.4.1/utils/skel/lib/skel_install.py
+Index: adios-1.5.0/utils/skel/lib/skel_install.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_install.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_install.py 2013-10-24 14:34:11.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skel_install.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_install.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -176,10 +165,10 @@ Index: adios-1.4.1/utils/skel/lib/skel_install.py
import skel_settings
def main(argv=None):
-Index: adios-1.4.1/utils/skel/lib/skel_makefile.py
+Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_makefile.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_makefile.py 2013-10-24 15:03:13.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_makefile.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -201,20 +190,20 @@ Index: adios-1.4.1/utils/skel/lib/skel_makefile.py
generate_makefiles_fortran (params)
-Index: adios-1.4.1/utils/skel/lib/skel_params.py
+Index: adios-1.5.0/utils/skel/lib/skel_params.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_params.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_params.py 2013-10-24 14:33:23.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skel_params.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_params.py 2013-12-09 15:26:24.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-1.4.1/utils/skel/lib/skel_settings.py
+Index: adios-1.5.0/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_settings.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_settings.py 2013-10-24 15:04:44.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skel_settings.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_settings.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -233,7 +222,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_settings.py
continue
self.settings_dict[split_line[0]] = split_line[1]
-@@ -53,7 +53,7 @@
+@@ -55,7 +55,7 @@
if not os.path.exists (skel_settings_dir_name):
bindir = os.path.dirname (sys.argv[0])
shutil.copytree (bindir + '/../etc/skel', skel_settings_dir_name)
@@ -242,17 +231,17 @@ Index: adios-1.4.1/utils/skel/lib/skel_settings.py
def main(argv=None):
-Index: adios-1.4.1/utils/skel/lib/skel_source.py
+Index: adios-1.5.0/utils/skel/lib/skel_source.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_source.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_source.py 2013-10-24 15:10:36.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skel_source.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_source.py 2013-12-09 15:26:24.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
-@@ -82,25 +83,25 @@
+@@ -83,25 +84,25 @@
# same program var (as is done by genarray)
c_file.write ('\n\n// Scalar declarations')
declarations = set()
@@ -282,7 +271,7 @@ Index: adios-1.4.1/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():
-@@ -213,7 +214,7 @@
+@@ -230,7 +231,7 @@
# free the array memory
c_file.write ('\n\n// Free the arrays')
frees = set()
@@ -291,7 +280,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
frees.add ('\nfree (' + v.get_gwrite() + ');')
for f in frees:
-@@ -290,7 +291,7 @@
+@@ -307,7 +308,7 @@
# same program var (as is done by genarray)
f_file.write ('\n\n! Scalar declarations')
declarations = set()
@@ -300,7 +289,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
declarations.add (adios.fortranFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
for d in declarations:
-@@ -298,7 +299,7 @@
+@@ -315,7 +316,7 @@
f_file.write ('\n\n! Array declarations')
declarations = set()
@@ -309,7 +298,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
declarations.add (adios.fortranFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
for d in declarations:
-@@ -328,13 +329,13 @@
+@@ -345,13 +346,13 @@
# For now, just do the numerical values first, then come back and do the more
# complicated ones. This won't cover something like a depends on b, b depends on c,
# but it will work for the moment
@@ -325,7 +314,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
#split at the spaces, just print the ones where the third element is a number
init_str = adios.fortranFormatter.get_initialization (v, params.get_group (g.get_name() ) )
if not init_str.split (None, 2)[2].isdigit():
-@@ -343,7 +344,7 @@
+@@ -360,7 +361,7 @@
f_file.write ('\n\n! Initialize the arrays')
# And the vector initializations
@@ -334,7 +323,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
f_file.write (adios.fortranFormatter.get_initialization (v, params.get_group (g.get_name() ) ) )
-@@ -527,7 +528,7 @@
+@@ -545,7 +546,7 @@
# same program var (as is done by genarray)
c_file.write ('\n\n// Scalar declarations')
declarations = set()
@@ -343,7 +332,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
declarations.add (adios.cFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
for d in declarations:
-@@ -535,7 +536,7 @@
+@@ -553,7 +554,7 @@
c_file.write ('\n\n// Array declarations')
declarations = set()
@@ -352,7 +341,7 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
declarations.add (adios.cFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
for d in declarations:
-@@ -612,7 +613,7 @@
+@@ -630,7 +631,7 @@
# free the array memory
c_file.write ('\n\n// Free the arrays')
frees = set()
@@ -361,10 +350,10 @@ Index: adios-1.4.1/utils/skel/lib/skel_source.py
frees.add ('\nfree (' + v.get_gwrite() + ');')
for f in frees:
-Index: adios-1.4.1/utils/skel/lib/skel_submit.py
+Index: adios-1.5.0/utils/skel/lib/skel_submit.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_submit.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_submit.py 2013-10-24 14:33:44.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skel_submit.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_submit.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -372,10 +361,10 @@ Index: adios-1.4.1/utils/skel/lib/skel_submit.py
import argparse
import os
-Index: adios-1.4.1/utils/skel/lib/skel_xml.py
+Index: adios-1.5.0/utils/skel/lib/skel_xml.py
===================================================================
---- adios-1.4.1.orig/utils/skel/lib/skel_xml.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/utils/skel/lib/skel_xml.py 2013-10-24 14:36:39.000000000 +0100
+--- adios-1.5.0.orig/utils/skel/lib/skel_xml.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_xml.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -383,20 +372,20 @@ Index: adios-1.4.1/utils/skel/lib/skel_xml.py
import argparse
import xml.dom.minidom
-Index: adios-1.4.1/wrappers/numpy/example/ncdf2bp.py
+Index: adios-1.5.0/wrappers/numpy/example/ncdf2bp.py
===================================================================
---- adios-1.4.1.orig/wrappers/numpy/example/ncdf2bp.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/wrappers/numpy/example/ncdf2bp.py 2013-10-24 14:31:53.000000000 +0100
+--- adios-1.5.0.orig/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:26:24.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-1.4.1/wrappers/numpy/test/adios_noxml_test.py
+Index: adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py
===================================================================
---- adios-1.4.1.orig/wrappers/numpy/test/adios_noxml_test.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/wrappers/numpy/test/adios_noxml_test.py 2013-10-24 15:01:36.000000000 +0100
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -412,10 +401,10 @@ Index: adios-1.4.1/wrappers/numpy/test/adios_noxml_test.py
set_group_size(fd, groupsize)
write_int(fd, "NX", NX)
write_int(fd, "size", size)
-Index: adios-1.4.1/wrappers/numpy/test/adios_read_test.py
+Index: adios-1.5.0/wrappers/numpy/test/adios_read_test.py
===================================================================
---- adios-1.4.1.orig/wrappers/numpy/test/adios_read_test.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/wrappers/numpy/test/adios_read_test.py 2013-10-24 15:01:06.000000000 +0100
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:26:24.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
@@ -430,10 +419,10 @@ Index: adios-1.4.1/wrappers/numpy/test/adios_read_test.py
+print(v.read())
f.close()
-Index: adios-1.4.1/wrappers/numpy/test/adios_write_test.py
+Index: adios-1.5.0/wrappers/numpy/test/adios_write_test.py
===================================================================
---- adios-1.4.1.orig/wrappers/numpy/test/adios_write_test.py 2013-10-24 12:34:17.000000000 +0100
-+++ adios-1.4.1/wrappers/numpy/test/adios_write_test.py 2013-10-24 14:59:45.000000000 +0100
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:26:24.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:26:24.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