From 67c43185fb2222a4e4b0f76310109670fdf904b052db3838627eb3d244c4a68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 26 Feb 2021 08:22:41 +0000 Subject: [PATCH 1/2] Accepting request 875256 from home:jayvdb:branches:devel:languages:python - Update to v0.3.3 * See https://github.com/uqfoundation/dill/compare/dill-0.3.2...dill-0.3.3 - from v0.3.2 * See https://github.com/uqfoundation/dill/compare/dill-0.3.1.1...dill-0.3.2 OBS-URL: https://build.opensuse.org/request/show/875256 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dill?expand=0&rev=16 --- dill-0.3.1.1.tar.gz | 3 --- dill-0.3.3.zip | 3 +++ python-dill.changes | 8 ++++++++ python-dill.spec | 10 ++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 dill-0.3.1.1.tar.gz create mode 100644 dill-0.3.3.zip diff --git a/dill-0.3.1.1.tar.gz b/dill-0.3.1.1.tar.gz deleted file mode 100644 index 94e1ee0..0000000 --- a/dill-0.3.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c -size 151986 diff --git a/dill-0.3.3.zip b/dill-0.3.3.zip new file mode 100644 index 0000000..f14639c --- /dev/null +++ b/dill-0.3.3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb7f6cb65dba7087c1e111bb5390291ba3616741f96840bfc75792a1a9b5ded +size 177693 diff --git a/python-dill.changes b/python-dill.changes index 3e68cee..5bd41d6 100644 --- a/python-dill.changes +++ b/python-dill.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 26 04:58:06 UTC 2021 - John Vandenberg + +- Update to v0.3.3 + * See https://github.com/uqfoundation/dill/compare/dill-0.3.2...dill-0.3.3 +- from v0.3.2 + * See https://github.com/uqfoundation/dill/compare/dill-0.3.1.1...dill-0.3.2 + ------------------------------------------------------------------- Sun Dec 6 23:05:33 UTC 2020 - Benjamin Greiner diff --git a/python-dill.spec b/python-dill.spec index 0c25ac8..9f47735 100644 --- a/python-dill.spec +++ b/python-dill.spec @@ -1,7 +1,7 @@ # # spec file for package python-dill # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,18 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-dill -Version: 0.3.1.1 +Version: 0.3.3 Release: 0 Summary: Module to serialize all of Python License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/uqfoundation/dill -Source: https://files.pythonhosted.org/packages/source/d/dill/dill-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/d/dill/dill-%{version}.zip BuildRequires: %{python_module objgraph >= 1.7.2} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: unzip %if 0%{?suse_version} >= 1550 BuildRequires: %{python_module dbm} %else @@ -69,8 +70,9 @@ find dill -name '*.py' -exec sed -i '1{\@^#!%{_bindir}/env python@d}' {} \; %check export PYTHONDONTWRITEBYTECODE=1 # Creative; copied from .travis.yml +# See https://github.com/uqfoundation/dill/issues/361 for s390x and ppc64 failures failed=0 -for test in tests/*.py; do +for test in tests/test_*.py; do %python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python $test || failed=1 done exit $failed From 8bad47add7190157d74005f7a7c1bf3228f48d3b50c9339b5145a82dff856bd8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 27 Feb 2021 17:44:59 +0000 Subject: [PATCH 2/2] Accepting request 875552 from home:jayvdb:branches:devel:languages:python - Add 07e24913.patch to fix s390x and ppc64 OBS-URL: https://build.opensuse.org/request/show/875552 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dill?expand=0&rev=17 --- 07e24913.patch | 24 ++++++++++++++++++++++++ python-dill.changes | 5 +++++ python-dill.spec | 3 ++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 07e24913.patch diff --git a/07e24913.patch b/07e24913.patch new file mode 100644 index 0000000..6e00181 --- /dev/null +++ b/07e24913.patch @@ -0,0 +1,24 @@ +From 07e24913e88dfe26448226f9cfd1ee6cf5c2a760 Mon Sep 17 00:00:00 2001 +From: mmckerns +Date: Fri, 26 Feb 2021 12:01:52 -0500 +Subject: [PATCH] comment out BigEndianStructureType + +--- + dill/_objects.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dill/_objects.py b/dill/_objects.py +index 3adba2b..5c54aba 100644 +--- a/dill/_objects.py ++++ b/dill/_objects.py +@@ -216,8 +216,8 @@ class _Struct(ctypes.Structure): + a['CSizeTType'] = ctypes.c_size_t() + a['CLibraryLoaderType'] = ctypes.cdll + a['StructureType'] = _Struct +- if not IS_PYPY: +- a['BigEndianStructureType'] = ctypes.BigEndianStructure() ++ # if not IS_PYPY: ++ # a['BigEndianStructureType'] = ctypes.BigEndianStructure() + #NOTE: also LittleEndianStructureType and UnionType... abstract classes + #NOTE: remember for ctypesobj.contents creates a new python object + #NOTE: ctypes.c_int._objects is memberdescriptor for object's __dict__ diff --git a/python-dill.changes b/python-dill.changes index 5bd41d6..d63d9f6 100644 --- a/python-dill.changes +++ b/python-dill.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 26 23:46:51 UTC 2021 - John Vandenberg + +- Add 07e24913.patch to fix s390x and ppc64 + ------------------------------------------------------------------- Fri Feb 26 04:58:06 UTC 2021 - John Vandenberg diff --git a/python-dill.spec b/python-dill.spec index 9f47735..deb06c2 100644 --- a/python-dill.spec +++ b/python-dill.spec @@ -25,6 +25,7 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/uqfoundation/dill Source: https://files.pythonhosted.org/packages/source/d/dill/dill-%{version}.zip +Patch0: https://github.com/uqfoundation/dill/commit/07e24913.patch BuildRequires: %{python_module objgraph >= 1.7.2} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -54,6 +55,7 @@ session in a single command. %prep %setup -q -n dill-%{version} +%patch0 -p1 find dill -name '*.py' -exec sed -i '1{\@^#!%{_bindir}/env python@d}' {} \; %build @@ -70,7 +72,6 @@ find dill -name '*.py' -exec sed -i '1{\@^#!%{_bindir}/env python@d}' {} \; %check export PYTHONDONTWRITEBYTECODE=1 # Creative; copied from .travis.yml -# See https://github.com/uqfoundation/dill/issues/361 for s390x and ppc64 failures failed=0 for test in tests/test_*.py; do %python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python $test || failed=1