Commit 250d9ed7 authored by Éloi Rivard's avatar Éloi Rivard

Stop support for ZODB4

parent 592fea46
......@@ -3,10 +3,10 @@
Change Log
----------
2.5.1 (unreleased)
2.6.0 (unreleased)
~~~~~~~~~~~~~~~~~~
- Nothing changed yet.
- Stop support for ZODB4
2.5.0 (2021-05-12)
......
......@@ -7,7 +7,7 @@ Overview
A library which parses URIs and converts them to ZODB storage objects and
database arguments.
It will run under CPython 2.7, 3.5 to 3.8, pypy and pypy3. It will not run under Jython. It requires ZODB >= 3.10.0.
It will run under CPython 2.7, 3.5 to 3.8, pypy and pypy3. It will not run under Jython. It requires ZODB >= 5.0.0.
Installation
------------
......
[tox]
envlist =
{py27,py35,py36,pypy,pypy3}-{zodb4,zodb5},
{py37,py38}-zodb5,
cover,docs,lint
py27,py35,py36,py37,py38,pypy,pypy3,cover,docs,lint
[testenv]
commands =
python setup.py -q test -q
deps =
mock
zodb4: ZODB==4.*
zodb5: ZODB==5.*
zodb4: ZEO==4.*
zodb5: ZEO==5.*
ZODB==5.*
ZEO==5.*
[testenv:cover]
basepython =
......
......@@ -3,9 +3,6 @@ import pkg_resources
import unittest
ZODB_VERSION = tuple(map(int, pkg_resources.get_distribution("ZODB").version.split('.')))
class Base:
def test_interpret_kwargs_noargs(self):
......@@ -442,16 +439,6 @@ class TestZConfigURIResolver(unittest.TestCase):
storage = factory()
from ZODB.MappingStorage import MappingStorage
self.assertTrue(isinstance(storage, MappingStorage))
if ZODB_VERSION[0] < 5:
self.assertEqual(dbkw,
{'connection_cache_size': 5000,
'connection_cache_size_bytes': 0,
'connection_historical_cache_size': 1000,
'connection_historical_cache_size_bytes': 0,
'connection_historical_pool_size': 3,
'connection_historical_timeout': 300,
'connection_pool_size': 7})
else:
self.assertEqual(dbkw,
{'connection_cache_size': 5000,
'connection_cache_size_bytes': 0,
......@@ -479,17 +466,6 @@ class TestZConfigURIResolver(unittest.TestCase):
storage = factory()
from ZODB.MappingStorage import MappingStorage
self.assertTrue(isinstance(storage, MappingStorage))
if ZODB_VERSION[0] < 5:
self.assertEqual(dbkw,
{'connection_cache_size': 20000,
'connection_cache_size_bytes': 0,
'connection_historical_cache_size': 1000,
'connection_historical_cache_size_bytes': 0,
'connection_historical_pool_size': 3,
'connection_historical_timeout': 300,
'connection_pool_size': 5,
'database_name': 'foo'})
else:
self.assertEqual(dbkw,
{'connection_cache_size': 20000,
'connection_cache_size_bytes': 0,
......@@ -546,17 +522,6 @@ class TestZConfigURIResolver(unittest.TestCase):
storage = factory()
from ZODB.MappingStorage import MappingStorage
self.assertTrue(isinstance(storage, MappingStorage))
if ZODB_VERSION[0] < 5:
self.assertEqual(dbkw,
{'cache_size': 5000,
'cache_size_bytes': 0,
'historical_cache_size': 1000,
'historical_cache_size_bytes': 0,
'historical_pool_size': 3,
'historical_timeout': 300,
'pool_size': 7,
'database_name': 'unnamed'})
else:
self.assertEqual(dbkw,
{'cache_size': 5000,
'cache_size_bytes': 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment