[Python-modules-commits] [sphinx] 01/02: Convert from git-dpm to patches unapplied format.

Wed Mar 15 09:26:12 UTC 2017

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

mitya57 pushed a commit to branch debian/master
in repository sphinx.

commit 8aa5a3714a1a425c0d1e8578d24bcc963ead27e0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Mar 15 12:23:53 2017 +0300

    Convert from git-dpm to patches unapplied format.
    
    Using the steps mentioned on
    https://wiki.debian.org/Python/GitPackagingPQ#Converting_git-dpm_to_gbp_pq.
---
 Sphinx.egg-info/requires.txt      |  1 +
 debian/.git-dpm                   | 11 -----------
 debian/changelog                  |  1 +
 debian/gbp.conf                   |  2 ++
 doc/_themes/sphinx13/layout.html  |  2 ++
 setup.py                          |  1 +
 sphinx/search/__init__.py         | 14 ++++++++++++++
 sphinx/themes/pyramid/layout.html |  2 ++
 tests/run.py                      |  2 +-
 tests/test_build_linkcheck.py     |  2 --
 tests/test_search.py              |  1 -
 tests/test_theming.py             |  1 -
 12 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Sphinx.egg-info/requires.txt b/Sphinx.egg-info/requires.txt
index b7d881a..dec5766 100644
--- a/Sphinx.egg-info/requires.txt
+++ b/Sphinx.egg-info/requires.txt
@@ -2,6 +2,7 @@ six>=1.5
 Jinja2>=2.3
 Pygments>=2.0
 docutils>=0.11
+snowballstemmer>=1.1
 babel>=1.3,!=2.0
 alabaster>=0.7,<0.8
 imagesize
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 6e12a35..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-49c39658f95dd3b2ab39a3810ca1ad7102cd3a3c
-49c39658f95dd3b2ab39a3810ca1ad7102cd3a3c
-a9046c8dcc41ac1476c357ea8f9a2c049cd09160
-a9046c8dcc41ac1476c357ea8f9a2c049cd09160
-sphinx_1.5.2.orig.tar.gz
-71dac26c76c3d60651f92ba52f9b4f6bb19d1d13
-4418646
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/changelog b/debian/changelog
index 00d1258..4e4730c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sphinx (1.5.2-3) UNRELEASED; urgency=medium
 
   * Build-depend on texlive-luatex, to make xetex tests not be skipped.
+  * Convert from git-dpm to patches unapplied format.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 25 Jan 2017 17:24:53 +0300
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/doc/_themes/sphinx13/layout.html b/doc/_themes/sphinx13/layout.html
index 9a4b160..5a2a71b 100644
--- a/doc/_themes/sphinx13/layout.html
+++ b/doc/_themes/sphinx13/layout.html
@@ -14,6 +14,8 @@
 {% block sidebar2 %}{% endblock %}
 
 {% block extrahead %}
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700'
+          rel='stylesheet' type='text/css' />
 {{ super() }}
 {%- if not embedded %}
     <style type="text/css">
