diff --git a/LabAdmin/requirements.txt b/LabAdmin/requirements.txt index c360515..5a19b15 100644 --- a/LabAdmin/requirements.txt +++ b/LabAdmin/requirements.txt @@ -1,7 +1,8 @@ -Django==1.10.2 -Pillow==3.4.1 +Django==1.10.5 +Pillow==3.4.2 django-cors-middleware==1.3.1 django-oauth-toolkit==0.10.0 djangorestframework==3.4.7 mysqlclient==1.3.9 +paho-mqtt==1.2 psycopg2==2.6.2 diff --git a/docs/tutorial.md b/docs/tutorial.md index 01ae030..5e9663e 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -70,7 +70,7 @@ From inside the virtual machine we are going to install all requirements. Please note that *mysql-server* will require a password for the root user that you'll need later. ``` -sudo apt install build-essential python3.4 python3.4-dev python-virtualenv libjpeg-dev libpq-dev libmysqlclient-dev git python2.7 mysql-server +sudo apt install build-essential python3 python3-dev python-virtualenv libjpeg-dev libpq-dev libmysqlclient-dev git python2.7 mysql-server sudo apt-get clean ``` @@ -115,10 +115,10 @@ Now as the *labadmin* user we can setup the *labadmin* instance: ``` git clone https://github.com/OfficineArduinoTorino/chatlab -virtualenv -p python3.4 venv +virtualenv -p python3 venv . ./venv/bin/activate pip install -r chatlab/LabAdmin/requirements.txt -pip install https://github.com/FablabTorino/LabAdmin/archive/master.zip +pip install https://github.com/OfficineArduinoTorino/LabAdmin/archive/master.zip mkdir bin cp chatlab/LabAdmin/labadmin bin/