From 7c6908a66e457b678b69c42810e6aa9a8a7b2dcd Mon Sep 17 00:00:00 2001 From: Daniele Procida Date: Tue, 20 May 2014 23:20:37 +0200 Subject: [PATCH] Update setup.py --- REQUIREMENTS.txt | 5 ++--- docs/getting_started/installation.rst | 2 ++ setup.py | 6 ------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 9737c27c..a6a24c7b 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,4 +1,3 @@ -# -e hg+https://bitbucket.org/evildmp/semanticeditor#egg=semanticeditor - -# -e git+https://github.com/evildmp/django-widgetry.git#egg=django-widgetry +-e git+https://github.com/evildmp/django-widgetry.git@master#egg=django-widgetry-evildmp +-e git+https://github.com/evildmp/django-chained-selectbox.git@master#egg=django-chained-select-box-evildmp diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst index 504f73d8..85bc69ec 100644 --- a/docs/getting_started/installation.rst +++ b/docs/getting_started/installation.rst @@ -32,6 +32,8 @@ Install PIP components # install Arkestra & dependencies pip install -e git+https://github.com/evildmp/Arkestra.git@develop#egg=Arkestra + # install the things that pip can't do automatically + pip install -r src/arkestra/REQUIREMENTS.txt From this point you can wrestle Arkestra into submission on your own, or get started using the `example` project included. diff --git a/setup.py b/setup.py index 52b34a5c..e9c0372f 100644 --- a/setup.py +++ b/setup.py @@ -23,11 +23,5 @@ 'django-pagination', 'django-easyfilters', 'django-treeadmin', - 'django-widgetry', - 'django-chained-selectbox', - ], - dependency_links=[ - 'https://github.com/evildmp/django-widgetry/archive/improve-link-schema.zip#egg=django-widgetry-evildmp', - 'https://github.com/evildmp/django-chained-selectbox/archive/fk-compatibility.zip#egg=django_chained_selectbox-evildmp', ], )