Accepting request 664590 from devel:languages:python

- Reintroduce split_debug.patch for rpmlint[mini] mode

- Version update to 2.9.45:
  * No obvious changelog present
- Remove obsolete split_debug.patch
- Use github tarball in order to be able to run tests

OBS-URL: https://build.opensuse.org/request/show/664590
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-construct?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2019-01-28 19:45:38 +00:00 committed by Git OBS Bridge
commit c6971067cf
5 changed files with 66 additions and 25 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:67ee2c69a11bdadc0705c7e0de0ff16ef74b730932537e22ac1f64f479240ffa
size 720277

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jan 7 11:37:34 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Reintroduce split_debug.patch for rpmlint[mini] mode
-------------------------------------------------------------------
Wed Jan 2 09:36:53 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Version update to 2.9.45:
* No obvious changelog present
- Remove obsolete split_debug.patch
- Use github tarball in order to be able to run tests
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 4 12:46:54 UTC 2018 - Matej Cepl <mcepl@suse.com> Tue Dec 4 12:46:54 UTC 2018 - Matej Cepl <mcepl@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-construct # spec file for package python-construct
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,19 +18,27 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-construct Name: python-construct
Version: 2.8.12 Version: 2.9.45
Release: 0 Release: 0
Summary: A declarative parser/builder for binary data Summary: A declarative parser/builder for binary data
License: MIT License: MIT
Group: Development/Languages/Python Group: Development/Languages/Python
URL: http://construct.readthedocs.org URL: https://github.com/construct/construct
Source: https://files.pythonhosted.org/packages/source/c/construct/construct-%{version}.tar.gz Source: https://github.com/construct/construct/archive/v%{version}.tar.gz
# PATCH-FEATURE-OPENSUSE split_debug.patch matwey.kornilov@gmail.com -- make debug.py non-loadable
Patch0: split_debug.patch Patch0: split_debug.patch
BuildRequires: %{python_module arrow}
BuildRequires: %{python_module pytest-benchmark}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six} BuildRequires: %{python_module six}
Requires: python-arrow
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-six Requires: python-six
BuildRequires: python2-enum34
%ifpython2
Requires: python-enum34
%endif
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages
@ -46,6 +54,10 @@ and in the other direction to convert ("build") objects into binary data.
%setup -q -n construct-%{version} %setup -q -n construct-%{version}
%patch0 -p1 %patch0 -p1
# remove gallery tests that require in place stuff
rm -rf tests/gallery
rm -rf tests/deprecated_gallery
%build %build
%python_build %python_build
@ -53,6 +65,9 @@ and in the other direction to convert ("build") objects into binary data.
%python_install %python_install
%python_expand %fdupes -s %{buildroot}%{$python_sitelib} %python_expand %fdupes -s %{buildroot}%{$python_sitelib}
%check
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix}
%files %{python_files} %files %{python_files}
%license LICENSE %license LICENSE
%doc README.rst %doc README.rst

View File

