Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Work around honcho's problem with python 2.7.9 #3028

Merged
merged 1 commit into from
Dec 19, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ venv := "./vendor/virtualenv-1.11.6.py"
test_env_files := defaults.env,tests/test.env,tests/local.env
pip := $(env_bin)/pip
honcho := $(env_bin)/honcho
honcho_run := $(honcho) -e defaults.env,local.env run
py_test := $(honcho) -e $(test_env_files) run $(env_bin)/py.test
honcho_run := $(honcho) run -e defaults.env,local.env
py_test := $(honcho) run -e $(test_env_files) $(env_bin)/py.test

env: requirements.txt requirements_tests.txt setup.py
$(python) $(venv) \
Expand Down Expand Up @@ -42,7 +42,7 @@ py: env
$(honcho_run) $(env_bin)/python -i -c 'from gratipay.wireup import env, db; db = db(env())'

test-schema: env
$(honcho) -e $(test_env_files) run ./recreate-schema.sh
$(honcho) run -e $(test_env_files) ./recreate-schema.sh

pyflakes: env
$(env_bin)/pyflakes bin gratipay tests
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ If Gratipay launches successfully it will look like this:

```
$ make run
PATH=env/bin:{lots-more-of-your-own-PATH} env/bin/honcho -e defaults.env,local.env run web
PATH=env/bin:{lots-more-of-your-own-PATH} env/bin/honcho run -e defaults.env,local.env web
2014-07-22 14:53:09 [1258] [INFO] Starting gunicorn 18.0
2014-07-22 14:53:09 [1258] [INFO] Listening at: http://0.0.0.0:8537 (1258)
2014-07-22 14:53:09 [1258] [INFO] Using worker: sync
Expand Down Expand Up @@ -367,7 +367,7 @@ To invoke py.test directly you should use the `honcho` utility that comes
with the install. First `make tests/env`, activate the virtualenv and then:

[gratipay] $ cd tests/
[gratipay] $ honcho -e defaults.env,local.env run py.test
[gratipay] $ honcho run -e defaults.env,local.env py.test

Local Database Setup
--------------------
Expand Down
4 changes: 2 additions & 2 deletions tests/js/utils/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var exec = require('sync-exec');

module.exports = function createSession(user) {
return exec(
'./env/bin/honcho -e defaults.env,tests/test.env,tests/local.env ' +
'run ./env/bin/python ./tests/js/utils/auth-helper.py ' + user
'./env/bin/honcho run -e defaults.env,tests/test.env,tests/local.env ' +
'./env/bin/python ./tests/js/utils/auth-helper.py ' + user
).stdout.slice(0, -1);
};