Commit c620980e authored by Kenneth Reitz's avatar Kenneth Reitz Committed by GitHub

Merge pull request #313 from cclauss/Python-3.5.2

Add Python 2.7.12, Python 3.5.2, Pypy 5.3.1, Pip 8.1.2, Setuptools 23.1.0 and remove release candidate
parents a7976fc1 2983fcfb
...@@ -21,12 +21,12 @@ Deploying a Python application couldn't be easier: ...@@ -21,12 +21,12 @@ Deploying a Python application couldn't be easier:
$ git push heroku master $ git push heroku master
... ...
-----> Python app detected -----> Python app detected
-----> Installing python-2.7.11 -----> Installing python-2.7.12
$ pip install -r requirements.txt $ pip install -r requirements.txt
Collecting requests (from -r requirements.txt (line 1)) Collecting requests (from -r requirements.txt (line 1))
Downloading requests-2.9.1-py2.py3-none-any.whl (501kB) Downloading requests-2.10.0-py2.py3-none-any.whl (501kB)
Installing collected packages: requests Installing collected packages: requests
Successfully installed requests-2.9.1 Successfully installed requests-2.10.0
-----> Discovering process types -----> Discovering process types
Procfile declares types -> (none) Procfile declares types -> (none)
...@@ -44,12 +44,12 @@ Specify a Python Runtime ...@@ -44,12 +44,12 @@ Specify a Python Runtime
Specific versions of the Python runtime can be specified with a `runtime.txt` file: Specific versions of the Python runtime can be specified with a `runtime.txt` file:
$ cat runtime.txt $ cat runtime.txt
python-3.5.1 python-3.5.2
Runtime options include: Runtime options include:
- `python-2.7.11` - `python-2.7.12`
- `python-3.5.1` - `python-3.5.2`
- `pypy-5.0.1` (unsupported, experimental) - `pypy-5.3.1` (unsupported, experimental)
Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well. Use at your own risk. Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well. Use at your own risk.
...@@ -31,11 +31,11 @@ ENV_DIR=$3 ...@@ -31,11 +31,11 @@ ENV_DIR=$3
VIRTUALENV_LOC=".heroku/venv" VIRTUALENV_LOC=".heroku/venv"
LEGACY_TRIGGER="lib/python2.7" LEGACY_TRIGGER="lib/python2.7"
DEFAULT_PYTHON_VERSION="python-2.7.11" DEFAULT_PYTHON_VERSION="python-2.7.12"
DEFAULT_PYTHON_STACK="cedar-14" DEFAULT_PYTHON_STACK="cedar-14"
PYTHON_EXE="/app/.heroku/python/bin/python" PYTHON_EXE="/app/.heroku/python/bin/python"
PIP_VERSION="8.1.1" PIP_VERSION="8.1.2"
SETUPTOOLS_VERSION="20.4" SETUPTOOLS_VERSION="23.1"
# Common Problem Warnings # Common Problem Warnings
export WARNINGS_LOG=$(mktemp) export WARNINGS_LOG=$(mktemp)
......
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
# Build Deps: libraries/sqlite
# NOTICE: This formula only works for the cedar-14 stack, not cedar.
OUT_PREFIX=$1
echo "Building PyPy..."
SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-5.3.1-linux64.tar.bz2'
curl -L $SOURCE_TARBALL | tar jx
cp -R pypy-5.3.1-linux64/* $OUT_PREFIX
ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
OUT_PREFIX=$1 OUT_PREFIX=$1
echo "Building Python..." echo "Building Python..."
SOURCE_TARBALL='https://www.python.org/ftp/python/2.7.11/Python-2.7.11rc1.tgz' SOURCE_TARBALL='https://python.org/ftp/python/2.7.12/Python-2.7.12.tgz'
curl -L $SOURCE_TARBALL | tar xz curl -L $SOURCE_TARBALL | tar xz
mv Python-2.7.11rc1 src mv Python-2.7.12 src
cd src cd src
./configure --prefix=$OUT_PREFIX --with-ensurepip=no ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
......
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
# Build Deps: libraries/sqlite
OUT_PREFIX=$1
echo "Building Python..."
SOURCE_TARBALL='https://python.org/ftp/python/3.5.2/Python-3.5.2.tgz'
curl -L $SOURCE_TARBALL | tar xz
mv Python-3.5.2 src
cd src
./configure --prefix=$OUT_PREFIX --with-ensurepip=no
make
make install
ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment