[Python-modules-commits] [cloud-sptheme] 03/10: Move themes to /usr/share

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository cloud-sptheme.

commit 4ef050a1e59e1d41901a3c178fcb4134d080f3bd
Author: Nicolas Dandrimont <olasd at debian.org>
Date:   Thu Oct 8 08:41:07 2015 -0700

    Move themes to /usr/share
    
    Forwarded: not-needed
    
    Patch-Name: 0001-move-themes-to-usr-share.patch
---
 cloud_sptheme/__init__.py | 2 +-
 docs/conf.py              | 2 +-
 setup.py                  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloud_sptheme/__init__.py b/cloud_sptheme/__init__.py
index d62ce10..b117d70 100644
--- a/cloud_sptheme/__init__.py
+++ b/cloud_sptheme/__init__.py
@@ -60,7 +60,7 @@ def get_theme_dir():
         As of Sphinx 1.2, this is passed to Sphinx via a ``setup.py`` entry point,
         and no longer needs to be included in your documentation's ``conf.py``.
     """
-    return os.path.join(_root_dir, "themes")
+    return "/usr/share/sphinx/themes"
 
 def get_version(release):
     """Derive short version string from longer 'release' string.
diff --git a/docs/conf.py b/docs/conf.py
index 2f6a524..ac78edd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -141,7 +141,7 @@ if csp.is_cloud_theme(html_theme):
     )
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [csp.get_theme_dir()]
+html_theme_path = [os.path.join(os.path.abspath(os.pardir), "cloud_sptheme", "themes")]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/setup.py b/setup.py
index 5e81390..04bb298 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,6 @@ if os.environ.get("CLOUD_SETUP_TAG_RELEASE", "y").lower() in "yes y true t 1".sp
 setup(
     #package info
     packages = find_packages(),
-    package_data = { "cloud_sptheme": ["themes/*/*.*", "themes/*/static/*.*", "ext/*.css"] },
     zip_safe=False,
 
     install_requires=["sphinx>=1.4"],

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