Ensure consistent resolution orders. Add 3.8, drop 3.4.

Fixes #17

.travis.yml

@@ -1,21 +1,19 @@
 language: python
-sudo: false
 python:
     - 2.7
-    - 3.4
     - 3.5
     - 3.6
+    - 3.7
+    - 3.8
     - pypy
     - pypy3
 env:
-    - DEP=test
-matrix:
-    include:
-        - python: "3.7"
-          dist: xenial
-          sudo: true
-        - python: 2.7
-          env: DEP=no_such_extra
+  - DEP: test
+  - DEP: no_such_extra
+    # Cannot yet set this globally pending
+    # https://github.com/zopefoundation/zope.publisher/issues/49
+    ZOPE_INTERFACE_STRICT_IRO: 1
+
 install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls zope.testing zope.testrunner

CHANGES.rst

@@ -2,10 +2,15 @@
  Changes
 =========
 
-2.4.1 (unreleased)
+2.5.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Add support for Python 3.8.
+
+- Drop support for Python 3.4.
+
+- Ensure all objects have consistent interface resolution orders. See
+  `issue 17 <https://github.com/zopefoundation/zope.mimetype/issues/17>`_.
 
 
 2.4.0 (2018-10-16)

MANIFEST.in

@@ -1,7 +1,6 @@
 include *.rst
 include *.txt
 include *.py
-include buildout.cfg
 include tox.ini
 include .travis.yml
 include .coveragerc

setup.py

@@ -38,7 +38,7 @@ def read(*rnames):
 ]
 
 setup(name='zope.mimetype',
-      version='2.4.1.dev0',
+      version='2.5.0.dev0',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description="A simple package for working with MIME content types",
@@ -57,10 +57,10 @@ def read(*rnames):
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
           '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',
           'Natural Language :: English',

src/zope/mimetype/interfaces.py

@@ -160,8 +160,8 @@ class IContentTypeTerm(zope.schema.interfaces.ITitledTokenizedTerm):
         readonly=True,
         )
 
-class IContentTypeSource(zope.schema.interfaces.ISource,
-                         zope.schema.interfaces.IIterableSource):
+class IContentTypeSource(zope.schema.interfaces.IIterableSource,
+                         zope.schema.interfaces.ISource):
     """Source for content types."""
 
 

tox.ini

@@ -1,32 +1,35 @@
 [tox]
 envlist =
-    py27,py34,py35,py36,py37,pypy,pypy3,coverage,minimal,docs
+    py27,py35,py36,py37,py38,pypy,pypy3,coverage,minimal,docs
 
 [testenv]
+usedevelop = true
 commands =
     zope-testrunner --test-path=src []
-deps =
-    .[test]
+extras =
+    test
 
 [testenv:minimal]
+extras =
 deps =
-    .
     zope.testrunner
     zope.testing
+# Cannot yet set this globally, pending
+# https://github.com/zopefoundation/zope.publisher/issues/49
+setenv =
+    ZOPE_INTERFACE_STRICT_IRO=1
 
 [testenv:coverage]
-usedevelop = true
 basepython =
     python2.7
 commands =
     coverage run -m zope.testrunner --test-path=src []
     coverage report --fail-under=100
 deps =
-    {[testenv]deps}
     coverage
 
 [testenv:docs]
 commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
-deps =
-    .[docs]
+extras =
+    docs