Commit 678de549 authored by Chris McDonough's avatar Chris McDonough

Merge branch 'master' of github.com:Pylons/zodburi

parents bb697096 181ffc5d
``zodburi`` Changelog ``zodburi`` Changelog
===================== =====================
2.0 (2014-01-05)
----------------
- Update ``ZODB3`` meta-package dependency to ``ZODB`` + ``ZConfig`` + ``ZEO``.
Those releases are what we import, and have final Py3k-compatible releases.
2.0b1 (2013-05-02) 2.0b1 (2013-05-02)
------------------ ------------------
......
...@@ -17,13 +17,13 @@ try: ...@@ -17,13 +17,13 @@ try:
except: except:
CHANGES = '' CHANGES = ''
requires = ['ZODB3'] requires = ['ZODB', 'ZConfig', 'ZEO']
tests_require = requires + ['mock'] tests_require = requires + ['mock']
testing_extras = tests_require + ['nose', 'coverage'] testing_extras = tests_require + ['nose', 'coverage']
docs_extras = tests_require + ['Sphinx'] docs_extras = tests_require + ['Sphinx']
setup(name='zodburi', setup(name='zodburi',
version='2.0b1', version='2.0',
description=('Construct ZODB storage instances from URIs.'), description=('Construct ZODB storage instances from URIs.'),
long_description=README + '\n\n' + CHANGES, long_description=README + '\n\n' + CHANGES,
classifiers=[ classifiers=[
......
...@@ -6,22 +6,6 @@ envlist = ...@@ -6,22 +6,6 @@ envlist =
commands = commands =
python setup.py test -q python setup.py test -q
[py3]
deps =
# Py3k compatible ZODB not yet released
git+https://github.com/zopefoundation/ZODB.git@py3#egg=ZODB
git+https://github.com/zopefoundation/ZEO.git@py3#egg=ZEO
[testenv:py32]
commands =
python setup.py test -q
deps = {[py3]deps}
[testenv:py33]
commands =
python setup.py test -q
deps = {[py3]deps}
[testenv:cover] [testenv:cover]
basepython = basepython =
python2.6 python2.6
......
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