Merge pull request #120 from zodb/1.6-no-zeo

Restore install_requires to match 1.6.0
zodb · Aug 31, 2016 · f58cb15 · f58cb15
2 parents f1cbd62 + 2cf9861
commit f58cb15
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ install:
 # setup.py because of the ZODB3 meta distribution being renamed back
 # to ZODB.
   - pip uninstall -y ZODB
-  - pip install 'ZODB<4.3'
+  - pip install 'ZODB<4.3' 'ZEO<5.0'
 
 # cache: pip seems not to work if `install` is replaced (https://github.com/travis-ci/travis-ci/issues/3239)
 cache:

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,7 +1,8 @@
 1.6.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Remove the version pin for ZEO for those still installing the old
+  monolithic ZODB3 distributions.
 
 
 1.6.1 (2016-08-30)

diff --git a/setup.py b/setup.py
@@ -82,7 +82,6 @@ def read_file(*path):
     install_requires=[
         'perfmetrics',
         'ZODB3>=3.7.0',
-        'ZEO<=5.0', # ZEO.zrpc is gone
         'zope.interface',
         'zc.lockfile',
     ],