[Python-modules-commits] r30971 - in packages/deap/trunk/debian (12 files)

danstender-guest at users.alioth.debian.org danstender-guest at users.alioth.debian.org
Fri Oct 10 10:54:58 UTC 2014 

    Date: Friday, October 10, 2014 @ 10:54:57
  Author: danstender-guest
Revision: 30971

Updated b-deps and Recommends, bumped standards to 3.9.6, added fix-tests.patch, set up autopkgtest suite, added fix-docs.patch

Added:
  packages/deap/trunk/debian/patches/fix-docs.patch
    (from rev 30521, packages/deap/trunk/debian/patches/fix-privacy-breach.patch)
  packages/deap/trunk/debian/patches/fix-tests.patch
  packages/deap/trunk/debian/tests/
  packages/deap/trunk/debian/tests/control
  packages/deap/trunk/debian/tests/python-deap
  packages/deap/trunk/debian/tests/python3-deap
Modified:
  packages/deap/trunk/debian/changelog
  packages/deap/trunk/debian/control
  packages/deap/trunk/debian/patches/series
  packages/deap/trunk/debian/rules
Deleted:
  packages/deap/trunk/debian/patches/doc.patch
  packages/deap/trunk/debian/patches/fix-privacy-breach.patch

Modified: packages/deap/trunk/debian/changelog
===================================================================
--- packages/deap/trunk/debian/changelog	2014-10-10 07:16:00 UTC (rev 30970)
+++ packages/deap/trunk/debian/changelog	2014-10-10 10:54:57 UTC (rev 30971)
@@ -3,21 +3,29 @@
   * deb/control:
     + Transferred package to individual maintenance.
     + Added package description for python3-deap.
-    + Renamed docs package (changed doc-base accordingly).
-    + Updated b-ds and package dependencies.
+    + 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.
-  * Dropped deb/python-deap-doc.install, added deb/deap-doc.examples.
-  * Patches:
-    + Added fix-privacy-breach.patch (dropped deb/remove_ga.awk).
-    + doc.patch: added Forwarded info line.
+  * 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 matplotlib to b-deps (needed).
+    + 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, 08 Sep 2014 01:36:29 +0200
+ -- Daniel Stender <debian at danielstender.com>  Fri, 10 Oct 2014 12:52:08 +0200
 
 deap (1.0.1-1) unstable; urgency=low
 

Modified: packages/deap/trunk/debian/control
===================================================================
--- packages/deap/trunk/debian/control	2014-10-10 07:16:00 UTC (rev 30970)
+++ packages/deap/trunk/debian/control	2014-10-10 10:54:57 UTC (rev 30971)
@@ -8,24 +8,31 @@
  debhelper (>= 9),
  dh-python,
  python-all,
+ python-matplotlib,
+ python-numpy,
  python-sphinx,
- python3-all
-Standards-Version: 3.9.5
+ python3-all,
+ python3-numpy
+Standards-Version: 3.9.6
 Homepage: http://deap.gel.ulaval.ca/doc/default/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/deap/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/deap/trunk/
+XS-Testsuite: autopkgtest
 
 Package: python-deap
 Architecture: all
 Depends:
  ${misc:Depends},
  ${python:Depends}
+Recommends:
+ python-matplotlib,
+ python-numpy
 Suggests:
  deap-doc
 Description: Distributed Evolutionary Algorithms in Python
- DEAP is a novel evolutionary computation framework for rapid prototyping and 
- testing of ideas. It seeks to make algorithms explicit and data structures 
- transparent. It works in perfect harmony with parallelisation mechanism such as 
+ DEAP is a novel evolutionary computation framework for rapid prototyping and
+ testing of ideas. It seeks to make algorithms explicit and data structures
+ transparent. It works in perfect harmony with parallelisation mechanism such as
  multiprocessing and SCOOP.
  .
  This package contains the modules for Python.
@@ -35,12 +42,15 @@
 Depends:
  ${misc:Depends},
  ${python3:Depends}
+Recommends:
+ python3-matplotlib,
+ python3-numpy
 Suggests:
  deap-doc
 Description: Distributed Evolutionary Algorithms in Python3
- DEAP is a novel evolutionary computation framework for rapid prototyping and 
- testing of ideas. It seeks to make algorithms explicit and data structures 
- transparent. It works in perfect harmony with parallelisation mechanism such as 
+ DEAP is a novel evolutionary computation framework for rapid prototyping and
+ testing of ideas. It seeks to make algorithms explicit and data structures
+ transparent. It works in perfect harmony with parallelisation mechanism such as
  multiprocessing and SCOOP.
  .
  This package contains the modules for Python3.
@@ -55,9 +65,9 @@
  python-deap,
  python3-deap
 Description: Distributed Evolutionary Algorithms in Python (docs)
- DEAP is a novel evolutionary computation framework for rapid prototyping and 
- testing of ideas. It seeks to make algorithms explicit and data structures 
- transparent. It works in perfect harmony with parallelisation mechanism such as 
+ DEAP is a novel evolutionary computation framework for rapid prototyping and
+ testing of ideas. It seeks to make algorithms explicit and data structures
+ transparent. It works in perfect harmony with parallelisation mechanism such as
  multiprocessing and SCOOP.
  .
  This package contains the documentation.

Deleted: packages/deap/trunk/debian/patches/doc.patch
===================================================================
--- packages/deap/trunk/debian/patches/doc.patch	2014-10-10 07:16:00 UTC (rev 30970)
+++ packages/deap/trunk/debian/patches/doc.patch	2014-10-10 10:54:57 UTC (rev 30971)
@@ -1,21 +0,0 @@
-Description: Disable options for extlinks extension
-Author: Miriam Ruiz <miriam at debian.org>
-Forwarded: not-needed
-
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -127,10 +127,10 @@ plot_html_show_formats = True
- 
- # -- Options for extlinks extension ----------------------------------------------
- 
--import subprocess
--branch = str(subprocess.check_output(["hg", "branch"])[:-1])
--extlinks = {'example': ('https://code.google.com/p/deap/source/browse/examples/%s.py?name='+branch,
--                      'examples/')}
-+#import subprocess
-+#branch = str(subprocess.check_output(["hg", "branch"])[:-1])
-+#extlinks = {'example': ('https://code.google.com/p/deap/source/browse/examples/%s.py?name='+branch,
-+#                      'examples/')}
- 
- 
- # -- Options for HTML output ---------------------------------------------------

Copied: packages/deap/trunk/debian/patches/fix-docs.patch (from rev 30521, packages/deap/trunk/debian/patches/fix-privacy-breach.patch)
===================================================================
--- packages/deap/trunk/debian/patches/fix-docs.patch	                        (rev 0)
+++ packages/deap/trunk/debian/patches/fix-docs.patch	2014-10-10 10:54:57 UTC (rev 30971)
@@ -0,0 +1,76 @@
+Description: fix docs, privacy breaches and minor flaws
+ disable options for extlinks extension (conf.py) by Miriam Ruiz
+Author: Daniel Stender <debian at danielstender.com>
+Forwarded: no
+Last-Update: 2014-10-10
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -127,10 +127,10 @@
+ 
+ # -- Options for extlinks extension ----------------------------------------------
+ 
+-import subprocess
+-branch = str(subprocess.check_output(["hg", "branch"])[:-1])
+-extlinks = {'example': ('https://code.google.com/p/deap/source/browse/examples/%s.py?name='+branch,
+-                      'examples/')}
++#import subprocess
++#branch = str(subprocess.check_output(["hg", "branch"])[:-1])
++#extlinks = {'example': ('https://code.google.com/p/deap/source/browse/examples/%s.py?name='+branch,
++#                      'examples/')}
+ 
+ 
+ # -- Options for HTML output ---------------------------------------------------
+--- 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 %}
+--- a/doc/examples/pso_basic.rst
++++ b/doc/examples/pso_basic.rst
+@@ -97,25 +97,6 @@
+ 
+ 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
+ ==========
+ 