diff --git a/setup.py b/setup.py
index 2f8591a..fa0be67 100644
--- a/setup.py
+++ b/setup.py
@@ -46,6 +46,7 @@ requires = [
     'Jinja2>=2.3',
     'Pygments>=2.0',
     'docutils>=0.11',
+    'snowballstemmer>=1.1',
     'babel>=1.3,!=2.0',
     'alabaster>=0.7,<0.8',
     'imagesize',
diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py
index 854a071..8f29352 100644
--- a/sphinx/search/__init__.py
+++ b/sphinx/search/__init__.py
@@ -121,8 +121,22 @@ def parse_stop_word(source):
 
 # maps language name to module.class or directly a class
 languages = {
+    'da': 'sphinx.search.da.SearchDanish',
+    'de': 'sphinx.search.de.SearchGerman',
     'en': SearchEnglish,
+    'es': 'sphinx.search.es.SearchSpanish',
+    'fi': 'sphinx.search.fi.SearchFinnish',
+    'fr': 'sphinx.search.fr.SearchFrench',
+    'hu': 'sphinx.search.hu.SearchHungarian',
+    'it': 'sphinx.search.it.SearchItalian',
     'ja': 'sphinx.search.ja.SearchJapanese',
+    'nl': 'sphinx.search.nl.SearchDutch',
+    'no': 'sphinx.search.no.SearchNorwegian',
+    'pt': 'sphinx.search.pt.SearchPortuguese',
+    'ro': 'sphinx.search.ro.SearchRomanian',
+    'ru': 'sphinx.search.ru.SearchRussian',
+    'sv': 'sphinx.search.sv.SearchSwedish',
+    'tr': 'sphinx.search.tr.SearchTurkish',
     'zh': 'sphinx.search.zh.SearchChinese',
 }
 
diff --git a/sphinx/themes/pyramid/layout.html b/sphinx/themes/pyramid/layout.html
index be95248..2f89115 100644
--- a/sphinx/themes/pyramid/layout.html
+++ b/sphinx/themes/pyramid/layout.html
@@ -1,6 +1,8 @@
 {%- extends "basic/layout.html" %}
 
 {%- block extrahead %}
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Neuton&subset=latin" type="text/css" media="screen" charset="utf-8" />
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&subset=latin" type="text/css" media="screen" charset="utf-8" />
 <!--[if lte IE 6]>
 <link rel="stylesheet" href="{{ pathto('_static/ie6.css', 1) }}" type="text/css" media="screen" charset="utf-8" />
 <![endif]-->
diff --git a/tests/run.py b/tests/run.py
index 2a4876a..a7afbb8 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -29,7 +29,7 @@ warnings.filterwarnings('ignore', category=PendingDeprecationWarning, module=r'_
 # check dependencies before testing
 print('Checking dependencies...')
 for modname in ('pytest', 'mock', 'six', 'docutils', 'jinja2', 'pygments',
-                'babel', 'html5lib'):
+                'snowballstemmer', 'babel', 'html5lib'):
     try:
         __import__(modname)
     except ImportError as err:
diff --git a/tests/test_build_linkcheck.py b/tests/test_build_linkcheck.py
index b2951a7..f776f77 100644
--- a/tests/test_build_linkcheck.py
+++ b/tests/test_build_linkcheck.py
@@ -13,7 +13,6 @@ from __future__ import print_function
 import pytest
 
 
- at pytest.mark.skip('Requires internet access')
 @pytest.mark.sphinx('linkcheck', testroot='linkcheck', freshenv=True)
 def test_defaults(app, status, warning):
     app.builder.build_all()
@@ -27,7 +26,6 @@ def test_defaults(app, status, warning):
     assert len(content.splitlines()) == 1
 
 
- at pytest.mark.skip('Requires internet access')
 @pytest.mark.sphinx(
     'linkcheck', testroot='linkcheck', freshenv=True,
     confoverrides={'linkcheck_anchors_ignore': ["^!", "^top$"]})
diff --git a/tests/test_search.py b/tests/test_search.py
index 250bbde..143a3db 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -80,7 +80,6 @@ def test_meta_keys_are_handled_for_language_en(app, status, warning):
     assert not is_registered_term(searchindex, 'onlytoogerman')
 
 
- at pytest.mark.skip('Search languages using snowball are currently disabled')
 @pytest.mark.sphinx(testroot='search', confoverrides={'html_search_language': 'de'})
 def test_meta_keys_are_handled_for_language_de(app, status, warning):
     app.builder.build_all()
diff --git a/tests/test_theming.py b/tests/test_theming.py
index ed68b0c..ce207a5 100644
--- a/tests/test_theming.py
+++ b/tests/test_theming.py
@@ -63,7 +63,6 @@ def test_theme_api(app, status, warning):
     assert not os.path.exists(themedir)
 
 
- at pytest.mark.skip('In Debian we use packaged JS libraries')
 @pytest.mark.sphinx(testroot='tocdepth')  # a minimal root
 def test_js_source(app, status, warning):
     # Now sphinx provides non-minified JS files for jquery.js and underscore.js

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

