Merge branch 'master' of github.com:glic3rinu/django-orchestra

This commit is contained in:
Marc Aymerich 2016-01-11 10:23:31 +00:00
commit a3211ef188
3 changed files with 4 additions and 10 deletions

View File

@ -5,7 +5,7 @@ Django-orchestra ships with a set of management commands for automating some of
These commands are meant to be run within a **clean** Debian-like distribution, you should be specially careful while following this guide on a customized system. These commands are meant to be run within a **clean** Debian-like distribution, you should be specially careful while following this guide on a customized system.
Django-orchestra can be installed on any Linux system, however it is **strongly recommended** to chose the reference platform for your deployment (Debian 8.0 jessie and Python 3.4). Django-orchestra can be installed on any Linux system, however it is **strongly recommended** to chose the reference platform for your deployment (Debian 8.0 Jessie and Python 3.4).
1. Create a system user for running Orchestra 1. Create a system user for running Orchestra
@ -19,9 +19,7 @@ Django-orchestra can be installed on any Linux system, however it is **strongly
2. Install django-orchestra's source code 2. Install django-orchestra's source code
```bash ```bash
sudo apt-get install python3-pip sudo apt-get install python3-pip
sudo pip3 install django-orchestra==dev \ sudo pip3 install http://git.io/django-orchestra-dev
--allow-external django-orchestra \
--allow-unverified django-orchestra
``` ```
3. Install requirements 3. Install requirements

View File

@ -38,9 +38,7 @@ python3 -mvenv env-django-orchestra
source env-django-orchestra/bin/activate source env-django-orchestra/bin/activate
# Install Orchestra and its dependencies # Install Orchestra and its dependencies
pip3 install django-orchestra==dev \ pip3 install http://git.io/django-orchestra-dev
--allow-external django-orchestra \
--allow-unverified django-orchestra
# The only non-pip required dependency for runing pip3 install is python3-dev # The only non-pip required dependency for runing pip3 install is python3-dev
sudo apt-get install python3-dev sudo apt-get install python3-dev
pip3 install -r http://git.io/orchestra-requirements.txt pip3 install -r http://git.io/orchestra-requirements.txt

View File

@ -70,9 +70,7 @@ function install_orchestra () {
run sudo orchestra-admin install_requirements --testing run sudo orchestra-admin install_requirements --testing
else else
# Install from pip # Install from pip
run sudo pip3 install django-orchestra==dev \ run sudo pip3 install http://git.io/django-orchestra-dev
--allow-external django-orchestra \
--allow-unverified django-orchestra
run sudo orchestra-admin install_requirements run sudo orchestra-admin install_requirements
fi fi
} }