[Python-modules-commits] [python-mkdocs] 04/11: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository python-mkdocs.

commit 7d5c18b29b78b4fb9bfeee73a6cd24d2e9a8ccc3
Merge: d2f13b0 8a52c87
Author: Brian May <bam at debian.org>
Date:   Mon May 2 15:54:50 2016 +1000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 debian/patches/0001-Remove-faulty-tests.patch      | 35 +++++++++++++++++++
 ...2-Use-themes-from-usr-share-mkdocs-themes.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 mkdocs/tests/config/config_options_tests.py        |  1 -
 mkdocs/tests/config/config_tests.py                |  1 -
 mkdocs/utils/__init__.py                           | 14 +++++---
 7 files changed, 89 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index ac058c7,0000000..cf6d5eb
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
- 47dd578a2b91cacc50aec47aff24b7b75581e08a
- 47dd578a2b91cacc50aec47aff24b7b75581e08a
++8a52c870c88da7c47fcaae7e2832a6ed9faa83ec
++8a52c870c88da7c47fcaae7e2832a6ed9faa83ec
 +47dd578a2b91cacc50aec47aff24b7b75581e08a
 +47dd578a2b91cacc50aec47aff24b7b75581e08a
 +python-mkdocs_0.15.3.orig.tar.gz
 +544760693a444da8f7b005ddc69b30e8ad69f3df
 +1805972
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-faulty-tests.patch
index 0000000,0000000..28711e1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-faulty-tests.patch
@@@ -1,0 -1,0 +1,35 @@@
++From 3716188da3c089be4871b3fb6b8127817c43d361 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Mon, 2 May 2016 15:53:10 +1000
++Subject: Remove faulty tests
++
++See https://github.com/mkdocs/mkdocs/issues/923
++---
++ mkdocs/tests/config/config_options_tests.py | 1 -
++ mkdocs/tests/config/config_tests.py         | 1 -
++ 2 files changed, 2 deletions(-)
++
++diff --git a/mkdocs/tests/config/config_options_tests.py b/mkdocs/tests/config/config_options_tests.py
++index d16f675..9813334 100644
++--- a/mkdocs/tests/config/config_options_tests.py
+++++ b/mkdocs/tests/config/config_options_tests.py
++@@ -179,7 +179,6 @@ class SiteDirTest(unittest.TestCase):
++             {'docs_dir': '.', 'site_dir': '.'},
++             {'docs_dir': 'docs', 'site_dir': ''},
++             {'docs_dir': '', 'site_dir': ''},
++-            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
++         )
++ 
++         for test_config in test_configs:
++diff --git a/mkdocs/tests/config/config_tests.py b/mkdocs/tests/config/config_tests.py
++index 04e51de..7c82535 100644
++--- a/mkdocs/tests/config/config_tests.py
+++++ b/mkdocs/tests/config/config_tests.py
++@@ -192,7 +192,6 @@ class ConfigTests(unittest.TestCase):
++             {'docs_dir': '.', 'site_dir': '.'},
++             {'docs_dir': 'docs', 'site_dir': ''},
++             {'docs_dir': '', 'site_dir': ''},
++-            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
++         )
++ 
++         conf = {
diff --cc debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
index 0000000,0000000..f9995a5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
@@@ -1,0 -1,0 +1,40 @@@
++From 8a52c870c88da7c47fcaae7e2832a6ed9faa83ec Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Mon, 2 May 2016 15:53:46 +1000
++Subject: Use themes from /usr/share/mkdocs/themes
++
++See https://lists.debian.org/debian-python/2016/04/msg00042.html
++---
++ mkdocs/utils/__init__.py | 14 ++++++++++----
++ 1 file changed, 10 insertions(+), 4 deletions(-)
++
++diff --git a/mkdocs/utils/__init__.py b/mkdocs/utils/__init__.py
++index 9b85fc0..59d1182 100644
++--- a/mkdocs/utils/__init__.py
+++++ b/mkdocs/utils/__init__.py
++@@ -363,15 +363,21 @@ def get_themes():
++                 "with the same name".format(theme.name, theme.dist.key))
++ 
++         elif theme.name in themes:
++-            multiple_packages = [themes[theme.name].dist.key, theme.dist.key]
+++            multiple_packages = [themes[theme.name], theme.dist.key]
++             log.warning("The theme %s is provided by the Python packages "
++                         "'%s'. The one in %s will be used.",
++                         theme.name, ','.join(multiple_packages), theme.dist.key)
++ 
++-        themes[theme.name] = theme
+++        if theme.name in builtins:
+++            themes[theme.name] = os.path.dirname(
+++                os.path.abspath(theme.load().__file__))
+++        else:
+++            themes[theme.name] = os.path.join(
+++                "/usr/share/mkdocs/themes",
+++                theme.dist.key, theme.name)
++ 
++-    themes = dict((name, os.path.dirname(os.path.abspath(theme.load().__file__)))
++-                  for name, theme in themes.items())
+++    themes = dict((name, theme_path) for name, theme_path in themes.items())
+++    print(themes)
++ 
++     return themes
++ 
diff --cc debian/patches/series
index 0000000,0000000..b5c3a9b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Remove-faulty-tests.patch
++0002-Use-themes-from-usr-share-mkdocs-themes.patch

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