[Python-modules-commits] [pywavelets] 07/07: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Tue Mar 14 23:30:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository pywavelets.
commit 69b11821e732d1bb8d9ffefffe3ca618d1a8d79b
Merge: 9f7c303 060c0e5
Author: Daniele Tricoli <eriol at mornie.org>
Date: Wed Mar 15 00:06:57 2017 +0100
merge patched into master
PKG-INFO | 2 +-
PyWavelets.egg-info/PKG-INFO | 2 +-
PyWavelets.egg-info/SOURCES.txt | 3 +
PyWavelets.egg-info/requires.txt | 2 +-
debian/.git-dpm | 6 +-
debian/patches/01-get_version_from_source.patch | 2 +-
debian/patches/02-remove_privacy_offenders.patch | 2 +-
.../do_not_rewrite_git_revision_on_build.patch | 4 +-
demo/wp_scalogram.py | 3 +-
doc/release/0.5.2-notes.rst | 52 +
doc/source/release.0.5.2.rst | 1 +
doc/source/releasenotes.rst | 1 +
pywt/_extensions/_cwt.c | 384 ++---
pywt/_extensions/_dwt.c | 384 ++---
pywt/_extensions/_pywt.c | 384 ++---
pywt/_extensions/_swt.c | 1749 +++++++++-----------
pywt/_extensions/_swt.pyx | 43 +-
pywt/_extensions/c/wt.template.c | 10 +-
pywt/_multidim.py | 14 +-
pywt/_multilevel.py | 10 +-
pywt/data/_readers.py | 4 +-
pywt/tests/test_concurrent.py | 119 ++
pywt/tests/test_deprecations.py | 5 -
pywt/tests/test_multidim.py | 38 +-
pywt/tests/test_multilevel.py | 17 +
pywt/version.py | 8 +-
setup.py | 8 +-
util/readthedocs/requirements.txt | 2 +-
28 files changed, 1654 insertions(+), 1605 deletions(-)
diff --cc debian/.git-dpm
index 6c0965a,0000000..5f302f8
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- d7710cd5df96dc1bfd985e9638ae0a8c938ea0de
- d7710cd5df96dc1bfd985e9638ae0a8c938ea0de
- 1b83e07fb82d6896cd7eb63b5fe5a21c23ada0cd
++060c0e5ad6d9626e9b7e2eadc47fecbe68ecc54f
++060c0e5ad6d9626e9b7e2eadc47fecbe68ecc54f
++ea8e49c1514194f9c38a9deb65fbcb74f7494979
+ea8e49c1514194f9c38a9deb65fbcb74f7494979
+pywavelets_0.5.2.orig.tar.gz
+1220d661d97b490149e32e41aba00448d56a58cb
+4430706
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01-get_version_from_source.patch
index 6383f64,0000000..6e1407d
mode 100644,000000..100644
--- a/debian/patches/01-get_version_from_source.patch
+++ b/debian/patches/01-get_version_from_source.patch
@@@ -1,38 -1,0 +1,38 @@@
- From 6ac11d83ef75240348f63d0d150dd4a834b16f1a Mon Sep 17 00:00:00 2001
++From 5ca9e1f83bfc2c9907acfc06c96628c33594130e Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Mon, 12 Oct 2015 02:20:57 +0200
+Subject: Grab version from the source code instead of importing pywt to
+
+ build documentation at package build time.
+Forwarded: not-needed
+Last-Update: 2015-09-13
+
+Patch-Name: 01-get_version_from_source.patch
+---
+ doc/source/conf.py | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index ed49133..7544027 100755
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -49,9 +49,16 @@ copyright = jinja2.filters.do_mark_safe('2006-%s, <a href="https://groups.google
+
+ # The default replacements for |version| and |release|, also used in various
+ # other places throughout the built documents.
+-import pywt
+-version = re.sub(r'\.dev0+.*$', r'.dev', pywt.__version__)
+-release = pywt.__version__
++
++# On Debian we want to build docs at package build time, when pywt is not
++# installed.
++import os
++base_path = os.path.dirname(__file__)
++fp = open(os.path.abspath(os.path.join(base_path, '..', '..', 'pywt', 'version.py')))
++VERSION = re.compile(r".*full_version = '(.*?)'",
++ re.S).match(fp.read()).group(1)
++version = re.sub(r'\.dev0+.*$', r'.dev', VERSION)
++release = VERSION
+
+ print "PyWavelets (VERSION %s)" % (version,)
+
diff --cc debian/patches/02-remove_privacy_offenders.patch
index afef0cf,0000000..a1f0ebf
mode 100644,000000..100644
--- a/debian/patches/02-remove_privacy_offenders.patch
+++ b/debian/patches/02-remove_privacy_offenders.patch
@@@ -1,56 -1,0 +1,56 @@@
- From f974a871fd17bc8c14e664d2c7eefaa8843378a7 Mon Sep 17 00:00:00 2001
++From 2d454990fee695de918ab6e493b7153a2b58b8c7 Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Mon, 12 Oct 2015 02:20:58 +0200
+Subject: Remove Google Analitics and Travis build badge.
+
+Forwarded: not-needed
+Last-Update: 2015-09-30
+
+Patch-Name: 02-remove_privacy_offenders.patch
+---
+ doc/source/_templates/page.html | 13 -------------
+ doc/source/dev/testing.rst | 7 -------
+ 2 files changed, 20 deletions(-)
+
+diff --git a/doc/source/_templates/page.html b/doc/source/_templates/page.html
+index 8a049aa..37c5625 100755
+--- a/doc/source/_templates/page.html
++++ b/doc/source/_templates/page.html
+@@ -21,19 +21,6 @@
+ });
+ })(jQuery);
+ </script>
+-<script type="text/javascript">
+- var _gaq = _gaq || [];
+- _gaq.push(['_setAccount', 'UA-3396395-3']);
+- _gaq.push(['_trackPageview']);
+- (function () {
+- var ga = document.createElement('script');
+- ga.type = 'text/javascript';
+- ga.async = true;
+- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+- var s = document.getElementsByTagName('script')[0];
+- s.parentNode.insertBefore(ga, s);
+- })();
+-</script>
+ {% endblock %}
+
+ {# Remove version number from the top and bottom path bars #}
+diff --git a/doc/source/dev/testing.rst b/doc/source/dev/testing.rst
+index 0ac2d9c..23a9981 100755
+--- a/doc/source/dev/testing.rst
++++ b/doc/source/dev/testing.rst
+@@ -9,13 +9,6 @@ Continous integration with Travis-CI
+ The project is using `Travis-CI <https://travis-ci.org/PyWavelets/pywt>`_ service
+ for continous integration and testing.
+
+-Current build status is:
+-
+-.. image::
+- https://secure.travis-ci.org/PyWavelets/pywt.png?branch=master
+- :alt: Build Status
+- :target: https://secure.travis-ci.org/PyWavelets/pywt
+-
+ If you are submitting a patch or pull request please make sure it
+ does not break the build.
+
diff --cc debian/patches/do_not_rewrite_git_revision_on_build.patch
index 29c81d3,0000000..4ce97c8
mode 100644,000000..100644
--- a/debian/patches/do_not_rewrite_git_revision_on_build.patch
+++ b/debian/patches/do_not_rewrite_git_revision_on_build.patch
@@@ -1,29 -1,0 +1,29 @@@
- From d7710cd5df96dc1bfd985e9638ae0a8c938ea0de Mon Sep 17 00:00:00 2001
++From 060c0e5ad6d9626e9b7e2eadc47fecbe68ecc54f Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Wed, 4 Nov 2015 19:39:08 +0100
+Subject: Don't rewrite git revision during build
+
+Upstream uses git revision to report it inside version string. In Debian
+we want to take it from source distribution to show same revision as upstream,
+not Debian packaging repository revision.
+
+Patch-Name: do_not_rewrite_git_revision_on_build.patch
+---
+ setup.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index de6b661..b50e3e7 100755
++index d99dd8b..fa3eced 100755
+--- a/setup.py
++++ b/setup.py
+@@ -61,9 +61,7 @@ def get_version_info():
+ # write_version_py(), otherwise the import of pywt.version messes
+ # up the build under Python 3.
+ FULLVERSION = VERSION
+- if os.path.exists('.git'):
+- GIT_REVISION = git_version()
+- elif os.path.exists('pywt/version.py'):
++ if os.path.exists('pywt/version.py'):
+ # must be a source distribution, use existing version file
+ # load it as a separate module to not load pywt/__init__.py
+ import imp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pywavelets.git
More information about the Python-modules-commits
mailing list