summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-11-13 10:50:44 +0100
committerholger krekel <holger@merlinux.eu>2015-11-13 10:50:44 +0100
commit29861cd9565db7f47d6e40e1245c12c2744e6bcf (patch)
tree99bb1c7043aba4897e615939bbc7f0f4de043108
parent483d1a4b61b7088b7ba90894683ace252c4f97b7 (diff)
downloadtox-29861cd9565db7f47d6e40e1245c12c2744e6bcf.tar.gz
add changelog
-rw-r--r--CHANGELOG5
-rw-r--r--setup.py2
-rw-r--r--tox/__init__.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 11ecb1f..6e95ce8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2.2.2.dev
+---------
+
+- fix issue285 (WIP) setenv processing with self-references
+
2.2.1
-----
diff --git a/setup.py b/setup.py
index a398ade..3bff9fa 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ def main():
description='virtualenv-based automation of test activities',
long_description=open("README.rst").read(),
url='http://tox.testrun.org/',
- version='2.2.1',
+ version='2.2.2.dev1',
license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff --git a/tox/__init__.py b/tox/__init__.py
index c1e74fb..f69bc2d 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '2.2.1'
+__version__ = '2.2.2.dev1'
from .hookspecs import hookspec, hookimpl # noqa