From 2580584597b5a16a5e0f096ddf93d0b9c318f0d4 Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Fri, 29 Sep 2017 23:13:37 +1000
Subject: [PATCH] Prepare to use the newly-revendored registrasion

---
 README.rst                                       |  7 ++++---
 docker/Dockerfile                                |  2 ++
 docker/Dockerfile.makemigrations                 |  3 +++
 .../migrations/0007_merge_20170929_2259.py       | 16 ++++++++++++++++
 vendored_requirements.txt                        |  1 +
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 vendor/registrasion/registrasion/migrations/0007_merge_20170929_2259.py
 create mode 100644 vendored_requirements.txt

diff --git a/README.rst b/README.rst
index 187a15cf..8f3fc64c 100644
--- a/README.rst
+++ b/README.rst
@@ -80,9 +80,10 @@ version of pip than is packaged with distros virtualenv.
 Note that this application is python 3 only so you must create your virtualenv
 with a python3 interpreter.
 
-- ``virtualenv -p `which python3` venv``
+- ``python3 -m venv venv``
 - ``source ./venv/bin/activate``
 - ``pip install -c constraints.txt -r requirements.txt``
+- ``pip install -c constraints.txt -r vendored_requirements.txt``
 
 Once your dev instance is up and running
 ----------------------------------------
@@ -138,7 +139,7 @@ admin3:XzynbNH9Sw3pLPXe
 Creating review permissions objects
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Some more voodoo magic that needs to be manually run because that's just how symposion works.
-This creates the permission that needs to be applied to a user/group/team to be able to see the review sections of the site.
+After conference Sections have been created, this command will add
+Permission objects for those sections.
 
 ``./manage.py create_review_permissions``
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9d24545c..baf81ccd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -35,6 +35,8 @@ RUN set -ex \
 COPY . /app/symposion_app
 
 WORKDIR /app/symposion_app
+RUN set -x \
+    && pip install -r vendored_requirements.txt -c /reqs/constraints.txt
 RUN set -x \
     && DJANGO_SECRET_KEY=1234 STRIPE_PUBLIC_KEY=1234 STRIPE_SECRET_KEY=1234 \
        DATABASE_URL="sqlite:////dev/null" \
diff --git a/docker/Dockerfile.makemigrations b/docker/Dockerfile.makemigrations
index 5cf1dfeb..d64f416d 100644
--- a/docker/Dockerfile.makemigrations
+++ b/docker/Dockerfile.makemigrations
@@ -18,5 +18,8 @@ RUN set -ex \
     && apt-get install -y git xmlsec1 libmysqlclient18 \
     && apt-get install -y $buildDeps --no-install-recommends
 RUN pip install -c /setup/constraints.txt -r /setup/requirements.txt
+COPY . /source
+WORKDIR /source
+RUN pip install -c /setup/constraints.txt -r /source/vendored_requirements.txt
 ENTRYPOINT ["python","/source/manage.py", "makemigrations"]
 
diff --git a/vendor/registrasion/registrasion/migrations/0007_merge_20170929_2259.py b/vendor/registrasion/registrasion/migrations/0007_merge_20170929_2259.py
new file mode 100644
index 00000000..bcd52f24
--- /dev/null
+++ b/vendor/registrasion/registrasion/migrations/0007_merge_20170929_2259.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-29 12:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('registrasion', '0006_auto_20170526_1624'),
+        ('registrasion', '0006_auto_20170702_2233'),
+    ]
+
+    operations = [
+    ]
diff --git a/vendored_requirements.txt b/vendored_requirements.txt
new file mode 100644
index 00000000..99e409a2
--- /dev/null
+++ b/vendored_requirements.txt
@@ -0,0 +1 @@
+vendor/registrasion