Hello community,
here is the log from the commit of package python3-setuptools for
openSUSE:Factory checked in at 2015-03-05 15:39:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-setuptools (Old)
and /work/SRC/openSUSE:Factory/.python3-setuptools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-setuptools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-setuptools/python3-setuptools.changes
2015-02-18 11:38:00.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes
2015-03-05 18:15:58.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Mar 4 16:45:06 UTC 2015 - a...@gmx.de
+
+- update to version 12.4:
+ * Pull Request #119: Restore writing of "setup_requires" to metadata
+ (previously added in 8.4 and removed in 9.0).
+
+-------------------------------------------------------------------
+Fri Feb 27 21:43:42 UTC 2015 - a...@gmx.de
+
+- update to version 12.3:
+ * Documentation is now linked using the rst.linker package.
+ * Fix ``setuptools.command.easy_install.extract_wininst_cfg()``
+ with Python 2.6 and 2.7.
+ * Issue #354. Added documentation on building setuptools
+ documentation.
+
+-------------------------------------------------------------------
Old:
----
setuptools-12.2.tar.gz
New:
----
setuptools-12.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.xu1m4Z/_old 2015-03-05 18:15:59.000000000 +0100
+++ /var/tmp/diff_new_pack.xu1m4Z/_new 2015-03-05 18:15:59.000000000 +0100
@@ -17,7 +17,7 @@
Name: python3-setuptools
-Version: 12.2
+Version: 12.4
Release: 0
Url: http://pypi.python.org/pypi/setuptools
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
++++++ setuptools-12.2.tar.gz -> setuptools-12.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/.hgtags new/setuptools-12.4/.hgtags
--- old/setuptools-12.2/.hgtags 2015-02-16 16:24:29.000000000 +0100
+++ new/setuptools-12.4/.hgtags 2015-03-04 17:07:53.000000000 +0100
@@ -193,3 +193,5 @@
73dcfc90e3eecec6baddea19302c6b342e68e2fa 12.0.4
01fbfc9194a2bc502edd682eebbf4d2f1bc79eee 12.0.5
7bca8938434839dbb546b8bfccd9aab7a86d851e 12.1
+5ff5c804a8fa580cff499ba0025ff2e6a5474fd0 12.2
+8d50aac3b20793954121edb300b477cc75f3ec96 12.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/.travis.yml
new/setuptools-12.4/.travis.yml
--- old/setuptools-12.2/.travis.yml 2015-02-16 14:57:31.000000000 +0100
+++ new/setuptools-12.4/.travis.yml 2015-03-03 23:47:07.000000000 +0100
@@ -11,5 +11,5 @@
# update egg_info based on setup.py in checkout
- python bootstrap.py
- - python setup.py ptr --addopts='-rs'
- - python ez_setup.py --version 10.2.1
+ - python setup.py test --addopts='-rs'
+ - python ez_setup.py --version 12.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/CHANGES.txt
new/setuptools-12.4/CHANGES.txt
--- old/setuptools-12.2/CHANGES.txt 2015-02-16 16:19:03.000000000 +0100
+++ new/setuptools-12.4/CHANGES.txt 2015-03-03 23:49:50.000000000 +0100
@@ -3,6 +3,23 @@
=======
----
+12.4
+----
+
+* Pull Request #119: Restore writing of ``setup_requires`` to metadata
+ (previously added in 8.4 and removed in 9.0).
+
+----
+12.3
+----
+
+* Documentation is now linked using the rst.linker package.
+* Fix ``setuptools.command.easy_install.extract_wininst_cfg()``
+ with Python 2.6 and 2.7.
+* Issue #354. Added documentation on building setuptools
+ documentation.
+
+----
12.2
----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/PKG-INFO new/setuptools-12.4/PKG-INFO
--- old/setuptools-12.2/PKG-INFO 2015-02-16 16:24:39.000000000 +0100
+++ new/setuptools-12.4/PKG-INFO 2015-03-04 17:07:59.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 12.2
+Version: 12.4
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://bitbucket.org/pypa/setuptools
Author: Python Packaging Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/docs/conf.py
new/setuptools-12.4/docs/conf.py
--- old/setuptools-12.2/docs/conf.py 2015-02-16 14:57:31.000000000 +0100
+++ new/setuptools-12.4/docs/conf.py 2015-03-03 23:47:08.000000000 +0100
@@ -28,7 +28,7 @@
# Add any Sphinx extension module names here, as strings. They can be
extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['linkify']
+extensions = ['rst.linker']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -198,3 +198,50 @@
# If false, no module index is generated.
#latex_use_modindex = True
+
+link_files = {
+ 'CHANGES.txt': dict(
+ using=dict(
+ BB='https://bitbucket.org',
+ GH='https://github.com',
+ ),
+ replace=[
+ dict(
+ pattern=r"(Issue )?#(?P<issue>\d+)",
+ url='{BB}/pypa/setuptools/issue/{issue}',
+ ),
+ dict(
+ pattern=r"Pull Request ?#(?P<pull_request>\d+)",
+
url='{BB}/pypa/setuptools/pull-request/{pull_request}',
+ ),
+ dict(
+ pattern=r"Distribute #(?P<distribute>\d+)",
+ url='{BB}/tarek/distribute/issue/{distribute}',
+ ),
+ dict(
+ pattern=r"Buildout #(?P<buildout>\d+)",
+ url='{GH}/buildout/buildout/issues/{buildout}',
+ ),
+ dict(
+ pattern=r"Old Setuptools
#(?P<old_setuptools>\d+)",
+
url='http://bugs.python.org/setuptools/issue{old_setuptools}',
+ ),
+ dict(
+ pattern=r"Jython #(?P<jython>\d+)",
+ url='http://bugs.jython.org/issue{jython}',
+ ),
+ dict(
+ pattern=r"Python #(?P<python>\d+)",
+ url='http://bugs.python.org/issue{python}',
+ ),
+ dict(
+ pattern=r"Interop #(?P<interop>\d+)",
+
url='{GH}/pypa/interoperability-peps/issues/{interop}',
+ ),
+ dict(
+ pattern=r"Pip #(?P<pip>\d+)",
+ url='{GH}/pypa/pip/issues/{pip}',
+ ),
+ ],
+ ),
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/docs/developer-guide.txt
new/setuptools-12.4/docs/developer-guide.txt
--- old/setuptools-12.2/docs/developer-guide.txt 2015-02-16
14:57:31.000000000 +0100
+++ new/setuptools-12.4/docs/developer-guide.txt 2015-03-03
23:47:08.000000000 +0100
@@ -109,3 +109,20 @@
- Omits 'v' prefix for tags.
.. explain value of reflecting meaning in versions.
+
+----------------------
+Building Documentation
+----------------------
+
+Setuptools relies on the Sphinx system for building documentation and in
+particular the ``build_sphinx`` distutils command. To build the
+documentation, invoke::
+
+ python setup.py build_sphinx
+
+from the root of the repository. Setuptools will download a compatible
+build of Sphinx and any requisite plugins and then build the
+documentation in the build/sphinx directory.
+
+Setuptools does not support invoking the doc builder from the docs/
+directory as some tools expect.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/docs/development.txt
new/setuptools-12.4/docs/development.txt
--- old/setuptools-12.2/docs/development.txt 2015-02-16 14:57:31.000000000
+0100
+++ new/setuptools-12.4/docs/development.txt 2015-03-03 23:47:08.000000000
+0100
@@ -33,4 +33,3 @@
developer-guide
formats
releases
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/ez_setup.py
new/setuptools-12.4/ez_setup.py
--- old/setuptools-12.2/ez_setup.py 2015-02-16 16:10:44.000000000 +0100
+++ new/setuptools-12.4/ez_setup.py 2015-03-03 23:47:08.000000000 +0100
@@ -30,7 +30,7 @@
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "12.2"
+DEFAULT_VERSION = "12.4"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/linkify.py
new/setuptools-12.4/linkify.py
--- old/setuptools-12.2/linkify.py 2015-02-16 14:57:32.000000000 +0100
+++ new/setuptools-12.4/linkify.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-"""
-Sphinx plugin to add links to the changelog.
-"""
-
-import re
-import os
-
-
-link_patterns = [
- r"(Issue )?#(?P<issue>\d+)",
- r"Pull Request ?#(?P<pull_request>\d+)",
- r"Distribute #(?P<distribute>\d+)",
- r"Buildout #(?P<buildout>\d+)",
- r"Old Setuptools #(?P<old_setuptools>\d+)",
- r"Jython #(?P<jython>\d+)",
- r"Python #(?P<python>\d+)",
- r"Interop #(?P<interop>\d+)",
- r"Pip #(?P<pip>\d+)",
-]
-
-issue_urls = dict(
- pull_request='https://bitbucket.org'
- '/pypa/setuptools/pull-request/{pull_request}',
- issue='https://bitbucket.org/pypa/setuptools/issue/{issue}',
- distribute='https://bitbucket.org/tarek/distribute/issue/{distribute}',
- buildout='https://github.com/buildout/buildout/issues/{buildout}',
- old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
- jython='http://bugs.jython.org/issue{jython}',
- python='http://bugs.python.org/issue{python}',
- interop='https://github.com/pypa/interoperability-peps/issues/{interop}',
- pip='https://github.com/pypa/pip/issues/{pip}',
-)
-
-
-def _linkify(source, dest):
- pattern = '|'.join(link_patterns)
- with open(source) as source:
- out = re.sub(pattern, replacer, source.read())
- with open(dest, 'w') as dest:
- dest.write(out)
-
-
-def replacer(match):
- text = match.group(0)
- match_dict = match.groupdict()
- for key in match_dict:
- if match_dict[key]:
- url = issue_urls[key].format(**match_dict)
- return "`{text} <{url}>`_".format(text=text, url=url)
-
-def setup(app):
- _linkify('CHANGES.txt', 'CHANGES (links).txt')
- app.connect('build-finished', remove_file)
-
-def remove_file(app, exception):
- os.remove('CHANGES (links).txt')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/pytest.ini
new/setuptools-12.4/pytest.ini
--- old/setuptools-12.2/pytest.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-12.4/pytest.ini 2015-03-03 23:47:08.000000000 +0100
@@ -0,0 +1,3 @@
+[pytest]
+addopts=--doctest-modules --ignore release.py --ignore
setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore
tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt
+norecursedirs=dist build *.egg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setup.cfg
new/setuptools-12.4/setup.cfg
--- old/setuptools-12.2/setup.cfg 2015-02-16 16:24:39.000000000 +0100
+++ new/setuptools-12.4/setup.cfg 2015-03-04 17:07:59.000000000 +0100
@@ -1,12 +1,13 @@
[egg_info]
tag_build =
-tag_svn_revision = 0
tag_date = 0
+tag_svn_revision = 0
[aliases]
release = egg_info -RDb ''
source = register sdist binary
binary = bdist_egg upload --show-response
+test = pytest
[build_sphinx]
source-dir = docs/
@@ -22,7 +23,3 @@
[wheel]
universal = 1
-[pytest]
-addopts = --doctest-modules --ignore release.py --ignore
setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore
tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt
-norecursedirs = dist build *.egg
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setup.py new/setuptools-12.4/setup.py
--- old/setuptools-12.2/setup.py 2015-02-16 14:57:32.000000000 +0100
+++ new/setuptools-12.4/setup.py 2015-03-04 16:10:35.000000000 +0100
@@ -1,5 +1,8 @@
#!/usr/bin/env python
-"""Distutils setup file, used to install or test 'setuptools'"""
+"""
+Distutils setup file, used to install or test 'setuptools'
+"""
+
import io
import os
import sys
@@ -75,7 +78,10 @@
package_data.setdefault('setuptools', []).extend(['*.exe'])
package_data.setdefault('setuptools.command', []).extend(['*.xml'])
-pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
+needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
+pytest_runner = ['pytest-runner'] if needs_pytest else []
+needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
+sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
setup_params = dict(
name="setuptools",
@@ -126,6 +132,7 @@
"egg_info.writers": [
"PKG-INFO = setuptools.command.egg_info:write_pkg_info",
"requires.txt = setuptools.command.egg_info:write_requirements",
+ "setup_requires.txt =
setuptools.command.egg_info:write_setup_requirements",
"entry_points.txt = setuptools.command.egg_info:write_entries",
"eager_resources.txt = setuptools.command.egg_info:overwrite_arg",
"namespace_packages.txt =
setuptools.command.egg_info:overwrite_arg",
@@ -172,7 +179,7 @@
'pytest',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[
- ] + pytest_runner,
+ ] + sphinx + pytest_runner,
)
if __name__ == '__main__':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setuptools/command/bdist_egg.py
new/setuptools-12.4/setuptools/command/bdist_egg.py
--- old/setuptools-12.2/setuptools/command/bdist_egg.py 2015-02-16
14:57:32.000000000 +0100
+++ new/setuptools-12.4/setuptools/command/bdist_egg.py 2015-03-03
23:47:09.000000000 +0100
@@ -2,7 +2,6 @@
Build .egg distributions"""
-# This module should be kept compatible with Python 2.3
from distutils.errors import DistutilsSetupError
from distutils.dir_util import remove_tree, mkpath
from distutils import log
@@ -406,10 +405,6 @@
if bad in symbols:
log.warn("%s: module MAY be using inspect.%s", module, bad)
safe = False
- if '__name__' in symbols and '__main__' in symbols and '.' not in module:
- if sys.version[:3] == "2.4": # -m works w/zipfiles in 2.5
- log.warn("%s: top-level module may be 'python -m' script", module)
- safe = False
return safe
@@ -441,7 +436,7 @@
]
-def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=None,
+def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=True,
mode='w'):
"""Create a zip file from all the files under 'base_dir'. The output
zip file will be named 'base_dir' + ".zip". Uses either the "zipfile"
@@ -463,11 +458,7 @@
z.write(path, p)
log.debug("adding '%s'" % p)
- if compress is None:
- # avoid 2.3 zipimport bug when 64 bits
- compress = (sys.version >= "2.4")
-
- compression = [zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED][bool(compress)]
+ compression = zipfile.ZIP_DEFLATED if compress else zipfile.ZIP_STORED
if not dry_run:
z = zipfile.ZipFile(zip_filename, mode, compression=compression)
for dirname, dirs, files in os.walk(base_dir):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setuptools/command/build_py.py
new/setuptools-12.4/setuptools/command/build_py.py
--- old/setuptools-12.2/setuptools/command/build_py.py 2015-02-16
14:57:32.000000000 +0100
+++ new/setuptools-12.4/setuptools/command/build_py.py 2015-03-03
23:47:09.000000000 +0100
@@ -136,22 +136,7 @@
mf.setdefault(src_dirs[d], []).append(path)
def get_data_files(self):
- pass # kludge 2.4 for lazy computation
-
- if sys.version < "2.4": # Python 2.4 already has this code
- def get_outputs(self, include_bytecode=1):
- """Return complete list of files copied to the build directory
-
- This includes both '.py' files and data files, as well as '.pyc'
- and '.pyo' files if 'include_bytecode' is true. (This method is
- needed for the 'install_lib' command to do its job properly, and to
- generate a correct installation manifest.)
- """
- return orig.build_py.get_outputs(self, include_bytecode) + [
- os.path.join(build_dir, filename)
- for package, src_dir, build_dir, filenames in self.data_files
- for filename in filenames
- ]
+ pass # Lazily compute data files in _get_data_files() function.
def check_package(self, package, package_dir):
"""Check namespace packages' __init__ for declare_namespace"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setuptools/command/easy_install.py
new/setuptools-12.4/setuptools/command/easy_install.py
--- old/setuptools-12.2/setuptools/command/easy_install.py 2015-02-16
14:57:32.000000000 +0100
+++ new/setuptools-12.4/setuptools/command/easy_install.py 2015-03-03
23:47:09.000000000 +0100
@@ -1413,13 +1413,8 @@
{'version': '', 'target_version': ''})
try:
part = f.read(cfglen)
- # part is in bytes, but we need to read up to the first null
- # byte.
- if sys.version_info >= (2, 6):
- null_byte = bytes([0])
- else:
- null_byte = chr(0)
- config = part.split(null_byte, 1)[0]
+ # Read up to the first null byte.
+ config = part.split(b'\0', 1)[0]
# Now the config is in bytes, but for RawConfigParser, it should
# be text, so decode it.
config = config.decode(sys.getfilesystemencoding())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setuptools/version.py
new/setuptools-12.4/setuptools/version.py
--- old/setuptools-12.2/setuptools/version.py 2015-02-16 14:57:33.000000000
+0100
+++ new/setuptools-12.4/setuptools/version.py 2015-03-03 23:47:11.000000000
+0100
@@ -1 +1 @@
-__version__ = '12.2'
+__version__ = '12.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setuptools.egg-info/PKG-INFO
new/setuptools-12.4/setuptools.egg-info/PKG-INFO
--- old/setuptools-12.2/setuptools.egg-info/PKG-INFO 2015-02-16
16:24:34.000000000 +0100
+++ new/setuptools-12.4/setuptools.egg-info/PKG-INFO 2015-03-04
17:07:56.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 12.2
+Version: 12.4
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://bitbucket.org/pypa/setuptools
Author: Python Packaging Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setuptools.egg-info/SOURCES.txt
new/setuptools-12.4/setuptools.egg-info/SOURCES.txt
--- old/setuptools-12.2/setuptools.egg-info/SOURCES.txt 2015-02-16
16:24:39.000000000 +0100
+++ new/setuptools-12.4/setuptools.egg-info/SOURCES.txt 2015-03-04
17:07:59.000000000 +0100
@@ -12,8 +12,8 @@
easy_install.py
ez_setup.py
launcher.c
-linkify.py
msvc-build-launcher.cmd
+pytest.ini
release.py
setup.cfg
setup.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.2/setuptools.egg-info/entry_points.txt
new/setuptools-12.4/setuptools.egg-info/entry_points.txt
--- old/setuptools-12.2/setuptools.egg-info/entry_points.txt 2015-02-16
16:24:34.000000000 +0100
+++ new/setuptools-12.4/setuptools.egg-info/entry_points.txt 2015-03-04
17:07:56.000000000 +0100
@@ -54,6 +54,7 @@
entry_points.txt = setuptools.command.egg_info:write_entries
namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
requires.txt = setuptools.command.egg_info:write_requirements
+setup_requires.txt = setuptools.command.egg_info:write_setup_requirements
top_level.txt = setuptools.command.egg_info:write_toplevel_names
[setuptools.installation]
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
