[Python-modules-commits] [deap] 03/04: change version to 1.0.2.post2-2 (UNRELEASED) fix-docs.patch: hardcode copyright span for reproducible builds.
Daniel Stender
danstender-guest at moszumanska.debian.org
Sun Mar 20 12:57:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
danstender-guest pushed a commit to branch master
in repository deap.
commit 820c72539f2b19ab1c58990a42e7a3c21aa5af76
Merge: 16fdf98 f03fa53
Author: Daniel Stender <stender at debian.org>
Date: Sun Mar 20 13:35:10 2016 +0100
change version to 1.0.2.post2-2 (UNRELEASED)
fix-docs.patch: hardcode copyright span for reproducible
builds.
debian/.git-dpm | 4 ++--
debian/changelog | 7 +++++++
debian/patches/0001-fix-docs.patch | 26 +++++++++++++++++++-------
debian/patches/0002-fix-tests.patch | 2 +-
doc/conf.py | 3 ++-
5 files changed, 31 insertions(+), 11 deletions(-)
diff --cc debian/.git-dpm
index 2a712f1,0000000..1d937c8
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
- ec074ea8a5f423889a6bc1310a94104ce7882d5f
- ec074ea8a5f423889a6bc1310a94104ce7882d5f
++f03fa535f3bdced1b52125a6b994b9be4092e996
++f03fa535f3bdced1b52125a6b994b9be4092e996
+72cb7e0658016b4a9c8d8a04f82635936819320e
+72cb7e0658016b4a9c8d8a04f82635936819320e
+deap_1.0.2.post2.orig.tar.xz
+4e673112d4c5cb5ab32ff43d05b98cec79aca425
+733264
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index eaef9cb,0000000..3246357
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,131 -1,0 +1,138 @@@
++deap (1.0.2.post2-2) UNRELEASED; urgency=medium
++
++ * fix-docs.patch: hardcode copyright span for reproducible
++ builds.
++
++ -- Daniel Stender <stender at debian.org> Sun, 20 Mar 2016 13:35:10 +0100
++
+deap (1.0.2.post2-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #818717).
+ * deb/control:
+ + updated maintainer email address, cosmetics.
+ + added Pandoc to build-deps.
+ + bumped standards version to 3.9.7 (no changes needed).
+ + use HTTPS also for Vcs-Git.
+ + removed Testsuite field (obsolete).
+ * deb/copyright: updated.
+ * deb/rules:
+ + added export for LC_ALL (build needs UTF-8).
+ + removed DEB_BUILD_OPTIONS=nodocs switch from dh_auto_install (obsolete).
+ + added override for dh_installdocs to convert and distribute README.
+ * Dropped deb/gbp.conf (package handled by git-dpm).
+
+ -- Daniel Stender <stender at debian.org> Sun, 20 Mar 2016 02:27:53 +0100
+
+deap (1.0.1-4) unstable; urgency=medium
+
+ * deb/control:
+ + Uploaders: added missing group belonging.
+ + updated Vcs fields (moved to git).
+ + added python{,3}-scoop to Suggests.
+ * deb/copyright: removed trailing commas, updated.
+ * deb/watch: watch pypi.debian.net.
+ * Symlinks for docs package to reduce file redundancy:
+ + deb/control: added rdfind and symlinks to b-deps.
+ + deb/rules: added auto symlink creation to dh_auto_install override.
+ * fix-docs.patch:
+ + enabled and updated extlinks for examples.
+ + don't produce PDFs by Matplotlib (Closes: #775303).
+ * Autopkgtests:
+ + activated Python deprecation warnings.
+ + iterate unittests over py{,3}versions.
+
+ -- Daniel Stender <debian at danielstender.com> Fri, 08 May 2015 19:50:28 +0200
+
+deap (1.0.1-3+deb8u1) unstable; urgency=medium
+
+ * deb/control:
+ + added Conflicts and Replaces of python-deap-doc
+ (former name of docs package) for deap-doc (Closes: #765440).
+
+ -- Daniel Stender <debian at danielstender.com> Fri, 07 Nov 2014 01:24:41 +0100
+
+deap (1.0.1-3) unstable; urgency=medium
+
+ * deb/copyright: added licenses for doc/_static/sidebar.js and
+ doc/_static/copybutton.js (Closes: #765330).
+
+ -- Daniel Stender <debian at danielstender.com> Tue, 14 Oct 2014 11:33:32 +0200
+
+deap (1.0.1-2) unstable; urgency=medium
+
+ * deb/control:
+ + Transferred package to individual maintenance.
+ + Added package description for python3-deap.
+ + Updated b-ds and package dependencies, added numpy and
+ matplotlib to Recommends.
+ + Bumped standards to 3.9.6 (no changes needed).
+ + Changed package descriptions (antiquated).
+ * deb/copyright:
+ + Removed redundant paragraph.
+ * deb/rules:
+ + Added export lines for DH_VERBOSE and DEB_BUILD_OPTIONS.
+ + Build with Pybuild and dh_sphinxdoc, reduced.
+ * Tests:
+ + deb/control: added python{,3}-numpy to b-deps.
+ + Added fix-tests.patch.
+ + Set up autopkgtest suite.
+ * Docs:
+ + deb/control: renamed docs package (changed doc-base accordingly),
+ added needed packages (matplotlib, latex-extra, dvipng).
+ + Dropped deb/python-deap-doc.install, added deb/deap-doc.examples.
+ + Added fix-docs.patch (dropped deb/remove_ga.awk).
+ + Included doc.patch into fix-docs.patch.
+ * Improved watch file.
+ * Removed deb/source/options and deb/README.source (obsolete).
+
+ -- Daniel Stender <debian at danielstender.com> Mon, 13 Oct 2014 08:24:40 +0200
+
+deap (1.0.1-1) unstable; urgency=low
+
+ [ Miriam Ruiz ]
+ * New Upstream Release. Closes: #675200
+ * Upgraded Standards-Version from 3.9.2 to 3.9.5
+ * Switched to dh_python2
+ * Upgraded debian/compat to 9
+ * Added build-arch and build-indep targets to debian/rules
+ * Using awk to remove connection from the documentation to google analytics
+ * Using jquery.js and underscore.js from libjs-jquery and libjs-underscore
+ * Added patches/doc.patch
+
+ [ Daniel Stender ]
+ * deb/control:
+ + Added myself to Uploaders.
+ + Added version to b-p on python-all.
+ + Updated Homepage.
+ + Wrapped and sorted.
+ * deb/copyright:
+ + Changed copyright file towards DEP-5.
+ + Updated Source URI (project source moved to Github).
+ + Added email addresses for copyright holders.
+ + Dropped license for eap/toolbox.py (not included anymore).
+ + Extended copyrights to 2014.
+ + Added myself to copyrights for deb/*.
+ + Specified license location.
+ * Added watch file [initial version by Jackson Doak].
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Daniel Stender <debian at danielstender.com> Sun, 06 Jul 2014 00:03:41 +0200
+
+deap (0.7.1-1) unstable; urgency=low
+
+ [ Jakub Wilk ]
+ * Add Vcs-* fields.
+
+ [ Miriam Ruiz ]
+ * New Upstream Release
+ * Upgraded Standards-Version from 3.9.1 to 3.9.2
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Thu, 17 Nov 2011 11:53:15 +0100
+
+deap (0.6-1) unstable; urgency=low
+
+ * Initial release. Closes: #609834
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Thu, 09 Dec 2010 23:05:47 +0100
diff --cc debian/patches/0001-fix-docs.patch
index 547907c,0000000..88ffa2a
mode 100644,000000..100644
--- a/debian/patches/0001-fix-docs.patch
+++ b/debian/patches/0001-fix-docs.patch
@@@ -1,98 -1,0 +1,110 @@@
- From 67baf205b6776d41fee51b12277c292164ce840d Mon Sep 17 00:00:00 2001
++From f5437cae1f63c92d102a9e58a4b06a370a34f7f9 Mon Sep 17 00:00:00 2001
+From: Daniel Stender <debian at danielstender.com>
+Date: Fri, 16 Oct 2015 19:28:48 +0200
+Subject: fix-docs
+
- privacy breaches and minor flaws, extlinks extension, don't produce PDFs
- Forwarded: not-needed
++privacy breaches and minor flaws, extlinks extension, don't produce PDFs,
++hardcode copyright span for reproducible builds.
++Forwarded: not-needed
++Last-Update: 2016-03-20
+---
+ doc/_templates/layout.html | 12 ++----------
- doc/conf.py | 8 +++++---
++ doc/conf.py | 11 +++++++----
+ doc/examples/pso_basic.rst | 19 -------------------
- 3 files changed, 7 insertions(+), 32 deletions(-)
++ 3 files changed, 9 insertions(+), 33 deletions(-)
+
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
+index 41cccd5..7c98e3b 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -11,7 +11,7 @@
+ {% endblock %}
+
+ {% block rootrellink %}
+- <li><a href="http://code.google.com/p/deap/"><img src="{{ pathto('_static/deap_icon-39x55.png', 1) }}" style="height: 30px; vertical-align: middle; padding-right: 1em;" />Project Homepage</a>{{ reldelim1 }}</li>
++ <li><a href="http://code.google.com/p/deap/"><img src="{{ pathto('_static/deap_icon_16x16.ico', 1) }}" style="height: 30px; vertical-align: middle; padding-right: 1em;" />Project Homepage</a>{{ reldelim1 }}</li>
+ <li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }} </li>
+ {% endblock %}
+
+@@ -25,13 +25,5 @@
+ <br />
+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version|e }}.
+ </div>
+-<script type="text/javascript">
+- (function() {
+- var ga = document.createElement('script');
+- ga.src = ('https:' == document.location.protocol ?
+- 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+- ga.setAttribute('async', 'true');
+- document.documentElement.firstChild.appendChild(ga);
+- })();
+-</script>
++
+ {% endblock %}
+diff --git a/doc/conf.py b/doc/conf.py
- index c65136e..bf7084d 100644
++index c65136e..58c573a 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -37,6 +37,8 @@ else:
+ extensions += ['matplotlib.sphinxext.only_directives',
+ 'matplotlib.sphinxext.plot_directive']
+
++plot_formats = [('png', 80), ('hires.png', 200)]
++
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+
- @@ -126,10 +128,10 @@ plot_include_source = False
++@@ -51,7 +53,8 @@ master_doc = 'index'
++
++ # General information about the project.
++ project = u'DEAP'
++-copyright = u'2009-%s, DEAP Project' % time.strftime('%Y')
+++#copyright = u'2009-%s, DEAP Project' % time.strftime('%Y')
+++copyright = u'2009-2015, DEAP Project'
++
++ # The version info for the project you're documenting, acts as replacement for
++ # |version| and |release|, also used in various other places throughout the
++@@ -126,10 +129,10 @@ plot_include_source = False
+ plot_html_show_formats = True
+
+ # -- Options for extlinks extension ----------------------------------------------
+-import subprocess
+-tree = subprocess.check_output(["git", "rev-parse", "HEAD"]).strip()
++#import subprocess
++#branch = str(subprocess.check_output(["hg", "branch"])[:-1])
+
+-extlinks = {'example': ('https://github.com/DEAP/deap/blob/{tree}/examples/%s.py'.format(tree=tree), "examples/")}
++extlinks = {'example': ('https://github.com/DEAP/deap/blob/master/examples/%s.py','examples/')}
+ # -- Options for HTML output ---------------------------------------------------
+
+ # Add any paths that contain custom themes here, relative to this directory.
+diff --git a/doc/examples/pso_basic.rst b/doc/examples/pso_basic.rst
+index 01a488a..6232bca 100644
+--- a/doc/examples/pso_basic.rst
++++ b/doc/examples/pso_basic.rst
+@@ -97,25 +97,6 @@ Conclusion
+
+ The full PSO basic example can be found here : :example:`pso/basic`.
+
+-This is a video of the algorithm in action, plotted with matplotlib_.
+-The red dot represents the best solution found so far.
+-
+-.. _matplotlib: http://matplotlib.org/
+-
+-.. raw:: html
+-
+- <center>
+- <object style="height: 390px; width: 640px">
+- <param name="movie" value="http://www.youtube.com/v/f3MW2krobpo?version=3&feature=player_detailpage">
+- <param name="allowFullScreen" value="true">
+- <param name="allowScriptAccess" value="always">
+- <embed src="http://www.youtube.com/v/f3MW2krobpo?version=3&feature=player_detailpage"
+- type="application/x-shockwave-flash" allowfullscreen="true"
+- allowScriptAccess="always"
+- width="640" height="360">
+- </object>
+- </center>
+-
+ References
+ ==========
+
diff --cc debian/patches/0002-fix-tests.patch
index 0750186,0000000..0594a6e
mode 100644,000000..100644
--- a/debian/patches/0002-fix-tests.patch
+++ b/debian/patches/0002-fix-tests.patch
@@@ -1,63 -1,0 +1,63 @@@
- From ec074ea8a5f423889a6bc1310a94104ce7882d5f Mon Sep 17 00:00:00 2001
++From f03fa535f3bdced1b52125a6b994b9be4092e996 Mon Sep 17 00:00:00 2001
+From: Daniel Stender <debian at danielstener.com>
+Date: Fri, 16 Oct 2015 19:30:13 +0200
+Subject: fix-tests
+
+ make tests run tree independently, removed unused import (cherry
+ picked from repo), disabled defective stuff, see
+ http://groups.google.com/forum/#!topic/deap-users/nOyiGlm38Zw
+ Forwarded: not-needed
+---
+ deap/tests/test_logbook.py | 2 +-
+ deap/tests/test_pickle.py | 13 ++++++-------
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/deap/tests/test_logbook.py b/deap/tests/test_logbook.py
+index f0238fd..b5f2834 100644
+--- a/deap/tests/test_logbook.py
++++ b/deap/tests/test_logbook.py
+@@ -3,7 +3,7 @@ import unittest
+
+ sys.path.append("..")
+
+-import tools
++from deap import tools
+
+ class LogbookTest(unittest.TestCase):
+
+diff --git a/deap/tests/test_pickle.py b/deap/tests/test_pickle.py
+index 696b4db..0f808ab 100644
+--- a/deap/tests/test_pickle.py
++++ b/deap/tests/test_pickle.py
+@@ -4,16 +4,15 @@ import unittest
+ import array
+ import pickle
+ import operator
+-from test import test_support
+
+ sys.path.append("..")
+
+ import numpy
+
+-import creator
+-import base
+-import gp
+-import tools
++from deap import creator
++from deap import base
++from deap import gp
++from deap import tools
+
+ def func():
+ return "True"
+@@ -57,8 +56,8 @@ class Pickling(unittest.TestCase):
+ ind.fitness.values = (1.0,)
+ ind_s = pickle.dumps(ind)
+ ind_l = pickle.loads(ind_s)
+- msg = "Unpickled individual %s != pickled individual %s" % (str(ind), str(ind_l))
+- self.failUnlessEqual(ind, ind_l, msg)
++ # msg = "Unpickled individual %s != pickled individual %s" % (str(ind), str(ind_l))
++ self.failUnlessEqual(ind, ind_l)
+ msg = "Unpickled fitness %s != pickled fitness %s" % (str(ind.fitness), str(ind_l.fitness))
+ self.failUnlessEqual(ind.fitness, ind_l.fitness, msg)
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/deap.git
More information about the Python-modules-commits
mailing list