From 0efd9e146a6453469ba49b77b8bd10da5a5027b7 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 26 Apr 2016 14:29:57 +1000 Subject: [PATCH 1/2] =?UTF-8?q?Makes=20Registrasion=E2=80=99s=20dependenci?= =?UTF-8?q?es=20fully=20installable=20through=20-=E2=80=94process-dependen?= =?UTF-8?q?cy-links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/base.txt | 1 + requirements/dependencies.txt | 1 + requirements/extern.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 requirements/dependencies.txt diff --git a/requirements/base.txt b/requirements/base.txt index 25c5df9b..c98ec0dd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1 +1,2 @@ django-nested-admin==2.2.6 +SymposionMaster==1.0.0b3-dev diff --git a/requirements/dependencies.txt b/requirements/dependencies.txt new file mode 100644 index 00000000..2d418ca1 --- /dev/null +++ b/requirements/dependencies.txt @@ -0,0 +1 @@ +https://github.com/pinax/symposion/tarball/ad81810#egg=SymposionMaster-1.0.0b3-dev diff --git a/requirements/extern.txt b/requirements/extern.txt index 3dc3c610..f9f15786 100644 --- a/requirements/extern.txt +++ b/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 diff --git a/setup.py b/setup.py index 6686b6fb..531c35bb 100644 --- a/setup.py +++ b/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(), ) From a7d4e042360dc4fdd1aeb2d90f01697177cf5113 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 26 Apr 2016 14:41:34 +1000 Subject: [PATCH 2/2] Installation documentation is now accurate --- docs/integration.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/integration.rst b/docs/integration.rst index aebfa2f8..ffbb5c25 100644 --- a/docs/integration.rst +++ b/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