Compare commits

1 Commits
main ... 1.1

5 changed files with 26 additions and 112 deletions

View File

@@ -1,48 +1,3 @@
-------------------------------------------------------------------
Thu Apr 17 02:37:45 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Add missing BuildRequires on pytest-benchmark for running the test suite.
-------------------------------------------------------------------
Thu Apr 10 12:43:29 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 3.1.0
* Improved performance of ``as_traceback`` by a large factor.
* Dropped support for now-EOL Python 3.8 and added 3.13 in the
test grid.
- Drop more-aggressive-location-stripping.patch, fixed upstream
- Drop vendore-reraise-from-six.patch, merged upstream
- Renumber patches
-------------------------------------------------------------------
Mon Sep 9 12:30:08 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Cherry-pick patch from Fedora to fix testsuite with Python 3.13
* test_pickle_exception-even-harder-location-stripping.patch
-------------------------------------------------------------------
Fri May 31 22:34:24 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Clean up SPEC file.
-------------------------------------------------------------------
Fri May 17 09:22:14 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Update to 3.0.0
* Removed support for legacy Pythons (2.7 up to 3.7) and added Pythons
3.11 and 3.12 in the test grid.
* Added support for __context__, __suppress_context__ and __notes__.
* Added the get_locals argument to tblib.pickling_support.install(),
tblib.Traceback and tblib.Frame.
- Add vendore-reraise-from-six.patch to get rid of six
- Add more-aggressive-location-stripping.patch to fix test failure
- Standardize multibuild
-------------------------------------------------------------------
Fri Jun 9 11:45:42 UTC 2023 - ecsos <ecsos@opensuse.org>
- Add %{?sle15_python_module_pythons}
-------------------------------------------------------------------
Wed Sep 16 21:26:47 UTC 2020 - Dirk Mueller <dmueller@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-tblib
# spec file for package python
#
# Copyright (c) 2025 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
@@ -16,36 +16,38 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -%{flavor}
%bcond_without test
%bcond_without test_twisted
%define psuffix -test
%else
%define psuffix %{nil}
%bcond_with test
%bcond_without test
%bcond_with test_twisted
%endif
%{?sle15_python_module_pythons}
Name: python-tblib%{?psuffix}
Version: 3.1.0
Version: 1.7.0
Release: 0
Summary: Traceback serialization library
License: BSD-2-Clause
Group: Development/Languages/Python
URL: https://github.com/ionelmc/python-tblib
Source: https://files.pythonhosted.org/packages/source/t/tblib/tblib-%{version}.tar.gz
# PATCH-FIX-FEDORA https://src.fedoraproject.org/rpms/python-tblib/blob/rawhide/f/0001-test_pickle_exception-even-harder-location-stripping.patch
Patch1: test_pickle_exception-even-harder-location-stripping.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
%if %{with test}
%if %{with test_twisted}
BuildRequires: %{python_module Twisted}
BuildRequires: %{python_module pytest-benchmark}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module tblib == %{version}}
%endif
%if %{with test}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module six}
%endif
Requires: python-six
BuildArch: noarch
%python_subpackages
%description
@@ -68,14 +70,14 @@ are solely responsible for security problems should you decide to use
the pickle support.
%prep
%autosetup -p1 -n tblib-%{version}
%setup -q -n tblib-%{version}
%build
%pyproject_wheel
%python_build
%install
%if !%{with test}
%pyproject_install
%if "%{flavor}" != "test"
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif
@@ -84,12 +86,11 @@ the pickle support.
%pytest
%endif
%if !%{with test}
%if "%{flavor}" != "test"
%files %{python_files}
%doc AUTHORS.rst CHANGELOG.rst README.rst
%license LICENSE
%{python_sitelib}/tblib
%{python_sitelib}/tblib-%{version}.dist-info
%{python_sitelib}/*
%endif
%changelog

BIN
tblib-1.7.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

BIN
tblib-3.1.0.tar.gz (Stored with Git LFS)

Binary file not shown.

View File

@@ -1,42 +0,0 @@
From 11329603da1f9600e29bbd8f2c2a704ae0062e49 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 18 Jun 2024 12:19:02 -0700
Subject: [PATCH] test_pickle_exception: even harder location stripping. Ref
#74.
With Python 3.13, we need to strip even harder, because we get
location lines with differing amounts of tildes and up carets in
them, e.g.:
~~^~~~~
and:
^^^^^^^
Let's ditch the regex and instead go line-by-line with a pretty
loose match for anything that looks like a location line.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
tests/test_pickle_exception.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/test_pickle_exception.py b/tests/test_pickle_exception.py
index 53a9dce..afe0d69 100644
--- a/tests/test_pickle_exception.py
+++ b/tests/test_pickle_exception.py
@@ -30,7 +30,9 @@ class CustomError(Exception):
def strip_locations(tb_text):
- return tb_text.replace(' ~~^~~\n', '').replace(' ^^^^^^^^^^^^^^^^^\n', '')
+ lines = tb_text.splitlines()
+ lines = [line for line in lines if '~~^~~' not in line and '^^^^' not in line]
+ return '\n'.join(lines)
@pytest.mark.parametrize('protocol', [None, *list(range(1, pickle.HIGHEST_PROTOCOL + 1))])
--
2.45.2