Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'prepare_0.1_release'

Browse source
This commit is contained in:
Christopher Neugebauer 2016-04-26 14:41:41 +10:00
commit 7ef5203818
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/integration.rst
View file

@ -11,14 +11,15 @@ The configuration that you'll need to do is minimal. The first piece of developm
Installing Registrasion 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 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 Configuring your Django App

1
requirements/base.txt
View file

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

1
requirements/dependencies.txt Normal file
View file

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

2
requirements/extern.txt
View file

@ -1,4 +1,4 @@
# Requirements that currently live in git land, so are necessary to make the # Requirements that currently live in git land, so are necessary to make the
# project build, but can't live in setup.py # 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

2
setup.py
View file

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