[Python-checkins] r45397 - in sandbox/branches/setuptools-0.6: ez_setup.py release.sh setup.py setuptools/__init__.py version version.dat

phillip.eby python-checkins at python.org
Fri Apr 14 19:31:03 CEST 2006


Author: phillip.eby
Date: Fri Apr 14 19:31:02 2006
New Revision: 45397

Added:
   sandbox/branches/setuptools-0.6/
      - copied from r45395, sandbox/trunk/setuptools/
   sandbox/branches/setuptools-0.6/release.sh   (contents, props changed)
   sandbox/branches/setuptools-0.6/version   (contents, props changed)
   sandbox/branches/setuptools-0.6/version.dat   (contents, props changed)
Modified:
   sandbox/branches/setuptools-0.6/ez_setup.py
   sandbox/branches/setuptools-0.6/setup.py
   sandbox/branches/setuptools-0.6/setuptools/__init__.py
Log:
Creating a branch for the "stable" 0.6 development line of setuptools, 
so that it can continue forward to 0.6b1 and onward, while using the
trunk for 0.7 development and Python 2.5 snapshots thereof.


Modified: sandbox/branches/setuptools-0.6/ez_setup.py
==============================================================================
--- sandbox/trunk/setuptools/ez_setup.py	(original)
+++ sandbox/branches/setuptools-0.6/ez_setup.py	Fri Apr 14 19:31:02 2006
@@ -14,7 +14,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6a12"
+DEFAULT_VERSION = "0.6b1"
 DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {

Added: sandbox/branches/setuptools-0.6/release.sh
==============================================================================
--- (empty file)
+++ sandbox/branches/setuptools-0.6/release.sh	Fri Apr 14 19:31:02 2006
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script is for PJE's working environment only, to upload
+# releases to PyPI, telecommunity, eby-sarna SVN, update local
+# project checkouts, etc.
+#
+# If your initials aren't PJE, don't run it.  :)
+#
+
+export VERSION="0.6b1"
+
+wpython setup.py -q source && \
+cpython setup.py -q binary && \
+python ez_setup.py --md5update dist/setuptools-$VERSION*-py2.?.egg && \
+  scp ez_setup.py virtual-python.py t3:web/PEAK/dist/ && \
+  cp ez_setup.py ~/projects/ez_setup/__init__.py && \
+  svn ci -m "Update ez_setup for setuptools $VERSION" \
+      ~/projects/ez_setup/__init__.py && \
+  svn up ~/projects/*/ez_setup
+
+# XXX update wiki pages from EasyInstall.txt, setuptools.txt, & 
+#     pkg_resources.txt

Modified: sandbox/branches/setuptools-0.6/setup.py
==============================================================================
--- sandbox/trunk/setuptools/setup.py	(original)
+++ sandbox/branches/setuptools-0.6/setup.py	Fri Apr 14 19:31:02 2006
@@ -19,7 +19,7 @@
 d = {}; execfile(convert_path('setuptools/command/__init__.py'), d)
 SETUP_COMMANDS = d['__all__']
 
-VERSION = "0.6a12"
+VERSION = "0.6b1"
 from setuptools import setup, find_packages
 import sys
 scripts = []

Modified: sandbox/branches/setuptools-0.6/setuptools/__init__.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/__init__.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/__init__.py	Fri Apr 14 19:31:02 2006
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6a12'
+__version__ = '0.6b1'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

Added: sandbox/branches/setuptools-0.6/version
==============================================================================
--- (empty file)
+++ sandbox/branches/setuptools-0.6/version	Fri Apr 14 19:31:02 2006
@@ -0,0 +1,48 @@
+#!/usr/local/bin/invoke /usr/local/bin/c6peak version-config
+
+# This is a PEAK 'version' tool configuration file, that's
+# also executable.  PJE uses it to bump version numbers in
+# the various parts of the project without having to edit them
+# by hand.  The current version is stored in the version.dat
+# file.  
+
+# These are not the droids you're looking for.  You can go on
+# about your business...
+
+<Scheme default>
+    DefaultFormat full
+    part major
+    part minor
+    part status choice alpha beta "release candidate" final
+    part build
+    part date   timestamp
+
+    <Formats>
+    trailer   remap status "a%(build)s" "b%(build)s" "c%(build)s" "%(dot-maint)s"
+    dot-maint optional build ".%(build)s"
+    full      "%(major)s.%(minor)s %(status)s %(build)s"
+    short     "%(major)s.%(minor)s%(trailer)s"
+    </Formats>
+</Scheme>
+
+<Module>
+    Name setuptools
+
+    <Edit>
+    File setup.py
+    File ez_setup.py
+    Match 'VERSION = "%(short)s"'
+    </Edit>
+
+    <Edit>
+    File release.sh
+    Match 'VERSION="%(short)s"'
+    </Edit>
+
+    <Edit>
+    File setuptools/__init__.py
+    Match "__version__ = '%(short)s'"
+    </Edit>
+
+</Module>
+

Added: sandbox/branches/setuptools-0.6/version.dat
==============================================================================
--- (empty file)
+++ sandbox/branches/setuptools-0.6/version.dat	Fri Apr 14 19:31:02 2006
@@ -0,0 +1,6 @@
+[setuptools]
+status = 'beta'
+major = 0
+build = 1
+minor = 6
+


More information about the Python-checkins mailing list