Merge pull request #4 from dephell/fix-hash

Fix hashing for operations

Author: orsinium

.travis.yml

@@ -1,13 +1,18 @@
 language: python
 
+# do not run Travis for PR's twice (as for push and as for PR)
+branches:
+  only:
+    - master
+
 before_install:
   # show a little bit more information about environment
   - sudo apt-get install -y tree
   - env
   - tree
   # install DepHell
   # https://github.com/travis-ci/travis-ci/issues/8589
-  - curl https://raw.githubusercontent.com/dephell/dephell/master/install.py | /opt/python/3.6/bin/python
+  - curl https://raw.githubusercontent.com/dephell/dephell/master/install.py | /opt/python/3.6.7/bin/python
   - dephell inspect self
 install:
   - dephell venv create --env=$ENV --python="/opt/python/$TRAVIS_PYTHON_VERSION/bin/python"
@@ -19,14 +24,14 @@ matrix:
   include:
     - python: "3.5"
       env: ENV=pytest
-    - python: "3.6"
+    - python: "3.6.7"
       env: ENV=pytest
     - python: "3.7-dev"
       env: ENV=pytest
     - python: "pypy3.5"
       env: ENV=pytest
 
-    - python: "3.6"
+    - python: "3.7"
       env: ENV=flake8
-    - python: "3.6"
+    - python: "3.7"
       env: ENV=typing

dephell_markers/_marker/__init__.py

@@ -1,3 +1,4 @@
+# app
 from ._base import BaseMarker
 from ._string import StringMarker
 from ._version import VersionMarker

dephell_markers/_marker/_base.py

@@ -1,14 +1,16 @@
+# built-in
+from typing import Optional, Set
+
 # external
 import attr
 from packaging.markers import Value, Variable
-from typing import Optional, Set
 
 # app
 from .._cached_property import cached_property
 from .._constants import ALIASES
 
 
-@attr.s(cmp=False)
+@attr.s(eq=False, order=False)
 class BaseMarker:
     lhs = attr.ib()
     op = attr.ib()

dephell_markers/_marker/_version.py

@@ -8,8 +8,8 @@
 
 # app
 from .._cached_property import cached_property
-from ._base import BaseMarker
 from .._constants import REVERSED_OPERATIONS
+from ._base import BaseMarker
 
 
 class VersionMarker(BaseMarker):

dephell_markers/_markers.py

@@ -1,16 +1,16 @@
 # built-in
 from copy import copy
-from typing import Optional, Union, Set, Type
+from typing import Optional, Set, Type, Union
 
 # external
 from dephell_specifier import RangeSpecifier
 from packaging import markers as packaging
-from packaging.markers import Variable, Op, Value
+from packaging.markers import Op, Value, Variable
 
 # app
-from ._marker import BaseMarker, StringMarker, VersionMarker
-from ._operation import OrMarker, AndMarker, Operation
 from ._constants import STRING_VARIABLES, VERSION_VARIABLES
+from ._marker import BaseMarker, StringMarker, VersionMarker
+from ._operation import AndMarker, Operation, OrMarker
 
 
 class Markers:

dephell_markers/_operation/__init__.py

@@ -1,3 +1,4 @@
+# app
 from ._and import AndMarker
 from ._base import Operation
 from ._or import OrMarker

dephell_markers/_operation/_base.py

@@ -1,6 +1,7 @@
 # built-in
 from typing import Optional, Set
 
+# app
 from .._cached_property import cached_property
 
 
@@ -88,7 +89,7 @@ def __eq__(self, other):
         return self.op == other.op and set(self.nodes) == set(other.nodes)
 
     def __hash__(self):
-        return hash(self.nodes)
+        return hash(tuple(self.nodes))
 
     def __str__(self):
         sep = ' ' + self.op + ' '

tests/test_markers.py

@@ -202,3 +202,14 @@ def test_empty():
     m &= Markers('os_name == "nt"')
     assert str(m) == 'os_name == "nt"'
     assert bool(m) is True
+
+
+# https://github.com/dephell/dephell/issues/256
+def test_dedup():
+    text = """
+        python_version >= "3.4"
+        and (sys_platform == "linux2" or sys_platform == "linux")
+        or python_version >= "3.5" and python_version < "4.0"
+    """
+    m = Markers(text)
+    assert str(m).split() == text.split()