Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.

Commit 4d85654

Browse files
author
Olivier Gambier
committed
Cleanup tox file
Add env variables (and documentation) instead of hardcoded (dmp only) paths Docker-DCO-1.1-Signed-off-by: Olivier Gambier <[email protected]> (github: dmp42)
1 parent 4ff08ca commit 4d85654

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

CONTRIBUTE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,10 @@ Pretty much:
103103

104104
Drivers are expected to receive bytes and to return bytes.
105105
Don't try to decode or encode content.
106+
107+
## Development environement notes
108+
109+
We don't currently run any tests for python3, as we are stuck on gevent not being py3 ready.
110+
111+
On OSX, in order for the dependencies to compile properly (inside tox venv) you might need to have extra include and lib specified. Environment variables are provided for that, namely $TOX_INCLUDE and $TOX_LIB.
112+

tox.ini

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
# py34 support: flask is borked
2-
31
[tox]
42
envlist = flake8, py26, py27
5-
# py26,py32,py33,py34
63
# skipsdist = True
74

85
[flake8]
9-
ignore = H102,H304
106
exclude = .tox,.git,*.egg,build
7+
ignore = H102,H304
118

129
[testenv]
1310
# XXX clang, latest OSX:
1411
# http://bruteforce.gr/bypassing-clang-error-unknown-argument.html
15-
# XXX you might also need extra includes (for lzma-dev / xz) if you are on OSX
16-
# XXX and you might also need extra linkage (for gevent), same reason
17-
setenv = ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future -I/Users/dmp/bin/homebrew/include -L/Users/dmp/bin/homebrew/lib
12+
setenv = ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future -I{env:TOX_INCLUDE} -L{env:TOX_LIB}
1813
SETTINGS_FLAVOR=test
1914
DOCKER_REGISTRY_CONFIG=config_sample.yml
2015

@@ -35,5 +30,4 @@ commands = python setup.py nosetests
3530
install_command = pip install {opts} {packages}
3631
deps = ./depends/docker-registry-core/
3732
-rrequirements/style.txt
38-
commands = flake8 .
39-
33+
commands = flake8 {toxinidir}

0 commit comments

Comments
 (0)