Compare commits

..

9 Commits

Author SHA1 Message Date
Kenneth Reitz 43c7079a07 Default Python: 2.7.8 2014-07-02 10:33:24 -04:00
Kenneth Reitz 097f64721a merge 2014-07-02 10:28:38 -04:00
Kenneth Reitz b3b6c78657 update readme with new python versions 2014-07-02 10:27:38 -04:00
Kenneth Reitz fcfc2f8651 python-2.7.8 (--shared) 2014-07-02 10:12:19 -04:00
kennethreitz 1f9b0bfe02 Merge pull request #150 from cclauss/patch-2
Readme: Update Python versions to match compile
2014-06-20 06:04:33 +08:00
kennethreitz 533def6b57 Merge pull request #152 from yunojuno/master
Update pylibmc to support nested requirements.
2014-06-20 06:03:25 +08:00
Hugo Rodger-Brown 826193ef5a Update pylibmc to support nested requirements.
The current regex assumes that pylibmc appears at the beginning of a line
(whitespace only precedes it), which is a fair assumption in a single 'flat'
requirements.txt file. However, if you are using nested requirements then
this is not the case - your pylibmc may exist in a sub-directory. This is
very similar to the way in which mercurial is installed if "hg+" is found
in the requirements file (see the /bin/compile script). By insisting that
pylibmc appear at the beginning of the file, it's impossible to fool the
compilation into installing libmemcached (as this script does) by simply
putting the phrase into a comment, which is what you *can* do with 'hg+'.

I've updated the regex to remove the beginning of line restriction. This
means that you can add a comment to a top-level requirements.txt that
will trigger the install, without having to functionally alter your
nested requirements.

e.g. top-level requirements.txt:

    # fake comment to trigger pylibmc script
    # fake comment to trigger hg+ install
    -r requirements/production.txt
2014-06-18 18:13:37 +01:00
cclauss 631aa4b356 Readme: Update Python versions to match compile
Also matches recent updates to https://devcenter.heroku.com/articles/python-runtimes
2014-06-17 20:09:25 +02:00
Kenneth Reitz 067422b4b4 disabled shared for python-2.7.7 (for reportlab) 2014-06-12 16:46:34 -04:00
7 changed files with 54 additions and 9 deletions
+6 -6
View File
@@ -17,8 +17,8 @@ Example usage:
$ git push heroku master
...
-----> Python app detected
-----> No runtime.txt provided; assuming python-2.7.6.
-----> Preparing Python runtime (python-2.7.6)
-----> No runtime.txt provided; assuming python-2.7.8.
-----> Preparing Python runtime (python-2.7.8)
-----> Installing Setuptools (3.6)
-----> Installing Pip (1.5.6)
-----> Installing dependencies using Pip (1.5.6)
@@ -43,12 +43,12 @@ Specify a Runtime
You can also provide arbitrary releases Python with a `runtime.txt` file.
$ cat runtime.txt
python-3.4.0
python-3.4.1
Runtime options include:
- python-2.7.6
- python-3.4.0
- python-2.7.8
- python-3.4.1
- pypy-1.9 (experimental)
Other [unsupported runtimes](https://github.com/kennethreitz/python-versions/tree/master/formula) are available as well.
Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well.
+1 -1
View File
@@ -25,7 +25,7 @@ VIRTUALENV_LOC=".heroku/venv"
LEGACY_TRIGGER="lib/python2.7"
PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
DEFAULT_PYTHON_VERSION="python-2.7.7"
DEFAULT_PYTHON_VERSION="python-2.7.8"
PYTHON_EXE="/app/.heroku/python/bin/python"
PIP_VERSION="1.5.6"
SETUPTOOLS_VERSION="3.6"
+1 -1
View File
@@ -16,7 +16,7 @@ VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz
source $BIN_DIR/utils
# If pylibmc exists within requirements, use vendored libmemcached.
if (grep -Eiq "^\s*pylibmc" requirements.txt) then
if (grep -Eiq "\s*pylibmc" requirements.txt) then
echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
cd .heroku
+1 -1
View File
@@ -10,6 +10,6 @@ curl -L $SOURCE_TARBALL | tar xz
mv Python-2.7.7 src
cd src
./configure --prefix=$OUT_PREFIX --enable-shared
./configure --prefix=$OUT_PREFIX
make
make install
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
# Build Deps: libraries/sqlite
OUT_PREFIX=$1
echo "Building Python..."
SOURCE_TARBALL='http://python.org/ftp/python/2.7.7/Python-2.7.7.tgz'
curl -L $SOURCE_TARBALL | tar xz
mv Python-2.7.7 src
cd src
./configure --prefix=$OUT_PREFIX --enable-shared
make
make install
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
# Build Deps: libraries/sqlite
OUT_PREFIX=$1
echo "Building Python..."
SOURCE_TARBALL='http://python.org/ftp/python/2.7.8/Python-2.7.8.tgz'
curl -L $SOURCE_TARBALL | tar xz
mv Python-2.7.8 src
cd src
./configure --prefix=$OUT_PREFIX --enable-shared
make
make install
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
# Build Deps: libraries/sqlite
OUT_PREFIX=$1
echo "Building Python..."
SOURCE_TARBALL='http://python.org/ftp/python/2.7.8/Python-2.7.8.tgz'
curl -L $SOURCE_TARBALL | tar xz
mv Python-2.7.8 src
cd src
./configure --prefix=$OUT_PREFIX
make
make install