Merge f74fef6 into c267bbf

OpenNTI · Apr 6, 2020 · 3967e59 · 3967e59
2 parents c267bbf + f74fef6
commit 3967e59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 language: python
-sudo: false
 python:
   - 2.7
   - 3.6
+  - 3.7
+  - 3.8
   - pypy
   - pypy3
+env:
+  global:
+    ZOPE_INTERFACE_STRICT_IRO: 1
 jobs:
-  include:
-      - python: 3.7
-        dist: xenial
-        sudo: true
   allow_failures:
     # pypy3 7.1 is triggering failures
     # https://bitbucket.org/pypy/pypy/issues/3006/codecsdecode-failure-hex-decoder-returned

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -23,6 +23,8 @@
 - Fix unicode normalization breaking schema fields with zope.schema
   6.0. See https://github.com/NextThought/nti.contentfragments/issues/26
 
+- Ensure all objects have consistent resolution orders.
+
 1.2.1 (2019-11-07)
 ==================
 

diff --git a/tox.ini b/tox.ini
@@ -7,10 +7,8 @@ extras =
     test
 commands =
          zope-testrunner --test-path=src  --auto-color --auto-progress [] # substitute with tox positional args
-# Not yet.
-# pending https://github.com/zopefoundation/zope.mimetype/issues/17
-#setenv =
-#    ZOPE_INTERFACE_STRICT_IRO=1
+setenv =
+    ZOPE_INTERFACE_STRICT_IRO=1
 
 [testenv:coverage]
 basepython =