[Python-modules-commits] [deap] 01/04: fix-docs

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository deap.

commit f5437cae1f63c92d102a9e58a4b06a370a34f7f9
Author: Daniel Stender <debian at danielstender.com>
Date:   Fri Oct 16 19:28:48 2015 +0200

    fix-docs
    
    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                | 11 +++++++----
 doc/examples/pso_basic.rst | 19 -------------------
 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..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']
 
@@ -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
 ==========
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/deap.git