aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.hgtags1
-rwxr-xr-xREADME.txt6
-rw-r--r--distribute_setup.py2
-rw-r--r--docs/conf.py4
-rw-r--r--release.py11
-rwxr-xr-xrelease.sh2
-rwxr-xr-xsetup.py2
7 files changed, 16 insertions, 12 deletions
diff --git a/.hgtags b/.hgtags
index afbb60ff..1c2c9965 100644
--- a/.hgtags
+++ b/.hgtags
@@ -32,3 +32,4 @@ de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
9406c5dac8429216f1a264e6f692fdc534476acd 0.6.23
+7fd7b6e30a0effa082baed1c4103a0efa56be98c 0.6.24
diff --git a/README.txt b/README.txt
index 5a3146b8..2a12bd16 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
Download the source tarball, uncompress it, then run the install command::
- $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz
- $ tar -xzvf distribute-0.6.24.tar.gz
- $ cd distribute-0.6.24
+ $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.25.tar.gz
+ $ tar -xzvf distribute-0.6.25.tar.gz
+ $ cd distribute-0.6.25
$ python setup.py install
---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index b204902e..f0bfa25a 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ except ImportError:
args = [quote(arg) for arg in args]
return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-DEFAULT_VERSION = "0.6.24"
+DEFAULT_VERSION = "0.6.25"
DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
SETUPTOOLS_FAKED_VERSION = "0.6c11"
diff --git a/docs/conf.py b/docs/conf.py
index 65ee57be..e4bd76af 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2009-2011, The fellowship of the packaging'
# built documents.
#
# The short X.Y version.
-version = '0.6.24'
+version = '0.6.25'
# The full version, including alpha/beta/rc tags.
-release = '0.6.24'
+release = '0.6.25'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/release.py b/release.py
index 91ae6dfb..eab2dc8a 100644
--- a/release.py
+++ b/release.py
@@ -12,13 +12,15 @@ import shutil
import os
import sys
-VERSION='0.6.24'
+VERSION='0.6.25'
def get_next_version():
digits = map(int, VERSION.split('.'))
digits[-1] += 1
return '.'.join(map(str, digits))
+NEXT_VERSION = get_next_version()
+
def bump_versions():
files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
'release.sh', 'README.txt', 'distribute_setup.py')
@@ -26,7 +28,7 @@ def bump_versions():
def bump_version(filename):
with open(filename, 'rb') as f:
- lines = [line.replace(VERSION, get_next_version()) for line in f]
+ lines = [line.replace(VERSION, NEXT_VERSION) for line in f]
with open(filename, 'wb') as f:
f.writelines(lines)
@@ -48,12 +50,13 @@ def do_release():
subprocess.check_call([sys.executable, 'setup.py',
'-q', 'egg_info', '-RD', '-b', '', 'sdist', 'register',
'upload', 'upload_docs'])
- upload_boostrap_script()
+ upload_bootstrap_script()
# we just tagged the current version, bump for the next release.
bump_versions()
subprocess.check_call(['hg', 'ci', '-m',
- 'Bumped to {VERSION} in preparation for next release.'.format(**globals())])
+ 'Bumped to {NEXT_VERSION} in preparation for next '
+ 'release.'.format(**globals())])
# push the changes
subprocess.check_call(['hg', 'push'])
diff --git a/release.sh b/release.sh
index 286ae59a..78316974 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-export VERSION="0.6.24"
+export VERSION="0.6.25"
# tagging
hg tag $VERSION -f
diff --git a/setup.py b/setup.py
index c0ce54da..3500d3e2 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ init_path = convert_path('setuptools/command/__init__.py')
exec(open(init_path).read(), d)
SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.24"
+VERSION = "0.6.25"
from setuptools import setup, find_packages
from setuptools.command.build_py import build_py as _build_py