summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-10-30 10:27:14 +0100
committerholger krekel <holger@merlinux.eu>2015-10-30 10:27:14 +0100
commite3f83b9791ed9217b17c8be647027fbd02d34af1 (patch)
treeaba8e18fbd4d18bcf6ab6434fec9400d82e7235e
parent1a13d40b563d161c3558da81ea0ab55eed38fecd (diff)
downloadtox-e3f83b9791ed9217b17c8be647027fbd02d34af1.tar.gz
add changelog: fix issue99: the {env:...} substitution now properly uses environment
settings from the ``setenv`` section. Thanks Itxaka Serrano.
-rw-r--r--CHANGELOG3
-rw-r--r--CONTRIBUTORS1
-rw-r--r--setup.cfg13
3 files changed, 16 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2a9be6d..2bd2f6d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,9 @@
- fix issue246: fix regression in config parsing by reordering
such that {envbindir} can be used again in tox.ini. Thanks Olli Walsh.
+- fix issue99: the {env:...} substitution now properly uses environment
+ settings from the ``setenv`` section. Thanks Itxaka Serrano.
+
2.1.1
----------
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b3e523e..75a2dd8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -31,3 +31,4 @@ Marc Schlaich
Clark Boylan
Eugene Yunak
Mark Hirota
+Itxaka Serrano
diff --git a/setup.cfg b/setup.cfg
index 3c6e79c..1ab4fd0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,13 @@
+[build_sphinx]
+source-dir = doc/en/
+build-dir = doc/build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = doc/en/build/html
+
[bdist_wheel]
-universal=1
+universal = 1
+
+[devpi:upload]
+formats = sdist.tgz,bdist_wheel