Merge pull request #461 from buildout/reinout-update-egg-to-buildout-…

…dependency Fix dependencies between zc.buildout and zc.recipe.egg after zc.recipe.egg 2.0.6 release
buildout · Jul 2, 2018 · b7b1cba · b7b1cba
2 parents 684c687 + 5d2987e
commit b7b1cba
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,7 @@ Change History
 2.12.1 (unreleased)
 ===================
 
-- Nothing changed yet.
+- zc.buildout now explicitly requests zc.recipe.egg >=2.0.6 now.
 
 
 2.12.0 (2018-07-02)

diff --git a/src/zc/buildout/buildout.py b/src/zc/buildout/buildout.py
@@ -378,7 +378,7 @@ def __init__(self, config_file, cloptions,
                           pkg_resources.Requirement.parse('zc.buildout')
                           ).version),
                      # Use 2, even though not final
-                     ('zc.recipe.egg', '>=2.0.0a3'),
+                     ('zc.recipe.egg', '>=2.0.6'),
                      )
                  if k not in versions
                  ))

diff --git a/src/zc/buildout/buildout.txt b/src/zc/buildout/buildout.txt
@@ -3104,7 +3104,7 @@ or paths to use::
     >>> print_(system(buildout + ' -csetup.cfg init demo other ./src'), end='')
     Creating '/sample-bootstrapped/setup.cfg'.
     Creating directory '/sample-bootstrapped/develop-eggs'.
-    Getting distribution for 'zc.recipe.egg>=2.0.0a3'.
+    Getting distribution for 'zc.recipe.egg>=2.0.6'.
     Got zc.recipe.egg
     Installing py.
     Getting distribution for 'demo'.

diff --git a/src/zc/buildout/tests.py b/src/zc/buildout/tests.py
@@ -3031,14 +3031,14 @@ def want_new_zcrecipeegg():
     ... eggs = demo
     ... ''')
     >>> print_(system(join('bin', 'buildout')), end='') # doctest: +ELLIPSIS
-    Getting distribution for 'zc.recipe.egg<2dev,>=2.0.0a3'...
+    Getting distribution for 'zc.recipe.egg<2dev,>=2.0.6'...
     While:
       Installing.
       Getting section egg.
       Initializing section egg.
       Installing recipe zc.recipe.egg <2dev.
-      Getting distribution for 'zc.recipe.egg<2dev,>=2.0.0a3'.
-    Error: Couldn't find a distribution for 'zc.recipe.egg<2dev,>=2.0.0a3'.
+      Getting distribution for 'zc.recipe.egg<2dev,>=2.0.6'.
+    Error: Couldn't find a distribution for 'zc.recipe.egg<2dev,>=2.0.6'.
     """
 
 def macro_inheritance_bug():

diff --git a/zc.recipe.egg_/CHANGES.rst b/zc.recipe.egg_/CHANGES.rst
@@ -4,7 +4,8 @@ Change History
 2.0.7 (unreleased)
 ==================
 
-- Nothing changed yet.
+- For the 2.0.6 change, we require zc.buildout 2.12.0. The `install_requires`
+  in `setup.py` now also says that.
 
 
 2.0.6 (2018-07-02)

diff --git a/zc.recipe.egg_/setup.py b/zc.recipe.egg_/setup.py
@@ -71,7 +71,7 @@ def read(*rnames):
     package_dir = {'':'src'},
     namespace_packages = ['zc', 'zc.recipe'],
     install_requires = [
-        'zc.buildout >=1.2.0',
+        'zc.buildout >=2.12.0',
         'setuptools'],
     tests_require = ['zope.testing'],
     test_suite = name+'.tests.test_suite',