summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-03-09 08:13:11 +0100
committerholger krekel <holger@merlinux.eu>2015-03-09 08:13:11 +0100
commit189c9d4d9344db7fee7db9f00a59bfcde358dfad (patch)
tree2546799fb5356fe3af71ec547a35cd33537bea22
parenta85561dd62c86929b60c011ec64187484a1120e4 (diff)
downloadtox-189c9d4d9344db7fee7db9f00a59bfcde358dfad.tar.gz
add changelog and bump to dev version
allow --force-deps to override dependencies in "-r" requirements files. Thanks Sontek for the PR.
-rw-r--r--CHANGELOG7
-rw-r--r--setup.py2
-rw-r--r--tox/__init__.py2
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 24084c9..0b6915f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+DEV
+-----------
+
+- allow --force-deps to override dependencies in "-r" requirements
+ files. Thanks Sontek for the PR.
+
+
1.9.0
-----------
diff --git a/setup.py b/setup.py
index 8d14f26..7373f85 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def main():
description='virtualenv-based automation of test activities',
long_description=open("README.rst").read(),
url='http://tox.testrun.org/',
- version='1.9.0',
+ version='1.9.1.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 8529f71..331f2cb 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '1.9.0'
+__version__ = '1.9.1.dev1'
class exception:
class Error(Exception):