Browse Source

Updated pyramid

Mike Smith 10 years ago
parent
commit
749ac7e5e2

+ 3 - 3
frameworks/Python/pyramid/bash_profile.sh

@@ -1,14 +1,14 @@
-export PY2_ROOT=$TROOT/py2
+export PY2_ROOT=$IROOT/py2
 export PY2=$PY2_ROOT/bin/python
 export PY2_PIP=$PY2_ROOT/bin/pip
 export PY2_GUNICORN=$PY2_ROOT/bin/gunicorn
 
-export PYPY_ROOT=$TROOT/pypy
+export PYPY_ROOT=$IROOT/pypy
 export PYPY=$PYPY_ROOT/bin/python
 export PYPY_PIP=$PYPY_ROOT/bin/pip
 export PYPY_GUNICORN=$PYPY_ROOT/bin/gunicorn
 
-export PY3_ROOT=$TROOT/py3
+export PY3_ROOT=$IROOT/py3
 export PY3=$PY3_ROOT/bin/python3
 export PY3_PIP=$PY3_ROOT/bin/pip3
 export PY3_GUNICORN=$PY3_ROOT/bin/gunicorn

+ 2 - 4
frameworks/Python/pyramid/install.sh

@@ -5,8 +5,6 @@ export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
 
 fw_depends python2 python3
 
-$IROOT/py2/bin/virtualenv $TROOT/py2
-$TROOT/py2/bin/pip install -r $TROOT/requirements.txt
+$PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
 
-$IROOT/py3/bin/python3 -m venv $TROOT/py3
-$TROOT/py3/bin/pip install -r $TROOT/requirements.txt
+$PY3_PIP install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt

+ 2 - 0
frameworks/Python/pyramid/requirements.txt

@@ -4,3 +4,5 @@ meinheld==0.5.6
 SQLAlchemy==0.9.7
 pyramid==1.5.1
 pyramid_chameleon==0.3
+
+greenlet==0.4.4

+ 3 - 0
frameworks/Python/pyramid/setup_py2.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PY2_GUNICORN wsgi:app -c gunicorn_conf.py &

+ 3 - 0
frameworks/Python/pyramid/setup_py3.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PY3_GUNICORN wsgi:app -c gunicorn_conf.py &

+ 3 - 3
frameworks/Python/tornado/bash_profile.sh

@@ -1,14 +1,14 @@
-export PY2_ROOT=$TROOT/py2
+export PY2_ROOT=$IROOT/py2
 export PY2=$PY2_ROOT/bin/python
 export PY2_PIP=$PY2_ROOT/bin/pip
 export PY2_GUNICORN=$PY2_ROOT/bin/gunicorn
 
-export PYPY_ROOT=$TROOT/pypy
+export PYPY_ROOT=$IROOT/pypy
 export PYPY=$PYPY_ROOT/bin/python
 export PYPY_PIP=$PYPY_ROOT/bin/pip
 export PYPY_GUNICORN=$PYPY_ROOT/bin/gunicorn
 
-export PY3_ROOT=$TROOT/py3
+export PY3_ROOT=$IROOT/py3
 export PY3=$PY3_ROOT/bin/python3
 export PY3_PIP=$PY3_ROOT/bin/pip3
 export PY3_GUNICORN=$PY3_ROOT/bin/gunicorn

+ 2 - 7
frameworks/Python/tornado/install.sh

@@ -5,11 +5,6 @@ export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
 
 fw_depends python2 python3
 
-$IROOT/py2/bin/virtualenv $TROOT/py2
-$TROOT/py2/bin/pip install -r $TROOT/requirements.txt
+$PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
 
-$IROOT/py3/bin/python3 -m venv $TROOT/py3
-$TROOT/py3/bin/pip install -r $TROOT/requirements.txt
-
-#$IROOT/pypy/bin/virtualenv $TROOT/pypy
-#$TROOT/pypy/bin/pip install -r $TROOT/requirements-pypy.txt
+$PY3_PIP install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt

+ 3 - 0
frameworks/Python/tornado/setup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PY2 server.py --port=8080 --mongo=${DBHOST} --logging=error &

+ 3 - 0
frameworks/Python/tornado/setup_pg.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PY2 server.py --port=8080 --postgres=${DBHOST} --logging=error &

+ 3 - 0
frameworks/Python/tornado/setup_py3.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PY3 server.py --port=8080 --mongo=${DBHOST} --logging=error &