summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2010-11-25 20:09:25 +0100
committerholger krekel <holger@merlinux.eu>2010-11-25 20:09:25 +0100
commit1734ccdc126e665a40ffccd808c5b5166edd8401 (patch)
treeb9ffa214e7359b050b0a2e14e803ce73f80c6cbe
parentd8dbd86f897cb89a4572a62e10674f17852620df (diff)
downloadtox-1734ccdc126e665a40ffccd808c5b5166edd8401.tar.gz
going for 0.90.9
-rw-r--r--CHANGELOG.txt2
-rw-r--r--setup.py2
-rw-r--r--tests/test_config.py2
-rw-r--r--tox/__init__.py2
-rw-r--r--tox/_config.py2
-rw-r--r--toxbootstrap.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0f5969b..7e0592d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,4 @@
-0.9.dev0
+0.9
-----------------
- fix pip-installation mixups by always unsetting PIP_RESPECT_VIRTUALENV
diff --git a/setup.py b/setup.py
index 0a677f8..3c57097 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ def main():
description='virtualenv-based automation of test activities',
long_description=long_description,
url='http://codespeak.net/tox',
- version='0.9.dev10',
+ version='0.9',
license='GPLv2 or later',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff --git a/tests/test_config.py b/tests/test_config.py
index b408e68..3f9c93d 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -471,7 +471,7 @@ class TestGlobalOptions:
if name == "jython":
assert env.basepython == "jython"
elif name == "pypy":
- assert env.basepython == "pypy-c"
+ assert env.basepython == "pypy"
else:
assert name.startswith("py")
bp = "python%s.%s" %(name[2], name[3])
diff --git a/tox/__init__.py b/tox/__init__.py
index 369e3f1..3ad9fd0 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '0.9.dev10'
+__version__ = '0.9'
from py.apipkg import initpkg
diff --git a/tox/_config.py b/tox/_config.py
index 81a1591..3991ad5 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -4,7 +4,7 @@ import re
import tox
import argparse
-defaultenvs = {'jython': 'jython', 'pypy': 'pypy-c'}
+defaultenvs = {'jython': 'jython', 'pypy': 'pypy'}
for _name in "py24,py25,py26,py27,py30,py31,py32".split(","):
defaultenvs[_name] = "python%s.%s" %(_name[2], _name[3])
diff --git a/toxbootstrap.py b/toxbootstrap.py
index 398db66..d9d1168 100644
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -61,7 +61,7 @@ ToDo
"""
-__version__ = '0.9.dev10'
+__version__ = '0.9'
import sys
import os