Skip to content

Commit

Permalink
Merge pull request #52 from NextThought/zope-interface-5
Browse files Browse the repository at this point in the history
Test with zope.interface 5 and python 3.8
  • Loading branch information
jamadden committed Mar 19, 2020
2 parents 242d5a8 + bb9d5d0 commit 3b61461
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ group: travis_latest
python:
- 2.7
- 3.6
- 3.7
- 3.8
- pypy
- pypy3
jobs:
include:
- python: 3.7
dist: xenial
sudo: true

script:
- coverage run -m zope.testrunner --test-path=src --auto-color --auto-progress
after_success:
Expand Down
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
1.13.2 (unreleased)
===================

- Nothing changed yet.
- Test with zope.interface 5.0.0.

- Add support for Python 3.8.


1.13.1 (2019-06-11)
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def _read(fname):
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Framework :: Zope3',
Expand All @@ -53,6 +54,7 @@ def _read(fname):
'six',
'setuptools',
'zope.event',
'zope.interface >= 5.0.0',
'zope.schema >= 4.8.0',
'zope.i18n',
'zope.i18nmessageid',
Expand Down
21 changes: 12 additions & 9 deletions src/nti/schema/tests/test_eqhash.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,22 @@ def test_iterable(self):
assert_that(hash(self.superhash([1, 2])), is_not(hash(self.superhash([2, 1]))))

def test_nested_dict(self):
d = {1: 1,
2: [1, 2, 3],
3: {4: [4, 5, 6]}}
d = {
1: 1,
2: [1, 2, 3],
3: {4: [4, 5, 6]}
}
t = (
(1, 1),
(2, (1, 2, 3)),
(3, ((4, (4, 5, 6)),))
)

assert_that(self.superhash(d),
is_(
((1, 1),
(2, (1, 2, 3)),
(3, ((4, (4, 5, 6)),)))
))
is_(t))

assert_that(hash(self.superhash(d)),
is_(-6213620179105025536))
is_(hash(t)))


def test_suite():
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = pypy,py27,py35,py36,pypy3,py37,coverage,docs
envlist = pypy,py27,py35,py36,pypy3,py37,py38,coverage,docs

[testenv]
deps =
Expand Down

0 comments on commit 3b61461

Please sign in to comment.