0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

use python3 by default

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

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

2
ctl
View file

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

26
vm/pandora_install.sh
View file

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