summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-12-07 12:57:20 +0100
committerholger krekel <holger@merlinux.eu>2015-12-07 12:57:20 +0100
commite4c19242837bfb6d6ba1486122c5b44d418e0ea2 (patch)
tree8c3b12f162e3a7fbaf372902fb7283758b417ea1
parent8edad9ed7263483a98171467efee67efbb52b259 (diff)
parentb7823bfad66e0236ac161bdf3badc685c55e9683 (diff)
downloadtox-e4c19242837bfb6d6ba1486122c5b44d418e0ea2.tar.gz
merge branch issue285, bump versions
-rw-r--r--setup.py2
-rw-r--r--tox/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 350a098..a1640f9 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.3.0.dev2',
+ version='2.3.0.dev3',
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 443ce8f..0e69ae9 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '2.3.0.dev2'
+__version__ = '2.3.0.dev3'
from .hookspecs import hookspec, hookimpl # noqa