Deleted: packages/deap/trunk/debian/patches/fix-privacy-breach.patch
===================================================================
--- packages/deap/trunk/debian/patches/fix-privacy-breach.patch	2014-10-10 07:16:00 UTC (rev 30970)
+++ packages/deap/trunk/debian/patches/fix-privacy-breach.patch	2014-10-10 10:54:57 UTC (rev 30971)
@@ -1,49 +0,0 @@
-Description: fix Lintian complaints on privacy breach of docs
-Author: Daniel Stender <debian at danielstender.com>
-Forwarded: not-needed
-Last-Update: 2014-09-07
---- a/doc/_templates/layout.html
-+++ b/doc/_templates/layout.html
-@@ -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 %}
---- a/doc/examples/pso_basic.rst
-+++ b/doc/examples/pso_basic.rst
-@@ -97,25 +97,6 @@
- 
- 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
- ==========
- 

Added: packages/deap/trunk/debian/patches/fix-tests.patch
===================================================================
--- packages/deap/trunk/debian/patches/fix-tests.patch	                        (rev 0)
+++ packages/deap/trunk/debian/patches/fix-tests.patch	2014-10-10 10:54:57 UTC (rev 30971)
@@ -0,0 +1,52 @@
+Description: make tests run
+ fix tests to run tree independently, removed unused import (cherry
+ picked from repo), disabled defective stuff, see
+ http://groups.google.com/forum/#!topic/deap-users/nOyiGlm38Zw
+Author: Daniel Stender <debian at danielstener.com>
+Forwarded: no-needed
+Last-Update: 2014-10-09
+--- a/deap/tests/test_pickle.py
++++ b/deap/tests/test_pickle.py
+@@ -4,16 +4,15 @@
+ 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 @@
+         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)
+     
+--- a/deap/tests/test_logbook.py
++++ b/deap/tests/test_logbook.py
+@@ -3,7 +3,7 @@
+ 
+ sys.path.append("..")
+ 
+-import tools
++from deap import tools
+ 
+ class LogbookTest(unittest.TestCase):
+ 

Modified: packages/deap/trunk/debian/patches/series
===================================================================
--- packages/deap/trunk/debian/patches/series	2014-10-10 07:16:00 UTC (rev 30970)
+++ packages/deap/trunk/debian/patches/series	2014-10-10 10:54:57 UTC (rev 30971)
@@ -1,2 +1,2 @@
-fix-privacy-breach.patch
-doc.patch
+fix-tests.patch
+fix-docs.patch

Modified: packages/deap/trunk/debian/rules
===================================================================
--- packages/deap/trunk/debian/rules	2014-10-10 07:16:00 UTC (rev 30970)
+++ packages/deap/trunk/debian/rules	2014-10-10 10:54:57 UTC (rev 30971)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-export DEB_BUILD_OPTIONS=nocheck
+#export DEB_BUILD_OPTIONS=nocheck
 export PYBUILD_NAME=deap
 
 %:

Added: packages/deap/trunk/debian/tests/control
===================================================================
--- packages/deap/trunk/debian/tests/control	                        (rev 0)
+++ packages/deap/trunk/debian/tests/control	2014-10-10 10:54:57 UTC (rev 30971)
@@ -0,0 +1,5 @@
+Tests: python-deap
+Depends: python-deap, python-numpy
+
+Tests: python3-deap
+Depends: python3-deap, python3-numpy

Added: packages/deap/trunk/debian/tests/python-deap
===================================================================
--- packages/deap/trunk/debian/tests/python-deap	                        (rev 0)
+++ packages/deap/trunk/debian/tests/python-deap	2014-10-10 10:54:57 UTC (rev 30971)
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e -u
+cp -a deap/tests/ "$ADTTMP"
+cd "$ADTTMP/tests/"
+python -m unittest discover -v 2>&1


Property changes on: packages/deap/trunk/debian/tests/python-deap
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/deap/trunk/debian/tests/python3-deap
===================================================================
--- packages/deap/trunk/debian/tests/python3-deap	                        (rev 0)
+++ packages/deap/trunk/debian/tests/python3-deap	2014-10-10 10:54:57 UTC (rev 30971)
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e -u
+cp -a deap/tests/ "$ADTTMP"
+cd "$ADTTMP/tests/"
+python3 -m unittest discover -v 2>&1


Property changes on: packages/deap/trunk/debian/tests/python3-deap
___________________________________________________________________
Added: svn:executable
   + *

More information about the Python-modules-commits mailing list