Merge 2908cf5 into 33c5d24

zopefoundation · Sep 23, 2018 · cad9fb4 · cad9fb4
2 parents 33c5d24 + 2908cf5
commit cad9fb4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 411 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,7 @@ Changelog
 4.0b3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Move `ZPublisher.xmlrpc` back to `Zope`.
 
 
 4.0b2 (2018-08-31)

diff --git a/buildout.cfg b/buildout.cfg
@@ -7,13 +7,15 @@ extensions = mr.developer
 develop = .
 sources-dir = develop
 auto-checkout =
+    Zope
 parts = interpreter test scripts
 
 [sources]
-Zope = git https://github.com/zopefoundation/Zope.git
+Zope = git https://github.com/zopefoundation/Zope.git branch=xmlrpc
 
 [versions]
 ZServer =
+Zope =
 
 [interpreter]
 recipe = zc.recipe.egg

diff --git a/setup.py b/setup.py
@@ -61,7 +61,7 @@
         'zope.processlifetime',
         'zope.schema',
         'zope.testing',
-        'Zope >= 4.0b3',
+        'Zope >= 4.0b6.dev0',
     ],
     extras_require={
         'sdnotify': ['sdnotify'],

diff --git a/src/ZServer/ZPublisher/tests/test_xmlrpc.py b/src/ZServer/ZPublisher/tests/test_xmlrpc.py