[python-escript] 01/02: Use python3.5
Anton Gladky
gladk at moszumanska.debian.org
Mon May 16 19:16:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch debian
in repository python-escript.
commit dac28e21516d395f302b10529ad76e977d643696
Author: Anton Gladky <gladk at debian.org>
Date: Mon May 16 21:07:36 2016 +0200
Use python3.5
---
debian/patches/dateless-gz | 23 ------------
debian/patches/doxygenfix | 19 ----------
debian/patches/grammar-errors | 36 -------------------
debian/patches/mpi-gaol | 33 -----------------
debian/patches/release-sanity | 69 ------------------------------------
debian/patches/relocating-debian-dir | 24 -------------
debian/patches/series | 7 +---
7 files changed, 1 insertion(+), 210 deletions(-)
diff --git a/debian/patches/dateless-gz b/debian/patches/dateless-gz
deleted file mode 100644
index 1fd9fc4..0000000
--- a/debian/patches/dateless-gz
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Prevent gzip of examples from including timestamps.
- Addresses lintian warning.
-Author: Joel Fenwick <joelfenwick at uq.edu.au>
-Forwarded: yes
-Applied-Upstream: yes
-
---- a/doc/SConscript
-+++ b/doc/SConscript
-@@ -199,9 +199,11 @@ zip_path=os.path.join(release_dir, 'escr
- zip = local_env.Command(zip_path, None, dir_cmd+"zip "+zip_path+" "+" ".join(ex2))
- env.Alias('examples_zipfile', zip)
-
--tar_path=os.path.join(release_dir, 'escript_examples.tar.gz')
--tar = local_env.Command(tar_path, None, dir_cmd+"tar -czf "+tar_path+" "+" ".join(ex2))
--env.Alias('examples_tarfile', tar)
-+tar_path=os.path.join(release_dir, 'escript_examples.tar')
-+targz_path=os.path.join(release_dir, 'escript_examples.tar.gz')
-+tar = local_env.Command(tar_path, None, dir_cmd+"tar -cf "+tar_path+" "+" ".join(ex2))
-+targz = local_env.Command(targz_path, tar, "gzip -n -9 "+tar_path)
-+env.Alias('examples_tarfile', targz)
-
- #env=Environment(TARFLAGS = "-c -z",chdir=src_dir)
- #if 'Tar' in dir(env):
diff --git a/debian/patches/doxygenfix b/debian/patches/doxygenfix
deleted file mode 100644
index 000ce5b..0000000
--- a/debian/patches/doxygenfix
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Don't specify a font in doxygen.
- The doxyfile specified a font which is no longer shipped.
- Since we don't really care which font is used this has been
- removed.
-Author: Joel Fenwick <joelfenwick at uq.edu.au>
-Forwarded: yes
-Applied-Upstream: yes
-
---- a/doc/doxygen/doxygen_esys
-+++ b/doc/doxygen/doxygen_esys
-@@ -2120,7 +2120,7 @@ DOT_NUM_THREADS = 0
- # The default value is: Helvetica.
- # This tag requires that the tag HAVE_DOT is set to YES.
-
--DOT_FONTNAME = FreeSans
-+#DOT_FONTNAME = FreeSans
-
- # The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
- # dot graphs.
diff --git a/debian/patches/grammar-errors b/debian/patches/grammar-errors
deleted file mode 100644
index a951803..0000000
--- a/debian/patches/grammar-errors
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fixed some grammar errors.
-Author: Joel Fenwick <joelfenwick at uq.edu.au>
-Forwarded: yes
-Applied-Upstream: yes
-
---- a/escriptcore/py_src/rheologies.py
-+++ b/escriptcore/py_src/rheologies.py
-@@ -60,7 +60,7 @@ class PowerLaw(object):
-
- :param numMaterials: number of materials
- :type numMaterials: ``int``
-- :param verbose: if ``True`` some informations are printed.
-+ :param verbose: if ``True`` some information is printed.
- :type verbose: ``bool``
- """
- if numMaterials<1:
-@@ -623,7 +623,7 @@ class IncompressibleIsotropicFlowCartesi
- :type t: ``float``
- :param numMaterials: number of materials
- :type numMaterials: ``int``
-- :param verbose: if ``True`` some informations are printed.
-+ :param verbose: if ``True`` some information is printed.
- :type verbose: ``bool``
- """
- PowerLaw. __init__(self, numMaterials,verbose=verbose)
---- a/escriptcore/src/escriptcpp.cpp
-+++ b/escriptcore/src/escriptcpp.cpp
-@@ -1017,7 +1017,7 @@ args("source", "q", "r","factor"),
- "'residual_norm', 'converged'.\n"
- ":param value: new value of the diagnostic information\n"
- ":note: this function is used by a solver to report diagnostics\n"
-- "informations.")
-+ "information.")
- .def("getDiagnostics", &escript::SolverBuddy::getDiagnostics, args("name"),"Returns the diagnostic information ``name``. Possible values are:\n\n"
- "- 'num_iter': the number of iteration steps\n"
- "- 'cum_num_iter': the cumulative number of iteration steps\n"
diff --git a/debian/patches/mpi-gaol b/debian/patches/mpi-gaol
deleted file mode 100644
index 49b426c..0000000
--- a/debian/patches/mpi-gaol
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Enable escript launcher to run in a gaol.
-Author: Joel Fenwick <joelfenwick at uq.edu.au>
-Forwarded: yes
-Applied-Upstream: yes
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -370,7 +370,7 @@ if env['launcher'] == 'default':
- if env['mpi'] == 'INTELMPI':
- env['launcher'] = "mpirun -hostfile %f -n %N -ppn %p %b"
- elif env['mpi'] == 'OPENMPI':
-- env['launcher'] = "mpirun --gmca mpi_warn_on_fork 0 ${EE} --host %h -bynode -bind-to-core --cpus-per-rank %t -np %N %b"
-+ env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} --host %h -bynode -bind-to-core --cpus-per-rank %t -np %N %b"
- elif env['mpi'] == 'MPT':
- env['launcher'] = "mpirun %h -np %p %b"
- elif env['mpi'] == 'MPICH':
---- a/run-escript.in
-+++ b/run-escript.in
-@@ -467,6 +467,14 @@ then
- EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"
- fi
-
-+if [ "$MPI_FLAVOUR" = "OPENMPI" ]
-+then
-+ if [ -z `which rsh``which ssh` ]
-+ then
-+ AGENTOVERRIDE="--gmca orte_rsh_agent /bin/false"
-+ fi
-+fi
-+
- vlog "Pre-launch command: \"@@PRELAUNCH\""
- @@PRELAUNCH
- vlog "Launch command: \"@@LAUNCH\""
diff --git a/debian/patches/release-sanity b/debian/patches/release-sanity
deleted file mode 100644
index 336c17c..0000000
--- a/debian/patches/release-sanity
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Added a basic sanity check to the scons file.
-Author: Joel Fenwick <joelfenwick at uq.edu.au>
-Forwarded: yes
-Applied-Upstream: yes
---- a/SConstruct
-+++ b/SConstruct
-@@ -683,10 +683,30 @@ install_all_list += ['install_modellib_p
- install_all_list += ['install_pycad_py']
- if env['usempi']:
- install_all_list += ['install_pythonMPI', 'install_overlord']
--env.Alias('install_all', install_all_list)
-+install_all_list += ['install_weipa_py']
-+install_all_list += [env.Install(os.path.join(env['build_dir'],'scripts'), os.path.join('scripts', 'release_sanity.py'))]
-+install_all=env.Alias('install_all', install_all_list)
-
- # Default target is install
--env.Default('install_all')
-+#env.Default('install_all')
-+
-+
-+sanity=env.Alias('sanity', env.Command('dummy','',os.path.join(env['prefix'], 'bin', 'run-escript')+' '+os.path.join(env['build_dir'],'scripts', 'release_sanity.py')))
-+env.Depends('dummy', install_all)
-+if env['usempi']:
-+ #env.Requires('dummy', ['build_pythonMPI', 'install_pythonMPI'])
-+ #env.Requires('dummy', env['prefix']+"/lib/pythonMPI")
-+ env.Depends('dummy', ['build_pythonMPI', 'install_pythonMPI'])
-+ env.Depends('dummy', env['prefix']+"/lib/pythonMPI")
-+
-+if 'install_dudley' in install_all_list and \
-+ 'install_finley' in install_all_list and \
-+ 'install_ripley' in install_all_list and \
-+ 'install_speckley' in install_all_list:
-+ env.AlwaysBuild('sanity')
-+ env.Default('sanity')
-+else:
-+ env.Default('install_all')
-
- ################## Targets to build and run the test suite ###################
-
---- /dev/null
-+++ b/scripts/release_sanity.py
-@@ -0,0 +1,27 @@
-+
-+# Very basic sanity checks following a build
-+# It is important that this script does not create any files unless
-+# it is _certain_ they are removed when finished or failed.
-+# We do not want the source directory polluted by actions here
-+
-+
-+from esys.escript import *
-+from esys.escript.linearPDEs import Poisson
-+import esys.ripley as ripley
-+import esys.finley as finley
-+import esys.speckley as speckley
-+from esys.weipa import saveVTK
-+
-+mydomain = finley.Rectangle(l0=1.,l1=1.,n0=40, n1=20)
-+# define characteristic function of Gamma^D
-+x = mydomain.getX()
-+gammaD = whereZero(x[0])+whereZero(x[1])
-+# define PDE and get its solution u
-+mypde = Poisson(domain=mydomain)
-+mypde.setValue(f=1,q=gammaD)
-+u = mypde.getSolution()
-+# write u to an external file
-+#saveVTK("u.vtu",sol=u)
-+
-+
-+
diff --git a/debian/patches/relocating-debian-dir b/debian/patches/relocating-debian-dir
deleted file mode 100644
index d1e19e1..0000000
--- a/debian/patches/relocating-debian-dir
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Changes to some maint scripts to account for debian/ moving.
- This does not directly affect debian builds because that directory
- is removed anyway. But it allows the source to be kept in synch.
-Author: Joel Fenwick <joelfenwick at uq.edu.au>
-Forwarded: yes
-Applied-Upstream: yes
-
---- a/scripts/extracttests.sh
-+++ b/scripts/extracttests.sh
-@@ -55,4 +55,4 @@ find . -name 'src' | xargs rm -r
- rm -r scons
- rm -r doc/user doc/cookbook
- find doc -name '*.tex' | xargs rm
--rm -rf debian
-+rm -rf localdebian
---- a/scripts/makesrc.sh
-+++ b/scripts/makesrc.sh
-@@ -13,5 +13,5 @@ then
- fi
- svnversion > svn_version
-
--tar -czf ../python-escript_$SRCVERSION.orig.tar.gz --exclude-vcs --exclude=debian --exclude=scons/*options.py *
-+tar -czf ../python-escript_$SRCVERSION.orig.tar.gz --exclude-vcs --exclude=debian --exclude=localdebian --exclude=scons/*options.py *
-
diff --git a/debian/patches/series b/debian/patches/series
index 5593ba5..67d7345 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-#release-sanity
-#mpi-gaol
-#grammar-errors
-#relocating-debian-dir
-#doxygenfix
-#dateless-gz
+10_use_python35.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-escript.git
More information about the debian-science-commits
mailing list