Merge branch 'develop' of github.com:ic-labs/django-icekit into develop

Author: Greg Turner

.editorconfig

@@ -15,7 +15,7 @@ end_of_line = crlf
 indent_size = 2
 indent_style = tab
 
-[*.py]
+[*.{md,py}]
 indent_style = space
 
 [*.sh]

Dockerfile

@@ -43,7 +43,7 @@ WORKDIR /opt/django-icekit/
 RUN wget -nv -O - https://bootstrap.pypa.io/get-pip.py | python
 
 COPY requirements.txt setup.py /opt/django-icekit/
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt -U
 RUN touch requirements-local.txt
 RUN md5sum requirements.txt requirements-local.txt > requirements.md5
 

docs/changelog.md

@@ -8,6 +8,19 @@
     content plugin available (which renders a grid of thumbnails into a
     lightbox).
 
+Breaking changes:
+
+  * The initial migration for `icekit.plugins.slideshow` had the wrong database
+    table name, which meant that the `0004_auto_20160821_2140` migration would
+    not have correctly renamed the database table when upgrading to `>=0.10`
+    from an earlier version.
+
+    To fix this, run the following SQL manually:
+
+        ALTER TABLE "slideshow_slideshow" RENAME TO "icekit_plugins_slideshow_slideshow";
+
+    If you have yet to upgrade from `<0.10`, you don't need to do anything.
+
 ## 0.15 (27 September 2016)
 
   * Improvements to publishing to make it accomodate more types of content.

icekit/bin/entrypoint.sh

@@ -80,6 +80,9 @@ export BASE_SETTINGS_MODULE="${BASE_SETTINGS_MODULE:-develop}"
 # Get number of CPU cores, so we know how many processes to run.
 export CPU_CORES=$(python -c 'import multiprocessing; print multiprocessing.cpu_count();')
 
+# Place GPG home directory in project directory.
+export GNUPGHOME="$ICEKIT_PROJECT_DIR/.gnupg"
+
 # Get absolute directory for the `icekit` package.
 export ICEKIT_DIR=$(python -c 'import icekit, os; print os.path.abspath(os.path.dirname(icekit.__file__));')
 

icekit/bin/setup-git-secret.sh

@@ -11,9 +11,6 @@ set -e
 
 cd "$ICEKIT_PROJECT_DIR"
 
-# Place GPG home directory in project directory.
-export GNUPGHOME="$ICEKIT_PROJECT_DIR/.gnupg"
-
 # Derive a fictitious email address for the encryption key.
 export GPG_EMAIL="${GPG_EMAIL:-git-secret@$ICEKIT_PROJECT_NAME.icekit.interaction.net.au}"
 

icekit/bin/transfer.sh

@@ -4,10 +4,10 @@ set -e
 
 if [ $# -eq 0 ]; then
 	cat <<-EOF
-Usage:
-	$(basename "$0") /tmp/test.md
-	cat /tmp/test.md | $(basename "$0") test.md
-EOF
+	Usage:
+		$(basename "$0") /tmp/test.md
+		cat /tmp/test.md | $(basename "$0") test.md
+	EOF
 	exit 1
 fi
 

icekit/layouts/templates/icekit/layouts/home.html

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
                 ('show_title', models.BooleanField(default=False, help_text='Should the title of the slide show be displayed?')),
             ],
             options={
-                'db_table': 'icekit_plugins_slideshow_slideshow'
+                'db_table': 'slideshow_slideshow'
             },
             bases=(models.Model,),
         ),

icekit/layouts/templates/icekit/layouts/sidebar.html

@@ -1,12 +1,15 @@
 from django.conf import settings
 
 
-def environment(request):
+def environment(request=None):
     """
-    Add ``COMPRESS_ENABLED`` to the context.
+    Return ``COMPRESS_ENABLED``, ``SITE_NAME``, and any settings listed
+    in ``ICEKIT_CONTEXT_PROCESSOR_SETTINGS`` as context.
     """
     context = {
         'COMPRESS_ENABLED': settings.COMPRESS_ENABLED,
         'SITE_NAME': settings.SITE_NAME,
     }
+    for key in settings.ICEKIT_CONTEXT_PROCESSOR_SETTINGS:
+        context[key] = getattr(settings, key, None)
     return context