Sync from SUSE:SLFO:1.1 python-construct revision 4632b8011d52bc85384daca44671acf7

python-construct.changes

@@ -1,24 +1,3 @@
--------------------------------------------------------------------
-Thu Feb 29 01:59:28 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
-
-- Switch to autosetup macro. 
-
--------------------------------------------------------------------
-Fri Dec 29 18:13:42 UTC 2023 - Dirk Müller <dmueller@suse.com>
-
-- update to 2.10.70:
-  * all exceptions docstrings were defined.
-  * stream_size stream_iseof now raise properly StreamError
-  * Keep track of offsets within substreams where possible
-  * Fix missing objects in Struct._emitbuild's context
-  * Fix ExprMixin for and/or being compiled as logical instead of
-    bitwise
-  * Issue 1046: Docs updated accordingly.
-  * enum34 module renamed to enum, etc.
-  * Use builtin dict instead of collections.OrderedDict for class
-    Contain…
-  * Implement __getstate__ and __setstate__ on Container
-
 -------------------------------------------------------------------
 Sun Mar 27 11:07:33 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

python-construct.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package python-construct
+# spec file
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
 %define psuffix -test
@@ -23,18 +24,16 @@
 %else
 %bcond_with test
 %endif
-%{?sle15_python_module_pythons}
+%define skip_python2 1
 Name:           python-construct%{?psuffix}
-Version:        2.10.70
+Version:        2.10.68
 Release:        0
 Summary:        A declarative parser/builder for binary data
 License:        MIT
 URL:            https://github.com/construct/construct
 Source:         https://github.com/construct/construct/archive/v%{version}.tar.gz#/construct-%{version}.tar.gz
 Patch0:         split_debug.patch
-BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-arrow
@@ -46,12 +45,11 @@ BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module arrow}
 BuildRequires:  %{python_module cloudpickle}
-BuildRequires:  %{python_module cryptography}
 BuildRequires:  %{python_module lz4}
-BuildRequires:  %{python_module numpy}
 BuildRequires:  %{python_module pytest-benchmark}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module ruamel.yaml}
+BuildRequires:  %{python_module numpy if (%python-base without python36-base)}
 %endif
 %python_subpackages
 
@@ -64,7 +62,8 @@ code, it can be used in one direction to parse data into Pythonic objects,
 and in the other direction to convert ("build") objects into binary data.
 
 %prep
-%autosetup -p1 -n construct-%{version}
+%setup -q -n construct-%{version}
+%patch0 -p1
 
 # remove gallery tests that require in place stuff
 rm -rf tests/gallery
@@ -72,12 +71,12 @@ rm -rf tests/deprecated_gallery
 
 %build
 %if %{without test}
-%pyproject_wheel
+%python_build
 %endif
 
 %install
 %if %{without test}
-%pyproject_install
+%python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %endif
 
@@ -95,7 +94,7 @@ python36_donttest="numpy or test_overall_parse or test_overall_build or test_com
 %license LICENSE
 %doc README.rst
 %{python_sitelib}/construct
-%{python_sitelib}/construct-%{version}.dist-info
+%{python_sitelib}/construct-%{version}-py%{python_version}.egg-info
 %endif
 
 %changelog

split_debug.patch

@@ -1,7 +1,7 @@
-Index: construct-2.10.70/construct/__init__.py
+Index: construct-2.10.56/construct/__init__.py
 ===================================================================
---- construct-2.10.70.orig/construct/__init__.py
+--- construct-2.10.56.orig/construct/__init__.py
-+++ construct-2.10.70/construct/__init__.py
++++ construct-2.10.56/construct/__init__.py
 @@ -21,7 +21,6 @@ Hands-on example:
  
  from construct.core import *
@@ -10,15 +10,15 @@ Index: construct-2.10.70/construct/__init__.py
  from construct.version import *
  from construct import lib
  
-@@ -71,7 +70,6 @@ __all__ = [
+@@ -69,7 +68,6 @@ __all__ = [
      'ConstructError',
      'Container',
      'CString',
 -    'Debugger',
      'Default',
      'Double',
-     'EncryptedSym',
+     'Enum',
-@@ -148,7 +146,6 @@ __all__ = [
+@@ -143,7 +141,6 @@ __all__ = [
      'possiblestringencodings',
      'Prefixed',
      'PrefixedArray',
@@ -26,7 +26,7 @@ Index: construct-2.10.70/construct/__init__.py
      'ProcessRotateLeft',
      'ProcessXor',
      'RangeError',
-@@ -213,3 +210,9 @@ __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 (16,32,64) for bln in "bln"]