summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2010-11-27 18:18:37 +0100
committerholger krekel <holger@merlinux.eu>2010-11-27 18:18:37 +0100
commitf609eda40bd5488fca306b1a19983a755976c344 (patch)
treeddb5f80d63d25ffa254be36336b5e5d9c81356cc
parent08cb0e16babe6d215326edefab77ef8a9f0119df (diff)
downloadtox-f609eda40bd5488fca306b1a19983a755976c344.tar.gz
require virtualenv-1.5.1 - bump version number
-rw-r--r--CHANGELOG.txt5
-rw-r--r--MANIFEST.in6
-rw-r--r--setup.py4
-rw-r--r--tox/__init__.py2
-rw-r--r--toxbootstrap.py2
5 files changed, 9 insertions, 10 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e19fd7c..bb6d0f8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+0.9.1
+-----------------
+
+- require virtualenv-1.5.1 as to make pypy-1.4 work
+
0.9
-----------------
diff --git a/MANIFEST.in b/MANIFEST.in
index 3372669..ee01da3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,10 +5,4 @@ include setup.py
include tox.ini
graft doc
graft tests
-prune doc/_build
-exclude *.orig
-exclude *.rej
-recursive-exclude tox *.pyc *$py.class
-recursive-exclude doc *.pyc *$py.class
-recursive-exclude tests *.pyc *$py.class
prune .hg
diff --git a/setup.py b/setup.py
index 3c57097..349a8a9 100644
--- a/setup.py
+++ b/setup.py
@@ -29,13 +29,13 @@ http://codespeak.net/tox
def main():
install_requires=['virtualenv5>=1.3.4.5']
if sys.version_info[0] < 3:
- install_requires+=['virtualenv>=1.4.9']
+ install_requires+=['virtualenv>=1.5.1']
setup(
name='tox',
description='virtualenv-based automation of test activities',
long_description=long_description,
url='http://codespeak.net/tox',
- version='0.9',
+ version='0.9.1.dev1',
license='GPLv2 or later',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff --git a/tox/__init__.py b/tox/__init__.py
index 3ad9fd0..ce9dfc3 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '0.9'
+__version__ = '0.9.1.dev1'
from py.apipkg import initpkg
diff --git a/toxbootstrap.py b/toxbootstrap.py
index 058ba0d..aa16a94 100644
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -61,7 +61,7 @@ ToDo
"""
-__version__ = '0.9'
+__version__ = '0.9.1.dev1'
import sys
import os