Move plugins into repo and set the current year as the main site

pelicanconf.py

@@ -1,26 +1,49 @@
 # -*- coding: utf-8 -*-
-import datetime
 import os
-import sys
+from datetime import datetime
+
+
+AUTHOR = "Sam Black"
+SITENAME = "samwwwblack's Blog"
+SITEURL = "https://samwwwblack.lapwing.org"
+FEED_DOMAIN = SITEURL
+
+ABOUT_ME = """
+Will eventually figure out I don't have the time to write all my own software.
+"""
+
+openid = "https://openid.lapwing.org"
+OPENID = {"openid": openid,
+          "openid2": openid,
+          #"delegate": "https://samwwwblack.lapwing.org",
+          "xrds": openid + "/xrds",
+          "username": "samwwwblack"}
+
+DEFAULT_LANG = u"en"
+TIMEZONE = "Europe/London"
+
+# Blogroll
+LINKS = ()
+
+# Social widget
+SOCIAL = (("identi.ca", "https://identi.ca/samwwwblack"),
+          ("Code", "https://code.lapwing.org"),)
+
+
+# ================== DO NOT EDIT BELOW THIS LINE ==============================
 
 CONFIG_FILE_PATH = os.path.dirname(os.path.abspath(__file__))
-PLUGIN_PATHS = [os.path.abspath(os.path.join(CONFIG_FILE_PATH,
-                                             "../pelican-plugins"))]
 THEME_PATH = os.path.abspath(os.path.join(CONFIG_FILE_PATH, "theme",
                                           "pelican-uikit3-lapwingorg"))
+PLUGIN_PATHS = [os.path.abspath(os.path.join(THEME_PATH, "plugins"))]
 
-AUTHOR = u"Sam Black"
-SITENAME = u"samwwwblack's Blog"
-#SITESUBTITLE = u"geek slowly going mad"
-SITEURL = "https://samwwwblack.lapwing.org"
-FEED_DOMAIN = SITEURL
+PLUGINS = ["related_posts", "html_rst_directive"]
 
 # Override this in publishconf.py
 RELATIVE_URLS = True
 
-ABOUT_ME = """
-Will eventually figure out I don't have the time to write all my own software.
-"""
+TYPOGRIFY = True
+USE_PAGER = True
 
 FEED_ATOM = "feeds/atom.xml"
 FEED_ALL_ATOM = "feeds/all.atom.xml"
@@ -35,6 +58,8 @@ TAG_FEED_RSS = None
 ARTICLE_URL = "posts/{date:%Y}/{date:%b}/{slug}/"
 ARTICLE_SAVE_AS = "posts/{date:%Y}/{date:%b}/{slug}/index.html"
 
+DEFAULT_PAGINATION = 5
+
 THEME = THEME_PATH
 PYGMENTS_STYLE = "default"
 FAVICON = "favicon.ico"
@@ -43,29 +68,8 @@ DISPLAY_CATEGORIES_ON_MENU = False
 DISPLAY_TAGS_INLINE = True
 DOCUTIL_CSS = True
 CC_LICENSE = "CC-BY-SA"
-CURRENT_YEAR = datetime.date.today().strftime("%Y")
-
-openid = "https://openid.lapwing.org"
-OPENID = {"openid": openid,
-          "openid2": openid,
-          #"delegate": "https://samwwwblack.lapwing.org",
-          "xrds": openid + "/xrds",
-          "username": "samwwwblack"}
-
-TYPOGRIFY = True
-USE_PAGER = True
-
-TIMEZONE = "Europe/London"
-
-DEFAULT_LANG = u"en"
-
-PLUGINS = ["related_posts", "html_rst_directive"]
 
-# Blogroll
-LINKS = ()
-
-# Social widget
-SOCIAL = (("identi.ca", "https://identi.ca/samwwwblack"),
-          ("Code", "https://code.lapwing.org"),)
-
-DEFAULT_PAGINATION = 5
+# Set the current year to next year if we create the blog after Christmas
+CURRENT_YEAR = datetime.now().year
+if datetime.now() > datetime(CURRENT_YEAR, 12, 25):
+    CURRENT_YEAR += 1