Hello community,
here is the log from the commit of package python-zc.buildout for
openSUSE:Factory checked in at 2018-01-29 14:58:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-zc.buildout (Old)
and /work/SRC/openSUSE:Factory/.python-zc.buildout.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-zc.buildout"
Mon Jan 29 14:58:51 2018 rev:4 rq:570414 version:2.11.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-zc.buildout/python-zc.buildout.changes
2017-12-11 18:56:29.998570235 +0100
+++
/work/SRC/openSUSE:Factory/.python-zc.buildout.new/python-zc.buildout.changes
2018-01-29 15:00:27.950089219 +0100
@@ -1,0 +2,19 @@
+Sun Jan 21 21:24:40 UTC 2018 - [email protected]
+
+- update to version 2.11.0:
+ - Installed packages are added to the working set immediately. This helps in
+ some corner cases that occur when system packages have versions that
+ conflict with our specified versions.
+- update to verion 2.10.0
+ - Setuptools 38.2.0 started supporting wheels. Through setuptools, buildout
+ now also supports wheels! You need at least version 38.2.3 to get proper
+ namespace support.
+ This setuptools change interfered with buildout's recent support for
+ buildout.wheel <https://github.com/buildout/buildout.wheel>, resulting in
+ a sudden "Wheels are not supported" error message (see issue 435
+ <https://github.com/buildout/buildout/issues/425>). Fixed by making
+ setuptools the default, though you can still use the buildout.wheel if you
+ want.
+- remove test boundary condition from specfile
+
+-------------------------------------------------------------------
Old:
----
zc.buildout-2.9.6.tar.gz
New:
----
zc.buildout-2.11.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-zc.buildout.spec ++++++
--- /var/tmp/diff_new_pack.mUwKlA/_old 2018-01-29 15:00:29.338024373 +0100
+++ /var/tmp/diff_new_pack.mUwKlA/_new 2018-01-29 15:00:29.346023999 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-zc.buildout
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,8 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%{!?license: %global license %doc}
-%bcond_without test
Name: python-zc.buildout
-Version: 2.9.6
+Version: 2.11.0
Release: 0
Url: http://pypi.python.org/pypi/zc.buildout
Summary: System for managing development buildouts
@@ -28,19 +27,17 @@
Group: Development/Languages/Python
Source:
https://files.pythonhosted.org/packages/source/z/zc.buildout/zc.buildout-%{version}.tar.gz
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module setuptools >= 8.0}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
# SECTION test requirements
-# disabled because of unprovideable requirements (bobo depends on
bobodoctestumentation depends on zc.buildout)
-#%%if %%{with test}
-#BuildRequires: %%{python_module bobo == 2.3.0}
+# disabled because of unprovideable requirements and not shipped test files
+#BuildRequires: %%{python_module bobo}
#BuildRequires: %%{python_module manuel}
#BuildRequires: %%{python_module zc.recipe.deployment}
#BuildRequires: %%{python_module zc.zdaemonrecipe}
#BuildRequires: %%{python_module zdaemon}
#BuildRequires: %%{python_module zope.testing}
-#%%endif
# /SECTION
BuildArch: noarch
Provides: python-zc_buildout = %version
@@ -66,10 +63,8 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}/zc/buildout
%python_expand %fdupes
%{buildroot}%{$python_sitelib}/zc.buildout-2.9.5-py%{$python_version}.egg-info
-#%if %%{with test}
#%%check
#%%python_exec setup.py test
-#%%endif
%files %{python_files}
%doc README.rst CHANGES.rst COPYRIGHT.txt DEVELOPERS.txt
++++++ zc.buildout-2.9.6.tar.gz -> zc.buildout-2.11.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/CHANGES.rst
new/zc.buildout-2.11.0/CHANGES.rst
--- old/zc.buildout-2.9.6/CHANGES.rst 2017-12-01 09:17:36.000000000 +0100
+++ new/zc.buildout-2.11.0/CHANGES.rst 2018-01-21 17:16:41.000000000 +0100
@@ -1,6 +1,29 @@
Change History
**************
+2.11.0 (2018-01-21)
+===================
+
+- Installed packages are added to the working set immediately. This helps in
+ some corner cases that occur when system packages have versions that
+ conflict with our specified versions.
+
+
+2.10.0 (2017-12-04)
+===================
+
+- Setuptools 38.2.0 started supporting wheels. Through setuptools, buildout
+ now also supports wheels! You need at least version 38.2.3 to get proper
+ namespace support.
+
+ This setuptools change interfered with buildout's recent support for
+ `buildout.wheel <https://github.com/buildout/buildout.wheel>`_, resulting in
+ a sudden "Wheels are not supported" error message (see `issue 435
+ <https://github.com/buildout/buildout/issues/425>`_). Fixed by making
+ setuptools the default, though you can still use the buildout.wheel if you
+ want.
+
+
2.9.6 (2017-12-01)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/PKG-INFO
new/zc.buildout-2.11.0/PKG-INFO
--- old/zc.buildout-2.9.6/PKG-INFO 2017-12-01 09:17:38.000000000 +0100
+++ new/zc.buildout-2.11.0/PKG-INFO 2018-01-21 17:16:42.000000000 +0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: zc.buildout
-Version: 2.9.6
+Version: 2.11.0
Summary: System for managing development buildouts
Home-page: http://buildout.org
Author: Jim Fulton
Author-email: [email protected]
License: ZPL 2.1
+Description-Content-Type: UNKNOWN
Description: ********
Buildout
********
@@ -16,12 +17,6 @@
:alt: Travis CI build report
:target: https://travis-ci.org/buildout/buildout
- .. image::
http://winbot.zope.org/buildstatusimage?builder=zc_buildout_dev%20py_270_win32%20master&number=-1
- :width: 82px
- :height: 13px
- :alt: winbot build report
- :target:
http://winbot.zope.org/builders/zc_buildout_dev%20py_270_win32%20master/builds/-1
-
Buildout is a project designed to solve 2 problems:
1. Application-centric assembly and deployment
@@ -69,6 +64,29 @@
Change History
**************
+ 2.11.0 (2018-01-21)
+ ===================
+
+ - Installed packages are added to the working set immediately. This
helps in
+ some corner cases that occur when system packages have versions that
+ conflict with our specified versions.
+
+
+ 2.10.0 (2017-12-04)
+ ===================
+
+ - Setuptools 38.2.0 started supporting wheels. Through setuptools,
buildout
+ now also supports wheels! You need at least version 38.2.3 to get
proper
+ namespace support.
+
+ This setuptools change interfered with buildout's recent support for
+ `buildout.wheel <https://github.com/buildout/buildout.wheel>`_,
resulting in
+ a sudden "Wheels are not supported" error message (see `issue 435
+ <https://github.com/buildout/buildout/issues/425>`_). Fixed by making
+ setuptools the default, though you can still use the buildout.wheel
if you
+ want.
+
+
2.9.6 (2017-12-01)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/README.rst
new/zc.buildout-2.11.0/README.rst
--- old/zc.buildout-2.9.6/README.rst 2017-12-01 09:17:36.000000000 +0100
+++ new/zc.buildout-2.11.0/README.rst 2018-01-21 17:16:41.000000000 +0100
@@ -8,12 +8,6 @@
:alt: Travis CI build report
:target: https://travis-ci.org/buildout/buildout
-.. image::
http://winbot.zope.org/buildstatusimage?builder=zc_buildout_dev%20py_270_win32%20master&number=-1
- :width: 82px
- :height: 13px
- :alt: winbot build report
- :target:
http://winbot.zope.org/builders/zc_buildout_dev%20py_270_win32%20master/builds/-1
-
Buildout is a project designed to solve 2 problems:
1. Application-centric assembly and deployment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/setup.py
new/zc.buildout-2.11.0/setup.py
--- old/zc.buildout-2.9.6/setup.py 2017-12-01 09:17:36.000000000 +0100
+++ new/zc.buildout-2.11.0/setup.py 2018-01-21 17:16:41.000000000 +0100
@@ -12,7 +12,7 @@
#
##############################################################################
name = "zc.buildout"
-version = '2.9.6'
+version = '2.11.0'
import os
from setuptools import setup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/src/zc/buildout/easy_install.py
new/zc.buildout-2.11.0/src/zc/buildout/easy_install.py
--- old/zc.buildout-2.9.6/src/zc/buildout/easy_install.py 2017-12-01
09:17:36.000000000 +0100
+++ new/zc.buildout-2.11.0/src/zc/buildout/easy_install.py 2018-01-21
17:16:41.000000000 +0100
@@ -37,6 +37,16 @@
import zc.buildout
import warnings
+try:
+ from setuptools.wheel import Wheel # This is the important import
+ from setuptools import __version__ as setuptools_version
+ # Now we need to check if we have at least 38.2.3 for namespace support.
+ SETUPTOOLS_SUPPORTS_WHEELS = (
+ pkg_resources.SetuptoolsVersion(setuptools_version) >=
+ pkg_resources.SetuptoolsVersion('38.2.3'))
+except ImportError:
+ SETUPTOOLS_SUPPORTS_WHEELS = False
+
warnings.filterwarnings(
'ignore', '.+is being parsed as a legacy, non PEP 440, version')
@@ -83,9 +93,6 @@
FILE_SCHEME = re.compile('file://', re.I).match
DUNDER_FILE_PATTERN = re.compile(r"__file__ = '(?P<filename>.+)'$")
-def wheel_to_egg(dist, dest):
- raise zc.buildout.UserError("Wheels are not supported")
-
class _Monkey(object):
def __init__(self, module, **kw):
mdict = self._mdict = module.__dict__
@@ -561,6 +568,9 @@
"Couldn't download distribution %s." % avail)
dists = [_move_to_eggs_dir_and_compile(dist, self._dest)]
+ for _d in dists:
+ if _d not in ws:
+ ws.add(_d, replace=True)
finally:
if tmp != self._download_cache:
@@ -568,10 +578,14 @@
self._env_rescan_dest()
dist = self._env.best_match(requirement, ws)
+
logger.info("Got %s.", dist)
else:
dists = [dist]
+ if dist not in ws:
+ ws.add(dist)
+
if not self._install_from_cache and self._use_dependency_links:
self._add_dependency_links_from_dists(dists)
@@ -628,8 +642,7 @@
pkg_resources.Requirement.parse('setuptools')
)
if ws.find(requirement) is None:
- for dist in self._get_dist(requirement, ws):
- ws.add(dist)
+ self._get_dist(requirement, ws)
def _constrain(self, requirement):
"""Return requirement with optional [versions] constraint added."""
@@ -663,7 +676,6 @@
for requirement in requirements:
for dist in self._get_dist(requirement, ws):
- ws.add(dist)
self._maybe_add_setuptools(ws, dist)
# OK, we have the requested distributions and they're in the working
@@ -712,7 +724,6 @@
logger.debug('Adding required %r', str(req))
self._log_requirement(ws, req)
for dist in self._get_dist(req, ws):
- ws.add(dist)
self._maybe_add_setuptools(ws, dist)
if dist not in req:
# Oops, the "best" so far conflicts with a dependency.
@@ -1619,25 +1630,19 @@
setuptools.archive_util.unpack_archive(location, dest)
-WHEEL_TO_EGG_WARNING = """
-Using unpack_wheel() shim over the deprecated wheel_to_egg() hook.
-Please update your wheel extension implementation for one that installs a .whl
-handler in %s.UNPACKERS
-""".strip() % (__name__,)
+WHEEL_WARNING = """
+*.whl file detected (%s), you'll need setuptools >= 38.2.3 for that
+or an extension like buildout.wheel > 0.2.0.
+"""
+
def unpack_wheel(location, dest):
- # Deprecated backward compatibility shim. Please do not use.
- logger.warning(WHEEL_TO_EGG_WARNING)
- basename = os.path.basename(location)
- dists = setuptools.package_index.distros_for_location(location, basename)
- # `wheel_to_egg()` might generate zipped eggs, so we have to make sure we
- # get unpacked eggs in the end:
- tmp_dest = tempfile.mkdtemp(dir=dest)
- wheel_to_egg(list(dists)[0], tmp_dest)
- [egg] = glob.glob(os.path.join(tmp_dest, '*.egg'))
- unpack_egg(egg, dest)
- shutil.rmtree(tmp_dest)
-
+ if SETUPTOOLS_SUPPORTS_WHEELS:
+ wheel = Wheel(location)
+ wheel.install_as_egg(os.path.join(dest, wheel.egg_name()))
+ else:
+ raise zc.buildout.UserError(WHEEL_WARNING % location)
+
UNPACKERS = {
'.egg': unpack_egg,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/src/zc/buildout/easy_install.txt
new/zc.buildout-2.11.0/src/zc/buildout/easy_install.txt
--- old/zc.buildout-2.9.6/src/zc/buildout/easy_install.txt 2017-12-01
09:17:36.000000000 +0100
+++ new/zc.buildout-2.11.0/src/zc/buildout/easy_install.txt 2018-01-21
17:16:41.000000000 +0100
@@ -125,8 +125,8 @@
>>> for dist in ws:
... print_(dist)
- demo 0.2
demoneeded 1.1
+ demo 0.2
We got demoneeded because it was a dependency of demo.
@@ -169,8 +169,8 @@
... ['demo'], dest, links=[link_server], index=link_server+'index/')
>>> for dist in ws:
... print_(dist)
- demo 0.4rc1
demoneeded 1.2rc1
+ demo 0.4rc1
>>> ls(dest)
d demo-0.2-py2.4.egg
@@ -195,9 +195,9 @@
>>> for dist in ws:
... print_(dist)
- demo 0.3
- other 1.0
demoneeded 1.0
+ other 1.0
+ demo 0.3
>>> ls(dest)
d demo-0.2-py2.4.egg
@@ -231,8 +231,8 @@
>>> for dist in ws:
... print_(dist)
- MIXEDCASE 0.5
demoneeded 1.1
+ MIXEDCASE 0.5
>>> ls(dest)
d MIXEDCASE-0.5-pyN.N.egg
d demoneeded-1.1-py2.4.egg
@@ -256,7 +256,7 @@
... ['demo'], dest, links=[link_server], index=link_server+'index/',
... versions = dict(demo='0.2', demoneeded='1.0'))
>>> [d.version for d in ws]
- ['0.2', '1.0']
+ ['1.0', '0.2']
In this example, we specified a version for demoneeded, even though we
didn't define a requirement for it. The versions specified apply to
@@ -890,8 +890,8 @@
<BLANKLINE>
import sys
sys.path[0:0] = [
- join(base, 'eggs/demo-0.3-pyN.N.egg'),
join(base, 'eggs/demoneeded-1.1-pyN.N.egg'),
+ join(base, 'eggs/demo-0.3-pyN.N.egg'),
'/ba',
join(base, 'bar'),
base,
@@ -924,13 +924,14 @@
import sys
<BLANKLINE>
sys.path[0:0] = [
- join(base, 'eggs/demo-0.3-pyN.N.egg'),
join(base, 'eggs/demoneeded-1.1-pyN.N.egg'),
+ join(base, 'eggs/demo-0.3-pyN.N.egg'),
'/ba',
join(base, 'bar'),
base,
]
<BLANKLINE>
+ <BLANKLINE>
_interactive = True
if len(sys.argv) > 1:
_options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/src/zc/buildout/tests.py
new/zc.buildout-2.11.0/src/zc/buildout/tests.py
--- old/zc.buildout-2.9.6/src/zc/buildout/tests.py 2017-12-01
09:17:36.000000000 +0100
+++ new/zc.buildout-2.11.0/src/zc/buildout/tests.py 2018-01-21
17:16:41.000000000 +0100
@@ -2018,8 +2018,8 @@
>>> for dist in ws:
... print_(dist)
- demo 0.2
demoneeded 1.1
+ demo 0.2
>>> ls(dest)
d demo-0.2-py2.4.egg
@@ -3144,52 +3144,6 @@
if sys.platform == 'win32':
del buildout_honors_umask # umask on dohs is academic
-class UnitTests(unittest.TestCase):
-
- @property
- def globs(self):
- return self.__dict__
-
- def setUp(self):
- easy_install_SetUp(self)
- import setuptools.package_index
- setuptools.package_index.EXTENSIONS.append('.whl')
- import zc.buildout.easy_install
- self.orig_wheel_to_egg = zc.buildout.easy_install.wheel_to_egg
-
- def tearDown(self):
- import zc.buildout.easy_install
- zc.buildout.testing.buildoutTearDown(self)
- import setuptools.package_index
- setuptools.package_index.EXTENSIONS.remove('.whl')
- zc.buildout.easy_install.wheel_to_egg = self.orig_wheel_to_egg
-
- def test_wheel_to_egg(self):
- [egg_name] = [n for n in os.listdir(self.sample_eggs)
- if n.startswith('demo-0.3-')]
- path = os.path.join(self.sample_eggs, egg_name)
- os.rename(path, os.path.join(self.sample_eggs, 'demo-0.3.whl'))
-
- import zc.buildout.easy_install
- installer = zc.buildout.easy_install.Installer(
- os.path.join(self.sample_buildout, 'eggs'),
- index = self.sample_eggs)
-
- # Can't install because the original hook is in place:
- with self.assertRaises(zc.buildout.UserError):
- installer.install(['demo'])
-
- def wheel_to_egg(dist, dest):
- newloc = os.path.join(dest, egg_name)
- shutil.copy(dist.location, newloc)
- return pkg_resources.Distribution.from_filename(newloc)
- zc.buildout.easy_install.wheel_to_egg = wheel_to_egg
- egg_dir = os.path.join(self.sample_buildout, 'eggs')
- self.assertFalse(egg_name in os.listdir(egg_dir))
- installer.install(['demo'])
- self.assertTrue(egg_name in os.listdir(egg_dir))
-
-
######################################################################
def create_sample_eggs(test, executable=sys.executable):
@@ -3275,7 +3229,7 @@
" zip_safe=True, version='0.5')\n"
)
zc.buildout.testing.sdist(tmp, dest)
- # rename file to lower case
+ # rename file to lower case
# to test issues between file and package name
curdir = os.getcwd()
os.chdir(dest)
@@ -3769,7 +3723,6 @@
])
),
doctest.DocFileSuite('testing_bugfix.txt'),
- unittest.makeSuite(UnitTests),
]
docdir = os.path.join(ancestor(__file__, 4), 'doc')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/src/zc/buildout/update.txt
new/zc.buildout-2.11.0/src/zc/buildout/update.txt
--- old/zc.buildout-2.9.6/src/zc/buildout/update.txt 2017-12-01
09:17:36.000000000 +0100
+++ new/zc.buildout-2.11.0/src/zc/buildout/update.txt 2018-01-21
17:16:41.000000000 +0100
@@ -87,8 +87,8 @@
<BLANKLINE>
import sys
sys.path[0:0] = [
- '/sample-buildout/eggs/zc.buildout-99.99-py2.4.egg',
'/sample-buildout/eggs/setuptools-99.99-py2.4.egg',
+ '/sample-buildout/eggs/zc.buildout-99.99-py2.4.egg',
]
<BLANKLINE>
import zc.buildout.buildout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zc.buildout-2.9.6/src/zc.buildout.egg-info/PKG-INFO
new/zc.buildout-2.11.0/src/zc.buildout.egg-info/PKG-INFO
--- old/zc.buildout-2.9.6/src/zc.buildout.egg-info/PKG-INFO 2017-12-01
09:17:37.000000000 +0100
+++ new/zc.buildout-2.11.0/src/zc.buildout.egg-info/PKG-INFO 2018-01-21
17:16:42.000000000 +0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: zc.buildout
-Version: 2.9.6
+Version: 2.11.0
Summary: System for managing development buildouts
Home-page: http://buildout.org
Author: Jim Fulton
Author-email: [email protected]
License: ZPL 2.1
+Description-Content-Type: UNKNOWN
Description: ********
Buildout
********
@@ -16,12 +17,6 @@
:alt: Travis CI build report
:target: https://travis-ci.org/buildout/buildout
- .. image::
http://winbot.zope.org/buildstatusimage?builder=zc_buildout_dev%20py_270_win32%20master&number=-1
- :width: 82px
- :height: 13px
- :alt: winbot build report
- :target:
http://winbot.zope.org/builders/zc_buildout_dev%20py_270_win32%20master/builds/-1
-
Buildout is a project designed to solve 2 problems:
1. Application-centric assembly and deployment
@@ -69,6 +64,29 @@
Change History
**************
+ 2.11.0 (2018-01-21)
+ ===================
+
+ - Installed packages are added to the working set immediately. This
helps in
+ some corner cases that occur when system packages have versions that
+ conflict with our specified versions.
+
+
+ 2.10.0 (2017-12-04)
+ ===================
+
+ - Setuptools 38.2.0 started supporting wheels. Through setuptools,
buildout
+ now also supports wheels! You need at least version 38.2.3 to get
proper
+ namespace support.
+
+ This setuptools change interfered with buildout's recent support for
+ `buildout.wheel <https://github.com/buildout/buildout.wheel>`_,
resulting in
+ a sudden "Wheels are not supported" error message (see `issue 435
+ <https://github.com/buildout/buildout/issues/425>`_). Fixed by making
+ setuptools the default, though you can still use the buildout.wheel
if you
+ want.
+
+
2.9.6 (2017-12-01)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zc.buildout-2.9.6/src/zc.buildout.egg-info/requires.txt
new/zc.buildout-2.11.0/src/zc.buildout.egg-info/requires.txt
--- old/zc.buildout-2.9.6/src/zc.buildout.egg-info/requires.txt 2017-12-01
09:17:37.000000000 +0100
+++ new/zc.buildout-2.11.0/src/zc.buildout.egg-info/requires.txt
2018-01-21 17:16:42.000000000 +0100
@@ -3,7 +3,7 @@
[test]
zope.testing
manuel
-bobo ==2.3.0
+bobo==2.3.0
zdaemon
zc.zdaemonrecipe
zc.recipe.deployment
