use python3 by default

This commit is contained in:
j 2017-02-16 13:49:22 +01:00
parent fde4734cd4
commit 196208e544
3 changed files with 19 additions and 19 deletions

View File

@ -11,7 +11,7 @@
To run pan.do/ra you need to install and setup:
python
python 3.5
postgres
nginx (or apache2)
additinal video packages
@ -28,12 +28,12 @@
2) install all required packages
apt-get install git subversion mercurial \
python-setuptools python-pip python-virtualenv ipython \
python-dev python-pil python-numpy python-psycopg2 \
python-geoip python-html5lib python-lxml \
python3-setuptools python3-pip python3-virtualenv ipython3 \
python3-dev python3-pil python3-numpy python3-psycopg2 \
python3-geoip python3-html5lib python3-lxml \
postgresql postgresql-contrib rabbitmq-server \
poppler-utils mkvtoolnix gpac imagemagick \
python-ox oxframe ffmpeg
python3-ox oxframe ffmpeg
## Prepare Environment

2
ctl
View File

@ -9,7 +9,7 @@ fi
if [ "$action" = "init" ]; then
cd "`dirname "$0"`"
BASE=`pwd`
virtualenv --system-site-packages .
virtualenv --system-site-packages -p /usr/bin/python3 .
if [ ! -d static/oxjs ]; then
git clone --depth 1 https://git.0x2620.org/oxjs.git static/oxjs
fi

View File

@ -51,18 +51,18 @@ apt-get install -y \
nginx \
rabbitmq-server \
git \
python-setuptools \
python-pip \
python-virtualenv \
python-dev \
python-pil \
python-numpy \
python-psycopg2 \
python-pyinotify \
python-simplejson \
python-lxml \
python-html5lib \
python-ox \
python3-setuptools \
python3-pip \
python3-virtualenv \
python3-dev \
python3-pil \
python3-numpy \
python3-psycopg2 \
python3-pyinotify \
python3-simplejson \
python3-lxml \
python3-html5lib \
python3-ox \
oxframe \
ffmpeg \
mkvtoolnix \
@ -70,7 +70,7 @@ apt-get install -y \
imagemagick \
poppler-utils \
youtube-dl \
ipython \
ipython3 \
postfix \
postgresql \
postgresql-contrib