Merge remote-tracking branch 'zope/master'

zopefoundation · Feb 21, 2018 · c870037 · c870037
2 parents 5635a03 + 92f75c2
commit c870037
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,12 +1,17 @@
 CHANGES
 *******
 
-3.0.1 (unreleased)
+3.0.2 (unreleased)
 ==================
 
 - Nothing changed yet.
 
 
+3.0.1 (2018-01-12)
+==================
+
+- Rearrange tests such that Travis CI can pick up all functional tests too.
+
 3.0.0 (2018-01-05)
 ==================
 

diff --git a/buildout.cfg b/buildout.cfg
@@ -1,19 +1,15 @@
 [buildout]
+extends =
+  https://raw.githubusercontent.com/zopefoundation/groktoolkit/3.0.0a1/grok.cfg
 develop = .
 parts =
   interpreter
   omelette
   test
-extends = https://raw.githubusercontent.com/zopefoundation/groktoolkit/resurrection-python3/grok.cfg
-extensions =
-  mr.developer
-auto-checkout =
 
 [versions]
 grokcore.catalog =
 
-[sources]
-
 [interpreter]
 recipe = zc.recipe.egg
 eggs = grokcore.site

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def read(*rnames):
 
 setup(
     name='grokcore.catalog',
-    version='3.0.1.dev0',
+    version='3.0.2.dev0',
     author='Grok Team',
     author_email='grok-dev@zope.org',
     url='http://grok.zope.org',