Switched to python 3.6.

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - 3.5
+  - 3.6
 install:
   - pip install -r requirements.txt
   - pip install coveralls

docs/conf.py

@@ -339,7 +339,7 @@
 # texinfo_no_detailmenu = False
 
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3.5', None),
+    'python': ('https://docs.python.org/3.6', None),
     'multiset': ('http://multiset.readthedocs.io/en/latest/', None),
 }
 

environment.yml

@@ -1,10 +1,10 @@
 channels:
   - conda-forge
-name: py35
+name: py36
 dependencies:
 - openssl
 - pip
-- python=3.5.2
+- python=3.6
 - readline
 - setuptools
 - sqlite

matchpy/expressions/expressions.py

@@ -26,7 +26,7 @@ def __prepare__(mcs, cls, bases, **kwargs):  # pylint: disable=unused-argument
 _ArityBase = NamedTuple('_ArityBase', [('min_count', int), ('fixed_size', bool)])
 
 
-class Arity(_ArityBase, Enum, metaclass=_ArityMeta, _root=True):
+class Arity(_ArityBase, Enum, metaclass=_ArityMeta):
     """Arity of an operator as (`int`, `bool`) tuple.
 
     The first component is the minimum number of operands.

matchpy/matching/many_to_one.py

@@ -24,7 +24,7 @@
 
 import math
 from collections import deque
-from typing import (Container, Dict, Iterable, Iterator, List, NamedTuple, Optional, Sequence, Set, Tuple, Union)
+from typing import (Container, Dict, Iterable, Iterator, List, NamedTuple, Optional, Sequence, Set, Tuple, Type, Union)
 
 from graphviz import Digraph
 from multiset import Multiset
@@ -39,8 +39,8 @@
 
 __all__ = ['ManyToOneMatcher']
 
-LabelType = Union[FrozenExpression, type]  # TODO: in py 3.6 properly use Type[]
-HeadType = Optional[Union[FrozenExpression, type]]  # TODO: in py 3.6 properly use Type[]
+LabelType = Union[FrozenExpression, Type[Operation]]
+HeadType = Optional[Union[FrozenExpression, Type[Operation], Type[Symbol]]]
 
 _State = NamedTuple('_State', [
     ('transitions', Dict[LabelType, '_Transition']),