Update python and some frameworks. (#3245)

* Update Python versions

* Update falcon

* Update bottle

* Update cherrypy

* Update wheezyweb

* Update Flask

* Fix Flask-PyPy requirements

* flask: Fix requirements-pypy.txt

* flask: Update requirements

frameworks/Python/.gitignore

@@ -1,6 +1,7 @@
 uwsgi_params
 *.pid
 __pycache__
+!*.lock
 
 # ignore virtual environments
 pyvenv*/

frameworks/Python/bottle/requirements-pypy.txt

@@ -1,7 +1,7 @@
-bottle==0.12.9
+bottle==0.12.13
 bottle-sqlalchemy==0.4.3
-SQLAlchemy==1.0.12
-gunicorn==19.4.5
-PyMySQL==0.7.2
-tornado==4.3
+gunicorn==19.7.1
+PyMySQL==0.8.0
+SQLAlchemy==1.2.2
+tornado==4.5.3
 ujson==1.35

frameworks/Python/bottle/requirements.txt

@@ -1,9 +1,9 @@
 bottle==0.12.9
 bottle-sqlalchemy==0.4.3
-SQLAlchemy==1.0.12
+greenlet==0.4.13
 gunicorn==19.4.5
 meinheld==0.6.1
-mysqlclient==1.3.7
-greenlet==0.4.9
-uwsgi==2.0.12
+mysqlclient==1.3.12
+SQLAlchemy==1.0.12
 ujson==1.35
+uWSGI==2.0.15

frameworks/Python/cherrypy/requirements.txt

@@ -1,3 +1,9 @@
-cherrypy==5.1.0
-SQLAlchemy==1.0.12
-mysqlclient==1.3.7
+cheroot==6.0.0
+CherryPy==13.1.0
+more-itertools==4.1.0
+mysqlclient==1.3.12
+portend==2.2
+pytz==2017.3
+six==1.11.0
+SQLAlchemy==1.2.2
+tempora==1.10

frameworks/Python/falcon/requirements-pypy.lock

@@ -0,0 +1,7 @@
+falcon==1.4.1
+greenlet==0.4.12
+gunicorn==19.7.1
+python-mimeparse==1.6.0
+readline==6.2.4.1
+six==1.11.0
+tornado==4.5.3

frameworks/Python/falcon/requirements-pypy.txt

@@ -1,3 +1,3 @@
-gunicorn==19.4.5
-tornado==4.3
-falcon==0.3.0
+gunicorn
+tornado
+falcon

frameworks/Python/falcon/requirements.lock

@@ -0,0 +1,7 @@
+Cython==0.27.3
+falcon==1.4.1
+greenlet==0.4.13
+gunicorn==19.7.1
+meinheld==0.6.1
+python-mimeparse==1.6.0
+six==1.11.0

frameworks/Python/falcon/requirements.txt

@@ -1,5 +1,5 @@
-gunicorn==19.4.5
-meinheld==0.6.1
-Cython==0.27.3
-falcon==0.3.0
-greenlet==0.4.9
+Cython
+falcon
+greenlet
+gunicorn
+meinheld

frameworks/Python/falcon/setup.sh

@@ -2,6 +2,6 @@
 
 fw_depends python2
 
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
+pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.lock
 
 gunicorn app:app -c gunicorn_conf.py &

frameworks/Python/falcon/setup_py3.sh

@@ -2,6 +2,6 @@
 
 fw_depends python3
 
-pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
+pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.lock
 
 gunicorn app:app -c gunicorn_conf.py &

frameworks/Python/falcon/setup_pypy2.sh

@@ -2,6 +2,6 @@
 
 fw_depends pypy2
 
-pip install --install-option="--prefix=${PYPY2_ROOT}" -r $TROOT/requirements-pypy.txt
+pip install --install-option="--prefix=${PYPY2_ROOT}" -r $TROOT/requirements-pypy.lock
 
 gunicorn app:app -c gunicorn_conf.py &

frameworks/Python/flask/requirements-pypy.txt

@@ -1,8 +1,18 @@
-Jinja2==2.8
-Werkzeug==0.11.4
-flask==0.12.2
-SQLAlchemy==1.0.12
-Flask-SQLAlchemy==2.1
-PyMySQL==0.7.2
-gunicorn==19.4.5
-tornado==4.3
+backports-abc==0.5
+certifi==2018.1.18
+cffi==1.11.2
+click==6.7
+Flask==0.12.2
+Flask-SQLAlchemy==2.3.2
+greenlet==0.4.12
+gunicorn==19.7.1
+itsdangerous==0.24
+Jinja2==2.10
+MarkupSafe==1.0
+PyMySQL==0.8.0
+readline==6.2.4.1
+singledispatch==3.4.0.3
+six==1.11.0
+SQLAlchemy==1.2.2
+tornado==4.5.3
+Werkzeug==0.14.1

frameworks/Python/flask/requirements.base

@@ -0,0 +1,10 @@
+Flask
+Flask-SQLAlchemy
+gunicorn
+
+PyMySQL ; platform_python_implementation == "PyPy"
+tornado ; platform_python_implementation == "PyPy"
+
+meinheld    ; platform_python_implementation == "CPython"
+mysqlclient ; platform_python_implementation == "CPython"
+uWSGI       ; platform_python_implementation == "CPython"

frameworks/Python/flask/requirements.txt

@@ -1,10 +1,13 @@
-Jinja2==2.8
-Werkzeug==0.11.4
-flask==0.12.2
-SQLAlchemy==1.0.12
-Flask-SQLAlchemy==2.1
-mysqlclient==1.3.7
-gunicorn==19.4.5
-meinheld==0.6.1
-uwsgi==2.0.12
-greenlet==0.4.9
+click==6.7
+Flask==0.12.2
+Flask-SQLAlchemy==2.3.2
+greenlet==0.4.13
+gunicorn==19.7.1
+itsdangerous==0.24
+Jinja2==2.10
+MarkupSafe==1.0
+meinheld==0.6.1
+mysqlclient==1.3.12
+SQLAlchemy==1.2.2
+uWSGI==2.0.15
+Werkzeug==0.14.1

frameworks/Python/wheezyweb/requirements.lock

@@ -0,0 +1,14 @@
+greenlet==0.4.13
+gunicorn==19.4.5
+meinheld==0.6.1
+mysqlclient==1.3.7
+SQLAlchemy==1.0.12
+wheezy.caching==0.1.114
+wheezy.core==0.1.140
+wheezy.html==0.1.147
+wheezy.http==0.1.344
+wheezy.routing==0.1.157
+wheezy.security==0.1.64
+wheezy.template==0.1.167
+wheezy.validation==0.1.135
+wheezy.web==0.1.485

frameworks/Python/wheezyweb/requirements.txt

@@ -1,10 +1,10 @@
-wheezy.web==0.1.485
-wheezy.template==0.1.167
+wheezy.web
+wheezy.template
 
-SQLAlchemy==1.0.12
-mysqlclient==1.3.7
+SQLAlchemy
+mysqlclient
 
-gunicorn==19.4.5
-meinheld==0.6.1
+gunicorn
+meinheld
 
-greenlet==0.4.9
+greenlet

toolset/setup/linux/languages/pypy2.sh

@@ -3,7 +3,7 @@
 fw_installed pypy2 && return 0
   
 PYPY2_ROOT=$IROOT/pypy2
-PYPY2_VERSION=5.8.0
+PYPY2_VERSION=5.10.0
 
 fw_get -o pypy2-v${PYPY2_VERSION}-linux64.tar.bz2 https://bitbucket.org/pypy/pypy/downloads/pypy2-v${PYPY2_VERSION}-linux64.tar.bz2
 fw_untar pypy2-v${PYPY2_VERSION}-linux64.tar.bz2

toolset/setup/linux/languages/pypy3.sh

@@ -3,7 +3,7 @@
 fw_installed pypy3 && return 0
   
 PYPY3_ROOT=$IROOT/pypy3
-PYPY3_VERSION=5.8.0
+PYPY3_VERSION=5.10.1
 
 fw_get -o pypy3-v${PYPY_VERSION}-linux64.tar.bz2 https://bitbucket.org/pypy/pypy/downloads/pypy3-v${PYPY_VERSION}-linux64.tar.bz2
 fw_untar pypy3-v${PYPY_VERSION}-linux64.tar.bz2

toolset/setup/linux/languages/python2.sh

@@ -3,7 +3,7 @@
 fw_installed py2 && return 0
 
 PY2_ROOT=$IROOT/py2
-PY2_VERSION=2.7.11
+PY2_VERSION=2.7.14
 
 fw_get -O http://www.python.org/ftp/python/${PY2_VERSION}/Python-${PY2_VERSION}.tar.xz
 fw_untar Python-${PY2_VERSION}.tar.xz

toolset/setup/linux/languages/python3.sh

@@ -3,7 +3,7 @@
 fw_installed py3 && return 0
   
 PY3_ROOT=$IROOT/py3
-PY3_VERSION=3.6.1
+PY3_VERSION=3.6.4
 
 fw_get -O http://www.python.org/ftp/python/${PY3_VERSION}/Python-${PY3_VERSION}.tar.xz
 fw_untar Python-${PY3_VERSION}.tar.xz