From 3116049570db091f6824a36e93925be75e9a7ab5 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 May 2013 16:04:19 -0400 Subject: Bumped to 0.6.43 in preparation for next release. --HG-- branch : distribute --- README.txt | 6 +++--- distribute_setup.py | 2 +- docs/conf.py | 4 ++-- release.py | 2 +- setup.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.txt b/README.txt index 9ab45356..2792ed9c 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.42.tar.gz - $ tar -xzvf distribute-0.6.42.tar.gz - $ cd distribute-0.6.42 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz + $ tar -xzvf distribute-0.6.43.tar.gz + $ cd distribute-0.6.43 $ python setup.py install --------------------------- diff --git a/distribute_setup.py b/distribute_setup.py index 53345bbd..cb933560 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -49,7 +49,7 @@ except ImportError: args = [quote(arg) for arg in args] return os.spawnl(os.P_WAIT, sys.executable, *args) == 0 -DEFAULT_VERSION = "0.6.42" +DEFAULT_VERSION = "0.6.43" 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 bd9028b6..e4e982b0 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.42' +version = '0.6.43' # The full version, including alpha/beta/rc tags. -release = '0.6.42' +release = '0.6.43' # 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 b657d990..168b7512 100644 --- a/release.py +++ b/release.py @@ -22,7 +22,7 @@ try: except Exception: pass -VERSION = '0.6.42' +VERSION = '0.6.43' PACKAGE_INDEX = 'https://pypi.python.org/pypi' PACKAGE_INDEX = 'https://pypi.python.org/pypi' diff --git a/setup.py b/setup.py index a9b7bb0f..3ed5b1fb 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ exec(init_file.read(), d) init_file.close() SETUP_COMMANDS = d['__all__'] -VERSION = "0.6.42" +VERSION = "0.6.43" from setuptools import setup, find_packages from setuptools.command.build_py import build_py as _build_py -- cgit v1.2.1 From 5f422f5a0c8377a03d1c19c419f61b057a51f783 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 May 2013 18:17:10 -0400 Subject: Update code repository link. --HG-- branch : distribute --- README.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.txt b/README.txt index 2792ed9c..f5cbf690 100755 --- a/README.txt +++ b/README.txt @@ -224,5 +224,4 @@ Feedback and getting involved - Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig - Issue tracker: http://bitbucket.org/tarek/distribute/issues/ -- Code Repository: http://bitbucket.org/tarek/distribute - +- Code Repository: http://bitbucket.org/pypa/setuptools?at=distribute -- cgit v1.2.1 From 33c71453d52f1b35ecab54f281de8d7db13fd4ab Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 May 2013 18:21:06 -0400 Subject: Update About the fork --HG-- branch : distribute --- README.txt | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/README.txt b/README.txt index f5cbf690..cdfa9e09 100755 --- a/README.txt +++ b/README.txt @@ -11,35 +11,14 @@ Disclaimers About the fork ============== -`Distribute` is a fork of the `Setuptools` project. +`Distribute` is a now deprecated fork of the `Setuptools` project. -Distribute is intended to replace Setuptools as the standard method -for working with Python module distributions. +Distribute was intended to replace Setuptools as the standard method +for working with Python module distributions. The code has since been merged +back into the parent project as is being maintained by the community at large. -The fork has two goals: - -- Providing a backward compatible version to replace Setuptools - and make all distributions that depend on Setuptools work as - before, but with less bugs and behaviorial issues. - - This work is done in the 0.6.x series. - - Starting with version 0.6.2, Distribute supports Python 3. - Installing and using distribute for Python 3 code works exactly - the same as for Python 2 code, but Distribute also helps you to support - Python 2 and Python 3 from the same source code by letting you run 2to3 - on the code as a part of the build process, by setting the keyword parameter - ``use_2to3`` to True. See http://packages.python.org/distribute for more - information. - -- Refactoring the code, and releasing it in several distributions. - This work is being done in the 0.7.x series but not yet released. - -The roadmap is still evolving, and the page that is up-to-date is -located at : `http://packages.python.org/distribute/roadmap`. - -If you install `Distribute` and want to switch back for any reason to -`Setuptools`, get to the `Uninstallation instructions`_ section. +`Distribute` is now being maintained as a branch in the `Setuptools +repository `_. More documentation ================== -- cgit v1.2.1 From 2b48816298bc0ad2632a393560176ed151149aa5 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 May 2013 20:37:47 -0400 Subject: Restore Python 2.4 compatible syntax --HG-- branch : distribute --- setuptools/package_index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 0a3f9e05..b0388628 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -12,7 +12,7 @@ except ImportError: from md5 import md5 from fnmatch import translate -from .py24compat import wraps +from setuptools.py24compat import wraps EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$') HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I) -- cgit v1.2.1 From 85086e979f56c92ca096642b899c9df38ac133d0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 May 2013 20:38:46 -0400 Subject: Update changelog --HG-- branch : distribute --- CHANGES.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index eb3e56e1..7d22ae1b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,12 @@ CHANGES ======= +------ +0.6.43 +------ + +* Issue #378: Restore support for Python 2.4 Syntax (regression in 0.6.42). + ------ 0.6.42 ------ -- cgit v1.2.1 From e1febd2666c8bb27d03f9fce8624e2132a09e764 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 May 2013 20:43:21 -0400 Subject: Added tag 0.6.43 for changeset 35086ee28673 --HG-- branch : distribute --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a17ee8b8..1090fe2c 100644 --- a/.hgtags +++ b/.hgtags @@ -52,3 +52,4 @@ d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39 0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42 +35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43 -- cgit v1.2.1 From c12b3db412210faa982134dce22b5e6ddad31bba Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 May 2013 20:43:50 -0400 Subject: Bumped to 0.6.44 in preparation for next release. --HG-- branch : distribute --- README.txt | 6 +++--- distribute_setup.py | 2 +- docs/conf.py | 4 ++-- release.py | 2 +- setup.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.txt b/README.txt index cdfa9e09..95eeb1c2 100755 --- a/README.txt +++ b/README.txt @@ -78,9 +78,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.43.tar.gz - $ tar -xzvf distribute-0.6.43.tar.gz - $ cd distribute-0.6.43 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.44.tar.gz + $ tar -xzvf distribute-0.6.44.tar.gz + $ cd distribute-0.6.44 $ python setup.py install --------------------------- diff --git a/distribute_setup.py b/distribute_setup.py index cb933560..a2a06664 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -49,7 +49,7 @@ except ImportError: args = [quote(arg) for arg in args] return os.spawnl(os.P_WAIT, sys.executable, *args) == 0 -DEFAULT_VERSION = "0.6.43" +DEFAULT_VERSION = "0.6.44" 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 e4e982b0..02d11707 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.43' +version = '0.6.44' # The full version, including alpha/beta/rc tags. -release = '0.6.43' +release = '0.6.44' # 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 168b7512..533c922e 100644 --- a/release.py +++ b/release.py @@ -22,7 +22,7 @@ try: except Exception: pass -VERSION = '0.6.43' +VERSION = '0.6.44' PACKAGE_INDEX = 'https://pypi.python.org/pypi' PACKAGE_INDEX = 'https://pypi.python.org/pypi' diff --git a/setup.py b/setup.py index 3ed5b1fb..69d814b7 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ exec(init_file.read(), d) init_file.close() SETUP_COMMANDS = d['__all__'] -VERSION = "0.6.43" +VERSION = "0.6.44" from setuptools import setup, find_packages from setuptools.command.build_py import build_py as _build_py -- cgit v1.2.1