Move plugins site to a subdirectory

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 8, 2017 · e45402a · e45402a
1 parent 0ed7d77
commit e45402a
Show file tree

Hide file tree

Showing 44 changed files with 10 additions and 8 deletions.
diff --git a/plugins/pkgindex b/plugins/pkgindex
diff --git a/plugins/pkgindex_compiler b/plugins/pkgindex_compiler
diff --git a/plugins/pkgindex_scan b/plugins/pkgindex_scan
diff --git a/plugins/pkgindex_zip b/plugins/pkgindex_zip
diff --git a/conf.py → site/conf.py b/conf.py → site/conf.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import unicode_literals
-import time
 
 # !! This is the configuration of Nikola. !! #
 # !!  You should edit it to your liking.  !! #
@@ -47,7 +46,7 @@
 )
 
 # Output folder -- change if using locally
-OUTPUT_FOLDER = '/srv/www/plugins.getnikola.com:80'
+# OUTPUT_FOLDER = '/srv/www/plugins.getnikola.com:80'
 
 # Nikola is multilingual!
 #

diff --git a/files/__data__/book-figure-screenshot.png → ...files/__data__/book-figure-screenshot.png b/files/__data__/book-figure-screenshot.png → ...files/__data__/book-figure-screenshot.png
diff --git a/files/__data__/link-figure-screenshot.png → ...files/__data__/link-figure-screenshot.png b/files/__data__/link-figure-screenshot.png → ...files/__data__/link-figure-screenshot.png
diff --git a/.../__data__/publication-list-screenshot.png → .../__data__/publication-list-screenshot.png b/.../__data__/publication-list-screenshot.png → .../__data__/publication-list-screenshot.png
diff --git a/files/assets/css/custom.css → site/files/assets/css/custom.css b/files/assets/css/custom.css → site/files/assets/css/custom.css
diff --git a/files/assets/css/pkgindex.css → site/files/assets/css/pkgindex.css b/files/assets/css/pkgindex.css → site/files/assets/css/pkgindex.css
diff --git a/files/assets/js/pkgindex.js → site/files/assets/js/pkgindex.js b/files/assets/js/pkgindex.js → site/files/assets/js/pkgindex.js
diff --git a/pages/categories/Command.rst → site/pages/categories/Command.rst b/pages/categories/Command.rst → site/pages/categories/Command.rst
diff --git a/pages/categories/Compiler.rst → site/pages/categories/Compiler.rst b/pages/categories/Compiler.rst → site/pages/categories/Compiler.rst
diff --git a/pages/categories/CompilerExtension.rst → site/pages/categories/CompilerExtension.rst b/pages/categories/CompilerExtension.rst → site/pages/categories/CompilerExtension.rst
diff --git a/pages/categories/ConfigPlugin.rst → site/pages/categories/ConfigPlugin.rst b/pages/categories/ConfigPlugin.rst → site/pages/categories/ConfigPlugin.rst
diff --git a/pages/categories/LateTask.rst → site/pages/categories/LateTask.rst b/pages/categories/LateTask.rst → site/pages/categories/LateTask.rst
diff --git a/pages/categories/PostScanner.rst → site/pages/categories/PostScanner.rst b/pages/categories/PostScanner.rst → site/pages/categories/PostScanner.rst
diff --git a/pages/categories/ShortcodePlugin.rst → site/pages/categories/ShortcodePlugin.rst b/pages/categories/ShortcodePlugin.rst → site/pages/categories/ShortcodePlugin.rst
diff --git a/pages/categories/SignalHandler.rst → site/pages/categories/SignalHandler.rst b/pages/categories/SignalHandler.rst → site/pages/categories/SignalHandler.rst
diff --git a/pages/categories/Task.rst → site/pages/categories/Task.rst b/pages/categories/Task.rst → site/pages/categories/Task.rst
diff --git a/pages/categories/TaskMultiplier.rst → site/pages/categories/TaskMultiplier.rst b/pages/categories/TaskMultiplier.rst → site/pages/categories/TaskMultiplier.rst
diff --git a/pages/categories/TemplateSystem.rst → site/pages/categories/TemplateSystem.rst b/pages/categories/TemplateSystem.rst → site/pages/categories/TemplateSystem.rst
diff --git a/pages/categories/gen.py → site/pages/categories/gen.py b/pages/categories/gen.py → site/pages/categories/gen.py
diff --git a/pages/categories/index.rst → site/pages/categories/index.rst b/pages/categories/index.rst → site/pages/categories/index.rst
diff --git a/pages/index.rst → site/pages/index.rst b/pages/index.rst → site/pages/index.rst
diff --git a/pages/sidemenu.rst → site/pages/sidemenu.rst b/pages/sidemenu.rst → site/pages/sidemenu.rst
diff --git a/pages/v7.rst → site/pages/v7.rst b/pages/v7.rst → site/pages/v7.rst
diff --git a/plugins/__init__.py → site/plugins/__init__.py b/plugins/__init__.py → site/plugins/__init__.py
diff --git a/site/plugins/pkgindex b/site/plugins/pkgindex
@@ -0,0 +1 @@
+../../v7/pkgindex
diff --git a/site/plugins/pkgindex_compiler b/site/plugins/pkgindex_compiler
@@ -0,0 +1 @@
+../../v7/pkgindex_compiler
diff --git a/site/plugins/pkgindex_scan b/site/plugins/pkgindex_scan
@@ -0,0 +1 @@
+../../v7/pkgindex_scan
diff --git a/site/plugins/pkgindex_zip b/site/plugins/pkgindex_zip
@@ -0,0 +1 @@
+../../v7/pkgindex_zip
diff --git a/site-requirements.txt → site/site-requirements.txt b/site-requirements.txt → site/site-requirements.txt
diff --git a/templates/base.tmpl → site/templates/base.tmpl b/templates/base.tmpl → site/templates/base.tmpl
diff --git a/templates/generic_post_list.tmpl → site/templates/generic_post_list.tmpl b/templates/generic_post_list.tmpl → site/templates/generic_post_list.tmpl
diff --git a/templates/plugin.tmpl → site/templates/plugin.tmpl b/templates/plugin.tmpl → site/templates/plugin.tmpl
diff --git a/templates/plugin_list.tmpl → site/templates/plugin_list.tmpl b/templates/plugin_list.tmpl → site/templates/plugin_list.tmpl
diff --git a/templates/sidemenu.tmpl → site/templates/sidemenu.tmpl b/templates/sidemenu.tmpl → site/templates/sidemenu.tmpl
diff --git a/templates/sidemenu_list.tmpl → site/templates/sidemenu_list.tmpl b/templates/sidemenu_list.tmpl → site/templates/sidemenu_list.tmpl
diff --git a/themes/cerulean/assets/css/bootstrap.css → .../themes/cerulean/assets/css/bootstrap.css b/themes/cerulean/assets/css/bootstrap.css → .../themes/cerulean/assets/css/bootstrap.css
diff --git a/themes/cerulean/assets/css/bootstrap.min.css → ...mes/cerulean/assets/css/bootstrap.min.css b/themes/cerulean/assets/css/bootstrap.min.css → ...mes/cerulean/assets/css/bootstrap.min.css
diff --git a/themes/cerulean/parent → site/themes/cerulean/parent b/themes/cerulean/parent → site/themes/cerulean/parent
diff --git a/site/v7 b/site/v7
@@ -0,0 +1 @@
+../v7
diff --git a/v7/pkgindex_compiler/pkgindex_compiler.py b/v7/pkgindex_compiler/pkgindex_compiler.py
@@ -43,6 +43,8 @@ def dirname_as_title(post, pkg_dir, config):
 
 
 def _version_from_path(path):
+    if path.startswith('../'):
+        path = path[3:]
     return int(path.split('/')[0].split('v')[-1])
 
 
@@ -99,7 +101,7 @@ def parse_plugin_file(post, pkg_dir, config):
 
             data['tests'] = _cp_try_get(c, 'Core', 'Tests')
         except Exception as e:
-            raise Exception('Exception while reading plugin config "{0}": {1}'.format(ini, e))
+            raise Exception('Exception while reading plugin config "{0}": {1}'.format(ini, e)) from e
     else:
         raise ValueError('Plugin {0} has no .plugin file in the main '
                          'directory.'.format(plugin))
@@ -169,7 +171,7 @@ def set_site(self, site):
         """Set site for the compiler."""
         # Workaround for plugins site (which includes those plugins, and makes
         # tests fail)
-        if 'PKGINDEX_CONFIG' in self.config:
+        if 'PKGINDEX_CONFIG' in site.config:
             self.config = site.config['PKGINDEX_CONFIG']
             self.pi_enabled = True
         super(CompilePackageIndexEntries, self).set_site(site)