Merge branch 'prepare_0.1_release'

docs/integration.rst

@@ -11,14 +11,15 @@ The configuration that you'll need to do is minimal. The first piece of developm
 Installing Registrasion
 -----------------------
 
-Registrasion depends on an in-development version of Symposion. You'll need to add the following two lines to your ``requirements.txt`` files::
+Registrasion depends on an in-development version of Symposion. You'll need to add the following  line to your ``requirements.txt`` files::
 
-    git+https://github.com/pinax/symposion.git@ad81810
     git+https://github.com/chrisjrn/registrasion.git@releases/0.1
 
-Symposion currently specifies Django version 1.9.2.
+And also to enable dependency links in pip::
 
-Running ``pip install -r requirements.txt`` will pull down the git version of Symposion as well as the current 0.1 release of Registrasion.
+    pip install --process-dependency-links -r requirements.txt
+
+Symposion currently specifies Django version 1.9.2. Note that ``pip`` version 1.6 does not support ``--process-dependency-links``, so you'll need to use an earlier, or later version of ``pip``.
 
 
 Configuring your Django App

requirements/base.txt

@@ -1 +1,2 @@
 django-nested-admin==2.2.6
+SymposionMaster==1.0.0b3-dev

requirements/dependencies.txt

@@ -0,0 +1 @@
+https://github.com/pinax/symposion/tarball/ad81810#egg=SymposionMaster-1.0.0b3-dev

requirements/extern.txt

@@ -1,4 +1,4 @@
 # Requirements that currently live in git land, so are necessary to make the
 # project build, but can't live in setup.py
 
--e git+https://github.com/pinax/symposion.git#egg=SymposionMaster # Symposion lives on git at the moment
+-e git+https://github.com/pinax/symposion.git@ad81810#egg=SymposionMaster-1.0.0b3-dev # Symposion lives on git at the moment

setup.py

@@ -14,7 +14,6 @@ def read_file(filename):
     except IOError:
         return ''
 
-
 setup(
     name="registrasion",
     author="Christopher Neugebauer",
@@ -34,4 +33,5 @@ setup(
         "License :: OSI Approved :: Apache Software License",
     ),
     install_requires=read_file("requirements/base.txt").splitlines(),
+    dependency_links=read_file("requirements/dependencies.txt").splitlines(),
 )