Hello community, here is the log from the commit of package python-dephell-markers for openSUSE:Factory checked in at 2019-11-06 13:55:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-dephell-markers (Old) and /work/SRC/openSUSE:Factory/.python-dephell-markers.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dephell-markers" Wed Nov 6 13:55:17 2019 rev:3 rq:742818 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-dephell-markers/python-dephell-markers.changes 2019-09-13 15:05:09.385258802 +0200 +++ /work/SRC/openSUSE:Factory/.python-dephell-markers.new.2990/python-dephell-markers.changes 2019-11-06 13:55:28.740115658 +0100 @@ -1,0 +2,6 @@ +Fri Oct 25 01:36:59 UTC 2019 - John Vandenberg <jay...@gmail.com> + +- Update to v1.0.1 + - Fix hashing, improving compatibility reading poetry.lock + +------------------------------------------------------------------- Old: ---- dephell_markers-1.0.0.tar.gz New: ---- dephell_markers-1.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dephell-markers.spec ++++++ --- /var/tmp/diff_new_pack.J7Mq30/_old 2019-11-06 13:55:30.952118056 +0100 +++ /var/tmp/diff_new_pack.J7Mq30/_new 2019-11-06 13:55:30.952118056 +0100 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-dephell-markers -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: Dephell library to use environment markers (PEP-496) License: MIT ++++++ dephell_markers-1.0.0.tar.gz -> dephell_markers-1.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/PKG-INFO new/dephell_markers-1.0.1/PKG-INFO --- old/dephell_markers-1.0.0/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/dephell_markers-1.0.1/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: dephell-markers -Version: 1.0.0 +Version: 1.0.1 Summary: Work with environment markers (PEP-496) Project-URL: Repository, https://github.com/dephell/dephell_markers Author: Gram diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers/_marker/__init__.py new/dephell_markers-1.0.1/dephell_markers/_marker/__init__.py --- old/dephell_markers-1.0.0/dephell_markers/_marker/__init__.py 2019-03-24 18:16:50.000000000 +0100 +++ new/dephell_markers-1.0.1/dephell_markers/_marker/__init__.py 2019-10-24 14:59:22.000000000 +0200 @@ -1,3 +1,4 @@ +# app from ._base import BaseMarker from ._string import StringMarker from ._version import VersionMarker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers/_marker/_base.py new/dephell_markers-1.0.1/dephell_markers/_marker/_base.py --- old/dephell_markers-1.0.0/dephell_markers/_marker/_base.py 2019-04-19 12:44:45.000000000 +0200 +++ new/dephell_markers-1.0.1/dephell_markers/_marker/_base.py 2019-10-24 14:59:22.000000000 +0200 @@ -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() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers/_marker/_version.py new/dephell_markers-1.0.1/dephell_markers/_marker/_version.py --- old/dephell_markers-1.0.0/dephell_markers/_marker/_version.py 2019-03-27 14:52:41.000000000 +0100 +++ new/dephell_markers-1.0.1/dephell_markers/_marker/_version.py 2019-10-24 14:59:22.000000000 +0200 @@ -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): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers/_markers.py new/dephell_markers-1.0.1/dephell_markers/_markers.py --- old/dephell_markers-1.0.0/dephell_markers/_markers.py 2019-07-07 12:42:43.000000000 +0200 +++ new/dephell_markers-1.0.1/dephell_markers/_markers.py 2019-10-24 14:59:22.000000000 +0200 @@ -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: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers/_operation/__init__.py new/dephell_markers-1.0.1/dephell_markers/_operation/__init__.py --- old/dephell_markers-1.0.0/dephell_markers/_operation/__init__.py 2019-03-24 18:16:50.000000000 +0100 +++ new/dephell_markers-1.0.1/dephell_markers/_operation/__init__.py 2019-10-24 14:59:22.000000000 +0200 @@ -1,3 +1,4 @@ +# app from ._and import AndMarker from ._base import Operation from ._or import OrMarker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers/_operation/_base.py new/dephell_markers-1.0.1/dephell_markers/_operation/_base.py --- old/dephell_markers-1.0.0/dephell_markers/_operation/_base.py 2019-03-27 14:52:41.000000000 +0100 +++ new/dephell_markers-1.0.1/dephell_markers/_operation/_base.py 2019-10-24 14:59:22.000000000 +0200 @@ -1,6 +1,7 @@ # built-in from typing import Optional, Set +# app from .._cached_property import cached_property @@ -88,7 +89,7 @@ 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 + ' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers.egg-info/PKG-INFO new/dephell_markers-1.0.1/dephell_markers.egg-info/PKG-INFO --- old/dephell_markers-1.0.0/dephell_markers.egg-info/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/dephell_markers-1.0.1/dephell_markers.egg-info/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: dephell-markers -Version: 1.0.0 +Version: 1.0.1 Summary: Work with environment markers (PEP-496) Project-URL: Repository, https://github.com/dephell/dephell_markers Author: Gram diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/dephell_markers.egg-info/SOURCES.txt new/dephell_markers-1.0.1/dephell_markers.egg-info/SOURCES.txt --- old/dephell_markers-1.0.0/dephell_markers.egg-info/SOURCES.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/dephell_markers-1.0.1/dephell_markers.egg-info/SOURCES.txt 1970-01-01 01:00:00.000000000 +0100 @@ -3,14 +3,14 @@ setup.cfg setup.py dephell_markers/_cached_property.py +dephell_markers/_constants.py dephell_markers/__init__.py dephell_markers/_markers.py -dephell_markers/_constants.py -dephell_markers/_operation/_and.py -dephell_markers/_operation/__init__.py dephell_markers/_operation/_or.py dephell_markers/_operation/_base.py +dephell_markers/_operation/__init__.py +dephell_markers/_operation/_and.py dephell_markers/_marker/_version.py +dephell_markers/_marker/_base.py dephell_markers/_marker/__init__.py -dephell_markers/_marker/_string.py -dephell_markers/_marker/_base.py \ No newline at end of file +dephell_markers/_marker/_string.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/setup.py new/dephell_markers-1.0.1/setup.py --- old/dephell_markers-1.0.0/setup.py 2019-07-07 12:43:28.000000000 +0200 +++ new/dephell_markers-1.0.1/setup.py 2019-10-24 14:59:54.000000000 +0200 @@ -21,7 +21,7 @@ setup( long_description=readme, name='dephell_markers', - version='1.0.0', + version='1.0.1', description='Work with environment markers (PEP-496)', python_requires='>=3.5', project_urls={'repository': 'https://github.com/dephell/dephell_markers'}, Binary files old/dephell_markers-1.0.0/tests/__pycache__/__init__.cpython-35.pyc and new/dephell_markers-1.0.1/tests/__pycache__/__init__.cpython-35.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/__init__.cpython-37.pyc and new/dephell_markers-1.0.1/tests/__pycache__/__init__.cpython-37.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_markers.cpython-35-PYTEST.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_markers.cpython-35-PYTEST.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_markers.cpython-37-PYTEST.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_markers.cpython-37-PYTEST.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_markers.cpython-37-pytest-5.2.1.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_markers.cpython-37-pytest-5.2.1.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_string.cpython-35-PYTEST.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_string.cpython-35-PYTEST.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_string.cpython-37-PYTEST.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_string.cpython-37-PYTEST.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_string.cpython-37-pytest-5.2.1.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_string.cpython-37-pytest-5.2.1.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_version.cpython-35-PYTEST.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_version.cpython-35-PYTEST.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_version.cpython-37-PYTEST.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_version.cpython-37-PYTEST.pyc differ Binary files old/dephell_markers-1.0.0/tests/__pycache__/test_version.cpython-37-pytest-5.2.1.pyc and new/dephell_markers-1.0.1/tests/__pycache__/test_version.cpython-37-pytest-5.2.1.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dephell_markers-1.0.0/tests/test_markers.py new/dephell_markers-1.0.1/tests/test_markers.py --- old/dephell_markers-1.0.0/tests/test_markers.py 2019-07-07 12:42:43.000000000 +0200 +++ new/dephell_markers-1.0.1/tests/test_markers.py 2019-10-24 14:59:22.000000000 +0200 @@ -202,3 +202,14 @@ 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()