[Python-modules-commits] [pywavelets] 05/07: Initialize git-dpm
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Mon Oct 12 02:27:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository pywavelets.
commit 9e218d34ae5224283cd18b8910e3abc120a3674e
Merge: af796aa e6e8877
Author: Daniele Tricoli <eriol at mornie.org>
Date: Mon Oct 12 02:20:58 2015 +0200
Initialize git-dpm
debian/.git-dpm | 8 ++++++++
debian/patches/01-get_version_from_source.patch | 16 +++++++++++++---
debian/patches/02-remove_privacy_offenders.patch | 19 ++++++++++++++++---
doc/source/_templates/page.html | 13 -------------
doc/source/conf.py | 13 ++++++++++---
doc/source/dev/testing.rst | 8 --------
6 files changed, 47 insertions(+), 30 deletions(-)
diff --cc debian/.git-dpm
index 0000000,0000000..6d80076
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++e6e88770db15ea4d97661875617f771dbe7f9155
++e6e88770db15ea4d97661875617f771dbe7f9155
++34b87011e29e8813e694f2805d58d9d64c6849b5
++34b87011e29e8813e694f2805d58d9d64c6849b5
++pywavelets_0.3.0.orig.tar.gz
++7b8bdcc6a2744c78acefe3e1dbb97ece6e20a3f7
++635537
diff --cc debian/patches/01-get_version_from_source.patch
index f74bc85,0000000..c8b783f
mode 100644,000000..100644
--- a/debian/patches/01-get_version_from_source.patch
+++ b/debian/patches/01-get_version_from_source.patch
@@@ -1,28 -1,0 +1,38 @@@
- Description: Grab version from the source code instead of importing pywt to
++From 5822f996b490e2a8527ca951d52240a121491ab3 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.
- Author: Daniele Tricoli <eriol at mornie.org>
+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 21d21ee..9c4ae7a 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
- @@ -48,9 +48,16 @@
++@@ -48,9 +48,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 c2ee047,0000000..4ba6e53
mode 100644,000000..100644
--- a/debian/patches/02-remove_privacy_offenders.patch
+++ b/debian/patches/02-remove_privacy_offenders.patch
@@@ -1,44 -1,0 +1,57 @@@
- Description: Remove Google Analitics and Travis build badge.
- Author: Daniele Tricoli <eriol at mornie.org>
++From e6e88770db15ea4d97661875617f771dbe7f9155 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 | 8 --------
++ 2 files changed, 21 deletions(-)
++
++diff --git a/doc/source/_templates/page.html b/doc/source/_templates/page.html
++index 8a049aa..37c5625 100644
+--- 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 7decb45..0c0a638 100644
+--- a/doc/source/dev/testing.rst
++++ b/doc/source/dev/testing.rst
- @@ -9,14 +9,6 @@
++@@ -9,14 +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.
+
--
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