[Python-modules-commits] [sphinx] 03/04: do not support snowballstemmer-based search for now

[Dmitry Shachnev]

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

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

commit 564dc19195c4aa40c2c5b1d26e96ca1b16a198d1
Author: Dmitry Shachnev <mitya57 at debian.org>
Date:   Thu Oct 8 13:58:05 2015 -0700

    do not support snowballstemmer-based search for now
    
    Forwarded: not-needed
    Patch-Name: no_snowballstemmer.diff
    
    Gbp-Pq: Name no_snowballstemmer.diff
---
 Sphinx.egg-info/requires.txt |  1 -
 setup.py                     |  1 -
 sphinx/search/__init__.py    | 14 --------------
 tests/run.py                 |  2 +-
 tests/test_search.py         |  1 +
 5 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Sphinx.egg-info/requires.txt b/Sphinx.egg-info/requires.txt
index b108784..972ee1d 100644
--- a/Sphinx.egg-info/requires.txt
+++ b/Sphinx.egg-info/requires.txt
@@ -2,7 +2,6 @@ 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/setup.py b/setup.py
index 177ae8d..e8556c2 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,6 @@ 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 4b309be..a2b1587 100644
--- a/sphinx/search/__init__.py
+++ b/sphinx/search/__init__.py
@@ -121,22 +121,8 @@ 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/tests/run.py b/tests/run.py
index 8c6298a..a204fe1 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',
-                'snowballstemmer', 'babel', 'html5lib'):
+                'babel', 'html5lib'):
     try:
         __import__(modname)
     except ImportError as err:
diff --git a/tests/test_search.py b/tests/test_search.py
index 19b322d..f4b0135 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -85,6 +85,7 @@ 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()

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