summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-06-23 09:27:06 +0200
committerholger krekel <holger@merlinux.eu>2013-06-23 09:27:06 +0200
commit40b3dd87e69a8dd3d00f126f471ec68653df68ef (patch)
tree50a5eaf8bef9667c6a47009ab75ab1bc5dac4367
parente0aa613ed4945448ec2062984d805b298cdcc31f (diff)
downloadtox-40b3dd87e69a8dd3d00f126f471ec68653df68ef.tar.gz
fix tox.ini
-rwxr-xr-xCHANGELOG2
-rw-r--r--tox.ini4
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c76fa20..3cce0bf 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.5.0.dev
+1.5.0
-----------------
- fix issue104: use setuptools by default, instead of distribute,
diff --git a/tox.ini b/tox.ini
index d5d77d0..81cbfa0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,10 @@ commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs
deps=pytest==2.3.4
pytest-instafail
+[testenv:py25]
+setenvs =
+ PIP_INSECURE=True
+
[testenv:docs]
basepython=python
changedir=doc