Re-order setup and pin dirtyfields

diff --git a/Dockerfile b/Dockerfile
index ecdbfece5f6d5790f097949a682de31f2dec9963..5480650d34316e43ef531a33669de92fdadf08a8 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,14 +30,14 @@ RUN chown www-data:www-data $PYTHON_EGG_CACHE
 COPY . /srv/src/telemeta
 WORKDIR /srv/src/telemeta
 
-# Install Telemeta
-RUN pip install -r requirements.txt
-RUN pip install -r requirements-dev.txt --src /srv/src
-
 # Install Timeside and plugins from ./lib
 COPY ./app/scripts/setup_plugins.sh /srv/app/scripts/setup_plugins.sh
 COPY ./lib/ /srv/src/plugins/
 RUN /bin/bash /srv/app/scripts/setup_plugins.sh
 
+# Install Telemeta
+RUN pip install -r requirements.txt
+RUN pip install -r requirements-dev.txt --src /srv/src
+
 WORKDIR /srv/app
 EXPOSE 8000

diff --git a/doc/themes/pelican-bootstrap3 b/doc/themes/pelican-bootstrap3
index 0d473861e930e91a4a85a1770d926a62c05b8268..13ffdfdca0b81fab654d4f464c59c19852640ddb 160000 (submodule)
--- a/doc/themes/pelican-bootstrap3
+++ b/doc/themes/pelican-bootstrap3
@@ -1 +1 @@
-Subproject commit 0d473861e930e91a4a85a1770d926a62c05b8268
+Subproject commit 13ffdfdca0b81fab654d4f464c59c19852640ddb

diff --git a/setup.py b/setup.py
index fbd333929da71b6e655499672b6fa7137d98af10..bad798beb60dd3263f3d0930c9507a757cff32d4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ setup(
         'django-environ',
         'redis',
         'Werkzeug',
-        'django-dirtyfields',
+        'django-dirtyfields==1.2.1',
         'sqlparse==0.1.19'
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],

diff --git a/telemeta/pages b/telemeta/pages
index 47aec4d02719d4df3eef2fc0aa58a0a3ede2972e..c2a0f19625f44ab2c3050b7784382ac7eb6939b0 160000 (submodule)
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit 47aec4d02719d4df3eef2fc0aa58a0a3ede2972e
+Subproject commit c2a0f19625f44ab2c3050b7784382ac7eb6939b0