[Python-modules-commits] [quark-sphinx-theme] 04/07: merge patched into master

[Felix Krull]

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

fkrull-guest pushed a commit to branch master
in repository quark-sphinx-theme.

commit de00a18dafe3e34a2e3d41abd6d219b619fc0bcf
Merge: a7167ba f5a40d2
Author: Felix Krull <f_krull at gmx.de>
Date:   Tue Oct 18 22:07:10 2016 +0200

    merge patched into master

 LICENSE                                            |  26 ++++
 MANIFEST.in                                        |   9 +-
 PKG-INFO                                           |  18 ++-
 README.rst                                         |  13 ++
 debian/.git-dpm                                    |   6 +-
 .../patches/remove-tests-tinycss-dependency.patch  |  10 +-
 quark_sphinx_theme.egg-info/SOURCES.txt            |  46 ------
 setup.py                                           |  15 +-
 .../quark_sphinx_theme.egg-info}/PKG-INFO          |  18 ++-
 src/quark_sphinx_theme.egg-info/SOURCES.txt        |  49 +++++++
 .../dependency_links.txt                           |   0
 .../quark_sphinx_theme.egg-info}/entry_points.txt  |   0
 .../quark_sphinx_theme.egg-info}/not-zip-safe      |   0
 src/quark_sphinx_theme.egg-info/requires.txt       |   1 +
 .../quark_sphinx_theme.egg-info}/top_level.txt     |   0
 .../quark_sphinx_theme}/__init__.py                |   0
 .../quark_sphinx_theme}/__version__.py             |   2 +-
 .../quark_sphinx_theme}/_lovelace.py               |   0
 .../quark_sphinx_theme}/_mixin.py                  |   0
 .../quark_sphinx_theme}/ext/__init__.py            |   0
 .../quark_sphinx_theme}/ext/html_compat.py         |   0
 .../ext/html_rewrite/__init__.py                   |  21 ++-
 .../quark_sphinx_theme}/ext/html_rewrite/boxes.py  |   0
 .../quark_sphinx_theme}/ext/html_rewrite/compat.py |   0
 .../ext/html_rewrite/literal_blocks.py             |   0
 .../quark_sphinx_theme}/quark/domainindex.html     |   0
 .../quark_sphinx_theme}/quark/genindex-single.html |   0
 .../quark_sphinx_theme}/quark/genindex.html        |   0
 .../quark_sphinx_theme}/quark/layout.html          |   0
 .../quark_sphinx_theme}/quark/static/quark.css_t   |  81 +++++++----
 .../quark_sphinx_theme}/quark/theme.conf           |   0
 test/test_core.py                                  |   8 +-
 test/test_html_rewrite.py                          |  61 ++++++--
 test/test_import.py                                |  10 +-
 test/test_mixin.py                                 |  13 +-
 test/test_sdist.py                                 | 160 +++++++++++++++++++++
 test/test_theme.py                                 |  12 +-
 test/util.py                                       |  98 ++++++++-----
 tox.ini                                            |  23 +--
 39 files changed, 534 insertions(+), 166 deletions(-)

diff --cc debian/.git-dpm
index 16f968a,0000000..0adad31
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
- 6aae827c57d83f53cc7e7828cd1528a3448fb5f4
- 6aae827c57d83f53cc7e7828cd1528a3448fb5f4
- c16fde27246052a33c5a4db137dc883589a943e1
++f5a40d22993a0dae46151c40a5d6c2f53b98a4da
++f5a40d22993a0dae46151c40a5d6c2f53b98a4da
++c8c1b531f8ff473e439ca0a27f178c85a65d6194
 +c8c1b531f8ff473e439ca0a27f178c85a65d6194
 +quark-sphinx-theme_0.4.0.orig.tar.bz2
 +20cd9a5bcd42b43d6a822046f0b877b187661f88
 +17358
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-tests-tinycss-dependency.patch
index 35eb969,0000000..fd23a7e
mode 100644,000000..100644
--- a/debian/patches/remove-tests-tinycss-dependency.patch
+++ b/debian/patches/remove-tests-tinycss-dependency.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 6aae827c57d83f53cc7e7828cd1528a3448fb5f4 Mon Sep 17 00:00:00 2001
++From f5a40d22993a0dae46151c40a5d6c2f53b98a4da Mon Sep 17 00:00:00 2001
 +From: Felix Krull <f_krull at gmx.de>
 +Date: Fri, 22 Jul 2016 01:20:43 +0200
 +Subject: Remove the tests' dependency on tinycss.
 +
 +Forwarded: not-needed
 +Patch-Name: remove-tests-tinycss-dependency.patch
 +---
 + setup.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index cca1a0c..c26f2d1 100644
++index a64c57a..7385d56 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -43,5 +43,5 @@ setup(
++@@ -48,5 +48,5 @@ setup(
 +     },
 + 
 +     test_suite='test',
- -    tests_require=['sphinx', 'html5lib', 'tinycss'],
- +    tests_require=['sphinx', 'html5lib'],
++-    tests_require=['html5lib', 'tinycss'],
+++    tests_require=['html5lib'],
 + )

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