Get the theme location via entry_points

d0ugal · May 18, 2015 · b3693b2 · b3693b2
1 parent 9d95d7d
commit b3693b2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/mkdocs/config/config_options.py b/mkdocs/config/config_options.py
@@ -188,7 +188,7 @@ def post_validation(self, config, key_name):
 
         package_dir = os.path.abspath(
             os.path.join(os.path.dirname(__file__), '..'))
-        theme_dir = [os.path.join(package_dir, 'themes', config['theme']), ]
+        theme_dir = [utils.get_themes()[config['theme']], ]
         config['mkdocs_templates'] = os.path.join(package_dir, 'templates')
 
         if config['theme_dir'] is not None:

diff --git a/mkdocs/tests/config/config_tests.py b/mkdocs/tests/config/config_tests.py
@@ -100,7 +100,7 @@ def test_theme(self):
             dict(),  # default theme
             {"theme": "readthedocs"},  # builtin theme
             {"theme_dir": mytheme},  # custom only
-            {"theme": "cosmo", "theme_dir": custom},  # builtin and custom
+            {"theme": "readthedocs", "theme_dir": custom},  # builtin and custom
         ]
 
         abs_path = os.path.abspath(os.path.dirname(__file__))
@@ -113,7 +113,7 @@ def test_theme(self):
             [os.path.join(theme_dir, 'mkdocs'), search_asset_dir],
             [os.path.join(theme_dir, 'readthedocs'), search_asset_dir],
             [mytheme, search_asset_dir],
-            [custom, os.path.join(theme_dir, 'cosmo'), search_asset_dir],
+            [custom, os.path.join(theme_dir, 'readthedocs'), search_asset_dir],
         )
 
         for config_contents, result in six.moves.zip(configs, results):

diff --git a/mkdocs/tests/utils_tests.py b/mkdocs/tests/utils_tests.py
@@ -106,9 +106,7 @@ def test_get_themes(self):
 
         self.assertEqual(
             sorted(utils.get_theme_names()),
-            sorted(['flatly', 'cerulean', 'slate', 'bootstrap', 'yeti',
-                    'spacelab', 'united', 'readable', 'simplex', 'mkdocs',
-                    'cosmo', 'journal', 'cyborg', 'readthedocs', 'amelia']))
+            sorted(['mkdocs', 'readthedocs']))
 
     def test_nest_paths(self):
 

diff --git a/mkdocs/utils.py b/mkdocs/utils.py
@@ -306,9 +306,10 @@ def get_themes():
     themes = {}
 
     for theme in iter_entry_points(group='mkdocs.themes', name=None):
+        name = theme.name
         theme = theme.load()
         location = os.path.dirname(theme.__file__)
-        themes[theme.name] = location
+        themes[name] = location
 
     return themes