@ -1,26 +1,39 @@
Index: construct-2.8.11/construct/__init__.py Index: construct-2.9.45/construct/__init__.py
=================================================================== ===================================================================
--- construct-2.8.11.orig/construct/__init__.py --- construct-2.9.45.orig/construct/__init__.py
+++ construct-2.8.11/construct/__init__.py +++ construct-2.9.45/construct/__init__.py
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@ Hands-on example:
from construct.core import * from construct.core import *
from construct.expr import this, Path, Path2, PathFunc, len_, sum_, min_, max_, abs_, obj_ from construct.expr import *
-from construct.debug import Probe, ProbeInto, Debugger -from construct.debug import *
from construct.version import version, version_string, release_date from construct.version import *
from construct import lib from construct import lib
@@ -40,6 +39,12 @@ @@ -69,7 +68,6 @@ __all__ = [
# exposed names 'ConstructError',
#=============================================================================== 'Container',
__all__ = [ 'CString',
- 'AdaptationError', 'Aligned', 'AlignedStruct', 'Array', 'Bit', 'BitIntegerError', 'BitStruct', 'Bitwise', 'CString', 'Construct', 'ConstructError', 'Container', 'Debugger', 'EmbeddedBitStruct', 'Enum', 'ExprAdapter', 'FieldError', 'Flag', 'FlagsContainer', 'FlagsEnum', 'Bytes', 'FormatField', 'GreedyRange', 'HexDump', 'HexString', 'If', 'IfThenElse', 'Indexing', 'LazyBound', 'LazyContainer', 'ListContainer', 'Mapping', 'MappingError', 'Nibble', 'NoneOf', 'Octet', 'OnDemand', 'OnDemandPointer', 'OneOf', 'Optional', 'OverwriteError', 'Packer', 'Padding', 'PaddingError', 'PascalString', 'Pass', 'Peek', 'Pointer', 'PrefixedArray', 'Probe', 'Range', 'RangeError', 'Renamed', 'RepeatUntil', 'Select', 'SelectError', 'Sequence', 'SizeofError', 'Slicing', 'String', 'Struct', 'Subconstruct', 'Switch', 'SwitchError', 'SymmetricMapping', 'Terminated', 'TerminatedError', 'UnionError', 'Union', 'ValidationError', 'Validator', 'Computed', 'Bytes', 'Tunnel', 'Embedded', 'Const', 'ConstError', 'VarInt', 'StringError', 'Checksum', 'ByteSwapped', 'LazyStruct', 'Numpy', 'Adapter', 'SymmetricAdapter', 'Tunnel', 'Compressed', 'GreedyBytes', 'Prefixed', 'Padded', 'GreedyString', 'RawCopy', 'LazyRange', 'LazySequence', 'LazySequenceContainer', 'BitsInteger', 'BytesInteger', '__author__', '__version__', 'Restreamed', 'RestreamedBytesIO', 'Bytewise', 'LazyRangeContainer', 'BitsSwapped', 'RebufferedBytesIO', 'Rebuffered', 'version', 'version_string','lib','Seek','Tell','setglobalstringencoding','globalstringencoding','NamedTuple','ExprValidator','Filter','Hex','Error','ExplicitError','release_date','Rebuild','Check','len_','sum_','min_','max_','abs_','obj_','singleton','singletonfunction', 'this', 'Path','Path2','PathFunc','FocusedSeq','FocusedError','ExprSymmetricAdapter','ProbeInto','Default','ChecksumError','StopIf', 'setglobalfullprinting','getglobalfullprinting','Byte','Short','Int','Long', - 'Debugger',
+ 'AdaptationError', 'Aligned', 'AlignedStruct', 'Array', 'Bit', 'BitIntegerError', 'BitStruct', 'Bitwise', 'CString', 'Construct', 'ConstructError', 'Container', 'EmbeddedBitStruct', 'Enum', 'ExprAdapter', 'FieldError', 'Flag', 'FlagsContainer', 'FlagsEnum', 'Bytes', 'FormatField', 'GreedyRange', 'HexDump', 'HexString', 'If', 'IfThenElse', 'Indexing', 'LazyBound', 'LazyContainer', 'ListContainer', 'Mapping', 'MappingError', 'Nibble', 'NoneOf', 'Octet', 'OnDemand', 'OnDemandPointer', 'OneOf', 'Optional', 'OverwriteError', 'Packer', 'Padding', 'PaddingError', 'PascalString', 'Pass', 'Peek', 'Pointer', 'PrefixedArray', 'Range', 'RangeError', 'Renamed', 'RepeatUntil', 'Select', 'SelectError', 'Sequence', 'SizeofError', 'Slicing', 'String', 'Struct', 'Subconstruct', 'Switch', 'SwitchError', 'SymmetricMapping', 'Terminated', 'TerminatedError', 'UnionError', 'Union', 'ValidationError', 'Validator', 'Computed', 'Bytes', 'Tunnel', 'Embedded', 'Const', 'ConstError', 'VarInt', 'StringError', 'Checksum', 'ByteSwapped', 'LazyStruct', 'Numpy', 'Adapter', 'SymmetricAdapter', 'Tunnel', 'Compressed', 'GreedyBytes', 'Prefixed', 'Padded', 'GreedyString', 'RawCopy', 'LazyRange', 'LazySequence', 'LazySequenceContainer', 'BitsInteger', 'BytesInteger', '__author__', '__version__', 'Restreamed', 'RestreamedBytesIO', 'Bytewise', 'LazyRangeContainer', 'BitsSwapped', 'RebufferedBytesIO', 'Rebuffered', 'version', 'version_string','lib','Seek','Tell','setglobalstringencoding','globalstringencoding','NamedTuple','ExprValidator','Filter','Hex','Error','ExplicitError','release_date','Rebuild','Check','len_','sum_','min_','max_','abs_','obj_','singleton','singletonfunction', 'this', 'Path','Path2','PathFunc','FocusedSeq','FocusedError','ExprSymmetricAdapter','Default','ChecksumError','StopIf', 'setglobalfullprinting','getglobalfullprinting','Byte','Short','Int','Long', 'Default',
'Double',
] + ["Int%s%s%s" % (n,us,bln) for n in (8,16,32,64) for us in "us" for bln in "bln"] + ["Int24ub","Int24ul","Int24sb","Int24sl"] + ["Float%s%s" % (n,bl) for n in (32,64) for bl in "bl"] + ["Single","Double"] 'Embedded',
@@ -144,7 +142,6 @@ __all__ = [
'possiblestringencodings',
'Prefixed',
'PrefixedArray',
- 'Probe',
'ProcessRotateLeft',
'ProcessXor',
'RangeError',
@@ -207,3 +204,10 @@ __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"]
+ +
+try: +try:
+ from construct.debug import Probe, Debugger, ProbeInto + from construct.debug import *
+ __all__ = __all__ + ['Debugger', 'Probe', 'ProbeInto'] + __all__ += ['Debugger', 'Probe']
+except ImportError: +except ImportError:
+ pass + pass
+

3
v2.9.45.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28718d4d598acaaf5eca201037c47b234166c92a355cc3d7045646554bb5e7b7
size 1042299