Hello community, here is the log from the commit of package python-distribute for openSUSE:Factory checked in at 2013-03-08 10:55:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-distribute (Old) and /work/SRC/openSUSE:Factory/.python-distribute.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-distribute", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-distribute/python-distribute.changes 2013-01-29 07:02:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-distribute.new/python-distribute.changes 2013-03-08 10:55:43.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 18 03:21:54 UTC 2013 - [email protected] + +- Update to 0.6.35: + Note this release is backward-incompatible with distribute + 0.6.23-0.6.34 in how it parses version numbers. + * Issue #278: Restored compatibility with distribute 0.6.22 and + setuptools 0.6. Updated the documentation to match more + closely with the version parsing as intended in setuptools 0.6. + +------------------------------------------------------------------- @@ -4 +14 @@ -- Update to 0.6.44: +- Update to 0.6.34: --- /work/SRC/openSUSE:Factory/python-distribute/python3-distribute.changes 2013-01-29 07:02:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-distribute.new/python3-distribute.changes 2013-03-08 10:55:43.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 18 03:23:14 UTC 2013 - [email protected] + +- Update to 0.6.35: + Note this release is backward-incompatible with distribute + 0.6.23-0.6.34 in how it parses version numbers. + * Issue #278: Restored compatibility with distribute 0.6.22 and + setuptools 0.6. Updated the documentation to match more + closely with the version parsing as intended in setuptools 0.6. + +------------------------------------------------------------------- Old: ---- distribute-0.6.34.tar.gz New: ---- distribute-0.6.35.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-distribute.spec ++++++ --- /var/tmp/diff_new_pack.rK1CkU/_old 2013-03-08 10:55:44.000000000 +0100 +++ /var/tmp/diff_new_pack.rK1CkU/_new 2013-03-08 10:55:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-distribute # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define modname distribute %define mod2nam setuptools Name: python-%{modname} -Version: 0.6.34 +Version: 0.6.35 Release: 0 Url: http://packages.python.org/distribute Summary: Easily download, build, install, upgrade, and uninstall Python packages ++++++ python3-distribute.spec ++++++ --- /var/tmp/diff_new_pack.rK1CkU/_old 2013-03-08 10:55:44.000000000 +0100 +++ /var/tmp/diff_new_pack.rK1CkU/_new 2013-03-08 10:55:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-distribute # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define modname distribute %define mod2nam setuptools Name: python3-%{modname} -Version: 0.6.34 +Version: 0.6.35 Release: 0 Url: http://packages.python.org/distribute Summary: Easily download, build, install, upgrade, and uninstall Python packages ++++++ distribute-0.6.34.tar.gz -> distribute-0.6.35.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/CHANGES.txt new/distribute-0.6.35/CHANGES.txt --- old/distribute-0.6.34/CHANGES.txt 2012-12-31 16:25:59.000000000 +0100 +++ new/distribute-0.6.35/CHANGES.txt 2013-02-16 08:48:02.000000000 +0100 @@ -2,11 +2,22 @@ CHANGES ======= ----------- -Unreleased ----------- +------ +0.6.35 +------ + +Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in +how it parses version numbers. + +* Issue #278: Restored compatibility with distribute 0.6.22 and setuptools + 0.6. Updated the documentation to match more closely with the version + parsing as intended in setuptools 0.6. + +------ +0.6.34 +------ -+ Issue #341: 0.6.33 fails to build under python 2.4 +* Issue #341: 0.6.33 fails to build under Python 2.4. ------ 0.6.33 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/PKG-INFO new/distribute-0.6.35/PKG-INFO --- old/distribute-0.6.34/PKG-INFO 2012-12-31 16:26:55.000000000 +0100 +++ new/distribute-0.6.35/PKG-INFO 2013-02-16 09:11:52.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: distribute -Version: 0.6.34 +Version: 0.6.35 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: http://packages.python.org/distribute Author: The fellowship of the packaging @@ -107,9 +107,9 @@ Download the source tarball, uncompress it, then run the install command:: - $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz - $ tar -xzvf distribute-0.6.34.tar.gz - $ cd distribute-0.6.34 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.35.tar.gz + $ tar -xzvf distribute-0.6.35.tar.gz + $ cd distribute-0.6.35 $ python setup.py install --------------------------- @@ -238,11 +238,22 @@ CHANGES ======= - ---------- - Unreleased - ---------- + ------ + 0.6.35 + ------ + + Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in + how it parses version numbers. + + * `Issue #278`_: Restored compatibility with distribute 0.6.22 and setuptools + 0.6. Updated the documentation to match more closely with the version + parsing as intended in setuptools 0.6. + + ------ + 0.6.34 + ------ - + `Issue #341`_: 0.6.33 fails to build under python 2.4 + * `Issue #341`_: 0.6.33 fails to build under Python 2.4. ------ 0.6.33 @@ -273,8 +284,8 @@ * `Issue #303`_: Make sure the manifest only ever contains UTF-8 in Python 3. * `Issue #329`_: Properly close files created by tests for compatibility with Jython. - * Work around Jython bugs `#1980 <http://bugs.jython.org/`issue1980`_>`_ and - `#1981 <http://bugs.jython.org/`issue1981`_>`_. + * Work around Jython bugs `#1980 <http://bugs.jython.org/issue1980>`_ and + `#1981 <http://bugs.jython.org/issue1981>`_. * `Issue #334`_: Provide workaround for packages that reference `sys.__stdout__` such as numpy does. This change should address `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long @@ -625,19 +636,19 @@ ========== * Added Python 3 support; see docs/python3.txt. - This closes http://bugs.python.org/setuptools/`issue39`_. + This closes http://bugs.python.org/setuptools/issue39. * Added option to run 2to3 automatically when installing on Python 3. This closes `issue #31`_. * Fixed invalid usage of requirement.parse, that broke develop -d. - This closes http://bugs.python.org/setuptools/`issue44`_. + This closes http://bugs.python.org/setuptools/issue44. * Fixed script launcher for 64-bit Windows. - This closes http://bugs.python.org/setuptools/`issue2`_. + This closes http://bugs.python.org/setuptools/issue2. * KeyError when compiling extensions. - This closes http://bugs.python.org/setuptools/`issue41`_. + This closes http://bugs.python.org/setuptools/issue41. bootstrapping ============= @@ -647,7 +658,7 @@ * Fixed 2.6 dependencies. This closes `issue #50`_. * Make sure setuptools is patched when running through easy_install - This closes http://bugs.python.org/setuptools/`issue40`_. + This closes http://bugs.python.org/setuptools/issue40. ----- 0.6.1 @@ -660,9 +671,9 @@ This closes `issue #16`_ and `issue #18`_. * zip_ok is now False by default. This closes - http://bugs.python.org/setuptools/`issue33`_. + http://bugs.python.org/setuptools/issue33. - * Fixed invalid URL error catching. http://bugs.python.org/setuptools/`issue20`_. + * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20. * Fixed invalid bootstraping with easy_install installation (`issue #40`_). Thanks to Florian Schulze for the help. @@ -746,6 +757,7 @@ .. _`Issue #269`: http://bitbucket.org/tarek/distribute/issue/269 .. _`Issue #272`: http://bitbucket.org/tarek/distribute/issue/272 .. _`Issue #273`: http://bitbucket.org/tarek/distribute/issue/273 + .. _`Issue #278`: http://bitbucket.org/tarek/distribute/issue/278 .. _`Issue #283`: http://bitbucket.org/tarek/distribute/issue/283 .. _`Issue #294`: http://bitbucket.org/tarek/distribute/issue/294 .. _`Issue #299`: http://bitbucket.org/tarek/distribute/issue/299 @@ -836,15 +848,6 @@ .. _`issue #7`: http://bitbucket.org/tarek/distribute/issue/7 .. _`issue #8`: http://bitbucket.org/tarek/distribute/issue/8 .. _`issue #9`: http://bitbucket.org/tarek/distribute/issue/9 - .. _`issue1980`: http://bitbucket.org/tarek/distribute/issue/1980 - .. _`issue1981`: http://bitbucket.org/tarek/distribute/issue/1981 - .. _`issue2`: http://bitbucket.org/tarek/distribute/issue/2 - .. _`issue20`: http://bitbucket.org/tarek/distribute/issue/20 - .. _`issue33`: http://bitbucket.org/tarek/distribute/issue/33 - .. _`issue39`: http://bitbucket.org/tarek/distribute/issue/39 - .. _`issue40`: http://bitbucket.org/tarek/distribute/issue/40 - .. _`issue41`: http://bitbucket.org/tarek/distribute/issue/41 - .. _`issue44`: http://bitbucket.org/tarek/distribute/issue/44 Keywords: CPAN PyPI distutils eggs package management diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/README.txt new/distribute-0.6.35/README.txt --- old/distribute-0.6.34/README.txt 2012-12-29 23:10:53.000000000 +0100 +++ new/distribute-0.6.35/README.txt 2013-02-16 08:48:02.000000000 +0100 @@ -99,9 +99,9 @@ Download the source tarball, uncompress it, then run the install command:: - $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz - $ tar -xzvf distribute-0.6.34.tar.gz - $ cd distribute-0.6.34 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.35.tar.gz + $ tar -xzvf distribute-0.6.35.tar.gz + $ cd distribute-0.6.35 $ python setup.py install --------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/distribute.egg-info/PKG-INFO new/distribute-0.6.35/distribute.egg-info/PKG-INFO --- old/distribute-0.6.34/distribute.egg-info/PKG-INFO 2012-12-31 16:26:53.000000000 +0100 +++ new/distribute-0.6.35/distribute.egg-info/PKG-INFO 2013-02-16 09:11:52.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: distribute -Version: 0.6.34 +Version: 0.6.35 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: http://packages.python.org/distribute Author: The fellowship of the packaging @@ -107,9 +107,9 @@ Download the source tarball, uncompress it, then run the install command:: - $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz - $ tar -xzvf distribute-0.6.34.tar.gz - $ cd distribute-0.6.34 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.35.tar.gz + $ tar -xzvf distribute-0.6.35.tar.gz + $ cd distribute-0.6.35 $ python setup.py install --------------------------- @@ -238,11 +238,22 @@ CHANGES ======= - ---------- - Unreleased - ---------- + ------ + 0.6.35 + ------ + + Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in + how it parses version numbers. + + * `Issue #278`_: Restored compatibility with distribute 0.6.22 and setuptools + 0.6. Updated the documentation to match more closely with the version + parsing as intended in setuptools 0.6. + + ------ + 0.6.34 + ------ - + `Issue #341`_: 0.6.33 fails to build under python 2.4 + * `Issue #341`_: 0.6.33 fails to build under Python 2.4. ------ 0.6.33 @@ -273,8 +284,8 @@ * `Issue #303`_: Make sure the manifest only ever contains UTF-8 in Python 3. * `Issue #329`_: Properly close files created by tests for compatibility with Jython. - * Work around Jython bugs `#1980 <http://bugs.jython.org/`issue1980`_>`_ and - `#1981 <http://bugs.jython.org/`issue1981`_>`_. + * Work around Jython bugs `#1980 <http://bugs.jython.org/issue1980>`_ and + `#1981 <http://bugs.jython.org/issue1981>`_. * `Issue #334`_: Provide workaround for packages that reference `sys.__stdout__` such as numpy does. This change should address `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long @@ -625,19 +636,19 @@ ========== * Added Python 3 support; see docs/python3.txt. - This closes http://bugs.python.org/setuptools/`issue39`_. + This closes http://bugs.python.org/setuptools/issue39. * Added option to run 2to3 automatically when installing on Python 3. This closes `issue #31`_. * Fixed invalid usage of requirement.parse, that broke develop -d. - This closes http://bugs.python.org/setuptools/`issue44`_. + This closes http://bugs.python.org/setuptools/issue44. * Fixed script launcher for 64-bit Windows. - This closes http://bugs.python.org/setuptools/`issue2`_. + This closes http://bugs.python.org/setuptools/issue2. * KeyError when compiling extensions. - This closes http://bugs.python.org/setuptools/`issue41`_. + This closes http://bugs.python.org/setuptools/issue41. bootstrapping ============= @@ -647,7 +658,7 @@ * Fixed 2.6 dependencies. This closes `issue #50`_. * Make sure setuptools is patched when running through easy_install - This closes http://bugs.python.org/setuptools/`issue40`_. + This closes http://bugs.python.org/setuptools/issue40. ----- 0.6.1 @@ -660,9 +671,9 @@ This closes `issue #16`_ and `issue #18`_. * zip_ok is now False by default. This closes - http://bugs.python.org/setuptools/`issue33`_. + http://bugs.python.org/setuptools/issue33. - * Fixed invalid URL error catching. http://bugs.python.org/setuptools/`issue20`_. + * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20. * Fixed invalid bootstraping with easy_install installation (`issue #40`_). Thanks to Florian Schulze for the help. @@ -746,6 +757,7 @@ .. _`Issue #269`: http://bitbucket.org/tarek/distribute/issue/269 .. _`Issue #272`: http://bitbucket.org/tarek/distribute/issue/272 .. _`Issue #273`: http://bitbucket.org/tarek/distribute/issue/273 + .. _`Issue #278`: http://bitbucket.org/tarek/distribute/issue/278 .. _`Issue #283`: http://bitbucket.org/tarek/distribute/issue/283 .. _`Issue #294`: http://bitbucket.org/tarek/distribute/issue/294 .. _`Issue #299`: http://bitbucket.org/tarek/distribute/issue/299 @@ -836,15 +848,6 @@ .. _`issue #7`: http://bitbucket.org/tarek/distribute/issue/7 .. _`issue #8`: http://bitbucket.org/tarek/distribute/issue/8 .. _`issue #9`: http://bitbucket.org/tarek/distribute/issue/9 - .. _`issue1980`: http://bitbucket.org/tarek/distribute/issue/1980 - .. _`issue1981`: http://bitbucket.org/tarek/distribute/issue/1981 - .. _`issue2`: http://bitbucket.org/tarek/distribute/issue/2 - .. _`issue20`: http://bitbucket.org/tarek/distribute/issue/20 - .. _`issue33`: http://bitbucket.org/tarek/distribute/issue/33 - .. _`issue39`: http://bitbucket.org/tarek/distribute/issue/39 - .. _`issue40`: http://bitbucket.org/tarek/distribute/issue/40 - .. _`issue41`: http://bitbucket.org/tarek/distribute/issue/41 - .. _`issue44`: http://bitbucket.org/tarek/distribute/issue/44 Keywords: CPAN PyPI distutils eggs package management diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/distribute_setup.py new/distribute-0.6.35/distribute_setup.py --- old/distribute-0.6.34/distribute_setup.py 2012-12-29 23:10:53.000000000 +0100 +++ new/distribute-0.6.35/distribute_setup.py 2013-02-16 08:48:02.000000000 +0100 @@ -49,7 +49,7 @@ args = [quote(arg) for arg in args] return os.spawnl(os.P_WAIT, sys.executable, *args) == 0 -DEFAULT_VERSION = "0.6.34" +DEFAULT_VERSION = "0.6.35" DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"; SETUPTOOLS_FAKED_VERSION = "0.6c11" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/docs/build/html/_sources/setuptools.txt new/distribute-0.6.35/docs/build/html/_sources/setuptools.txt --- old/distribute-0.6.34/docs/build/html/_sources/setuptools.txt 2012-12-17 21:03:01.000000000 +0100 +++ new/distribute-0.6.35/docs/build/html/_sources/setuptools.txt 2013-02-16 08:48:02.000000000 +0100 @@ -187,10 +187,11 @@ A pre-release tag is a series of letters that are alphabetically before "final". Some examples of prerelease tags would include ``alpha``, ``beta``, -``a``, ``c``, ``dev``, and so on. You do not have to place a dot before -the prerelease tag if it's immediately after a number, but it's okay to do -so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` both represent release -candidate 1 of version ``2.4``, and are treated as identical by setuptools. +``a``, ``c``, ``dev``, and so on. You do not have to place a dot or dash +before the prerelease tag if it's immediately after a number, but it's okay to +do so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all +represent release candidate 1 of version ``2.4``, and are treated as identical +by setuptools. In addition, there are three special prerelease tags that are treated as if they were the letter ``c``: ``pre``, ``preview``, and ``rc``. So, version @@ -216,13 +217,6 @@ For the most part, setuptools' interpretation of version numbers is intuitive, but here are a few tips that will keep you out of trouble in the corner cases: -* Don't use ``-`` or any other character than ``.`` as a separator, unless you - really want a post-release. Remember that ``2.1-rc2`` means you've - *already* released ``2.1``, whereas ``2.1rc2`` and ``2.1.c2`` are candidates - you're putting out *before* ``2.1``. If you accidentally distribute copies - of a post-release that you meant to be a pre-release, the only safe fix is to - bump your main release number (e.g. to ``2.1.1``) and re-release the project. - * Don't stick adjoining pre-release tags together without a dot or number between them. Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``, *not* a development pre-release of ``1.9a``. Use ``.dev`` instead, as in @@ -239,7 +233,7 @@ >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev') True >>> parse_version('2.1-rc2') < parse_version('2.1') - False + True >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9') True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/docs/conf.py new/distribute-0.6.35/docs/conf.py --- old/distribute-0.6.34/docs/conf.py 2012-12-29 23:10:53.000000000 +0100 +++ new/distribute-0.6.35/docs/conf.py 2013-02-16 08:48:02.000000000 +0100 @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '0.6.34' +version = '0.6.35' # The full version, including alpha/beta/rc tags. -release = '0.6.34' +release = '0.6.35' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/docs/setuptools.txt new/distribute-0.6.35/docs/setuptools.txt --- old/distribute-0.6.34/docs/setuptools.txt 2012-12-17 21:03:01.000000000 +0100 +++ new/distribute-0.6.35/docs/setuptools.txt 2013-02-16 08:48:02.000000000 +0100 @@ -187,10 +187,11 @@ A pre-release tag is a series of letters that are alphabetically before "final". Some examples of prerelease tags would include ``alpha``, ``beta``, -``a``, ``c``, ``dev``, and so on. You do not have to place a dot before -the prerelease tag if it's immediately after a number, but it's okay to do -so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` both represent release -candidate 1 of version ``2.4``, and are treated as identical by setuptools. +``a``, ``c``, ``dev``, and so on. You do not have to place a dot or dash +before the prerelease tag if it's immediately after a number, but it's okay to +do so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all +represent release candidate 1 of version ``2.4``, and are treated as identical +by setuptools. In addition, there are three special prerelease tags that are treated as if they were the letter ``c``: ``pre``, ``preview``, and ``rc``. So, version @@ -216,13 +217,6 @@ For the most part, setuptools' interpretation of version numbers is intuitive, but here are a few tips that will keep you out of trouble in the corner cases: -* Don't use ``-`` or any other character than ``.`` as a separator, unless you - really want a post-release. Remember that ``2.1-rc2`` means you've - *already* released ``2.1``, whereas ``2.1rc2`` and ``2.1.c2`` are candidates - you're putting out *before* ``2.1``. If you accidentally distribute copies - of a post-release that you meant to be a pre-release, the only safe fix is to - bump your main release number (e.g. to ``2.1.1``) and re-release the project. - * Don't stick adjoining pre-release tags together without a dot or number between them. Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``, *not* a development pre-release of ``1.9a``. Use ``.dev`` instead, as in @@ -239,7 +233,7 @@ >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev') True >>> parse_version('2.1-rc2') < parse_version('2.1') - False + True >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9') True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/pkg_resources.py new/distribute-0.6.35/pkg_resources.py --- old/distribute-0.6.34/pkg_resources.py 2012-12-31 16:25:59.000000000 +0100 +++ new/distribute-0.6.35/pkg_resources.py 2013-02-16 08:48:02.000000000 +0100 @@ -1936,7 +1936,7 @@ def _parse_version_parts(s): for part in component_re.split(s): part = replace(part,part) - if part in ['', '.']: + if not part or part=='.': continue if part[:1] in '0123456789': yield part.zfill(8) # pad for numeric comparison @@ -1979,6 +1979,8 @@ parts = [] for part in _parse_version_parts(s.lower()): if part.startswith('*'): + if part<'*final': # remove '-' before a prerelease tag + while parts and parts[-1]=='*final-': parts.pop() # remove trailing zeros from each series of numeric parts while parts and parts[-1]=='00000000': parts.pop() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/release.py new/distribute-0.6.35/release.py --- old/distribute-0.6.34/release.py 2012-12-29 23:10:53.000000000 +0100 +++ new/distribute-0.6.35/release.py 2013-02-16 08:48:02.000000000 +0100 @@ -20,7 +20,7 @@ except Exception: pass -VERSION = '0.6.34' +VERSION = '0.6.35' def get_next_version(): digits = map(int, VERSION.split('.')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/setup.py new/distribute-0.6.35/setup.py --- old/distribute-0.6.34/setup.py 2012-12-29 23:10:53.000000000 +0100 +++ new/distribute-0.6.35/setup.py 2013-02-16 08:48:02.000000000 +0100 @@ -46,7 +46,7 @@ init_file.close() SETUP_COMMANDS = d['__all__'] -VERSION = "0.6.34" +VERSION = "0.6.35" from setuptools import setup, find_packages from setuptools.command.build_py import build_py as _build_py @@ -136,7 +136,7 @@ # return contents of reStructureText file with linked issue references def _linkified(rst_path): bitroot = 'http://bitbucket.org/tarek/distribute' - revision = re.compile(r'\b(issue\s*#?\d+)\b', re.M | re.I) + revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I) rst_file = open(rst_path) rst_content = rst_file.read() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.34/setuptools/tests/test_resources.py new/distribute-0.6.35/setuptools/tests/test_resources.py --- old/distribute-0.6.34/setuptools/tests/test_resources.py 2012-12-17 21:03:02.000000000 +0100 +++ new/distribute-0.6.35/setuptools/tests/test_resources.py 2013-02-16 08:48:02.000000000 +0100 @@ -477,13 +477,14 @@ p1, p2 = parse_version(s1),parse_version(s2) self.assertEqual(p1,p2, (s1,s2,p1,p2)) + c('1.2-rc1', '1.2rc1') c('0.4', '0.4.0') c('0.4.0.0', '0.4.0') c('0.4.0-0', '0.4-0') c('0pl1', '0.0pl1') c('0pre1', '0.0c1') c('0.0.0preview1', '0c1') - c('0.0c1', '0rc1') + c('0.0c1', '0-rc1') c('1.2a1', '1.2.a.1'); c('1.2...a', '1.2a') def testVersionOrdering(self): @@ -492,14 +493,11 @@ self.assertTrue(p1<p2, (s1,s2,p1,p2)) c('2.1','2.1.1') - c('2.1.0','2.10') c('2a1','2b0') - c('2b1','2c0') c('2a1','2.1') c('2.3a1', '2.3') c('2.1-1', '2.1-2') c('2.1-1', '2.1.1') - c('2.1', '2.1.1-1') c('2.1', '2.1pl4') c('2.1a0-20040501', '2.1') c('1.1', '02.1') @@ -510,20 +508,8 @@ c('0.4', '4.0') c('0.0.4', '0.4.0') c('0pl1', '0.4pl1') + c('2.1.0-rc1','2.1.0') c('2.1dev','2.1a0') - c('2.1.0rc1','2.1.0') - c('2.1.0','2.1.0-rc0') - c('2.1.0','2.1.0-a') - c('2.1.0','2.1.0-alpha') - c('2.1.0','2.1.0-foo') - c('1.0','1.0-1') - c('1.0-1','1.0.1') - c('1.0a','1.0b') - c('1.0dev','1.0rc1') - c('1.0pre','1.0') - c('1.0pre','1.0') - c('1.0a','1.0-a') - c('1.0rc1','1.0-rc1') torture =""" 0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
