diff --git a/python-construct.changes b/python-construct.changes index 0e2483d..37f702b 100644 --- a/python-construct.changes +++ b/python-construct.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 12 11:59:37 UTC 2020 - Tomáš Chvátal + +- Update to 2.10.56: + * drop support for python2 + * no upstream changelog +- Rebase patch split_debug.patch + ------------------------------------------------------------------- Sat Dec 14 22:15:42 UTC 2019 - Stefan Brüns diff --git a/python-construct.spec b/python-construct.spec index 043ae1f..258f72e 100644 --- a/python-construct.spec +++ b/python-construct.spec @@ -1,7 +1,7 @@ # # spec file for package python # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" -%bcond_without test %define psuffix -test +%bcond_without test %else %bcond_with test %endif +%define skip_python2 1 Name: python-construct%{?psuffix} -Version: 2.9.45 +Version: 2.10.56 Release: 0 Summary: A declarative parser/builder for binary data License: MIT @@ -35,18 +36,16 @@ Patch0: split_debug.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-arrow +Recommends: python-numpy +Recommends: python-ruamel.yaml +BuildArch: noarch %if %{with test} BuildRequires: %{python_module arrow} +BuildRequires: %{python_module numpy} BuildRequires: %{python_module pytest-benchmark} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module six} -BuildRequires: python2-enum34 -%endif -Requires: python-arrow -Requires: python-six -BuildArch: noarch -%ifpython2 -Requires: python-enum34 +BuildRequires: %{python_module ruamel.yaml} %endif %python_subpackages diff --git a/split_debug.patch b/split_debug.patch index 8b351eb..93a4146 100644 --- a/split_debug.patch +++ b/split_debug.patch @@ -1,7 +1,7 @@ -Index: construct-2.9.45/construct/__init__.py +Index: construct-2.10.56/construct/__init__.py =================================================================== ---- construct-2.9.45.orig/construct/__init__.py -+++ construct-2.9.45/construct/__init__.py +--- construct-2.10.56.orig/construct/__init__.py ++++ construct-2.10.56/construct/__init__.py @@ -21,7 +21,6 @@ Hands-on example: from construct.core import * @@ -17,8 +17,8 @@ Index: construct-2.9.45/construct/__init__.py - 'Debugger', 'Default', 'Double', - 'Embedded', -@@ -144,7 +142,6 @@ __all__ = [ + 'Enum', +@@ -143,7 +141,6 @@ __all__ = [ 'possiblestringencodings', 'Prefixed', 'PrefixedArray', @@ -26,14 +26,13 @@ Index: construct-2.9.45/construct/__init__.py 'ProcessRotateLeft', 'ProcessXor', 'RangeError', -@@ -207,3 +204,10 @@ __all__ = [ +@@ -206,3 +203,9 @@ __all__ = [ ] __all__ += ["Int%s%s%s" % (n,us,bln) for n in (8,16,24,32,64) for us in "us" for bln in "bln"] - __all__ += ["Float%s%s" % (n,bln) for n in (32,64) for bln in "bln"] + __all__ += ["Float%s%s" % (n,bln) for n in (16,32,64) for bln in "bln"] + +try: + from construct.debug import * + __all__ += ['Debugger', 'Probe'] +except ImportError: + pass -+ diff --git a/v2.10.56.tar.gz b/v2.10.56.tar.gz new file mode 100644 index 0000000..5b62cd3 --- /dev/null +++ b/v2.10.56.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fa228d6547e3a2cbf1af7afbce5a11ae0b2b83d5f4a941ad0cf8c0eefc7665d +size 1184110 diff --git a/v2.9.45.tar.gz b/v2.9.45.tar.gz deleted file mode 100644 index 17224f5..0000000 --- a/v2.9.45.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28718d4d598acaaf5eca201037c47b234166c92a355cc3d7045646554bb5e7b7 -size 1042299