diff --git a/fix-issues-with-python3.13.patch b/fix-issues-with-python3.13.patch deleted file mode 100644 index 4ade156..0000000 --- a/fix-issues-with-python3.13.patch +++ /dev/null @@ -1,75 +0,0 @@ -From eafdd306861f531c443885048f0abdaa6bc45f8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Thu, 27 Jun 2024 18:30:55 +0200 -Subject: [PATCH 1/2] cli: Fix docstring processing with Python 3.13+ - -Fix docstring processing code to reindent the docstrings if using Python -3.13 or newer. Starting with this version, all docstrings are -automatically dedented by Python, which causes the regular expression to -fail to match. - -Fixes #1585 ---- - tqdm/cli.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tqdm/cli.py b/tqdm/cli.py -index 7284f28d5..1bbce6d1f 100644 ---- a/tqdm/cli.py -+++ b/tqdm/cli.py -@@ -4,6 +4,7 @@ - import logging - import re - import sys -+import textwrap - from ast import literal_eval as numeric - - from .std import TqdmKeyError, TqdmTypeError, tqdm -@@ -177,7 +178,11 @@ def main(fp=sys.stderr, argv=None): - logging.basicConfig(level=getattr(logging, logLevel), - format="%(levelname)s:%(module)s:%(lineno)d:%(message)s") - -- d = tqdm.__doc__ + CLI_EXTRA_DOC -+ d = tqdm.__doc__ -+ if sys.version_info >= (3, 13): -+ # Python 3.13+ automatically dedents docstrings -+ d = textwrap.indent(d, " ") -+ d += CLI_EXTRA_DOC - - opt_types = dict(RE_OPTS.findall(d)) - # opt_types['delim'] = 'chr' - -From 9e7528350b7733b2fb236ca4d615be60b2a4ac29 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 8 Jul 2024 17:26:13 +0200 -Subject: [PATCH 2/2] Avoid Python 3.13+ RuntimeWarning: coroutine method - 'aclose' of 'acount' was never awaited - -See https://github.com/python/cpython/issues/117536#issuecomment-2036883124 ---- - tests/tests_asyncio.py | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/tests/tests_asyncio.py b/tests/tests_asyncio.py -index bdef569fa..250e6585d 100644 ---- a/tests/tests_asyncio.py -+++ b/tests/tests_asyncio.py -@@ -48,10 +48,14 @@ async def test_generators(capsys): - _, err = capsys.readouterr() - assert '9it' in err - -- with tqdm(acount(), desc="async_counter") as pbar: -- async for i in pbar: -- if i >= 8: -- break -+ acounter = acount() -+ try: -+ with tqdm(acounter, desc="async_counter") as pbar: -+ async for i in pbar: -+ if i >= 8: -+ break -+ finally: -+ await acounter.aclose() - _, err = capsys.readouterr() - assert '9it' in err - diff --git a/python-tqdm.changes b/python-tqdm.changes index 9abe42f..1736580 100644 --- a/python-tqdm.changes +++ b/python-tqdm.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Nov 14 11:58:58 UTC 2024 - John Paul Adrian Glaubitz + +- Update to 4.67.0 + * contrib.discord: replace disco-py with requests (#1536) +- from version 4.66.6 + * cli: zip-safe --manpath, --comppath (#1627) + * misc framework updates (#1627) + + fix pytest DeprecationWarning + + fix snapcraft build + + fix nbval DeprecationWarning + + update & tidy workflows + + bump pre-commit + + docs: update URLs +- from version 4.66.5 + * support ncols auto-detection on FreeBSD (#1602 <- casperdcl/git-fame#98) + * fix Python 3.13 CLI (#1594 <- #1585) + * fix Python 3.13 tests (#1595 <- python/cpython#117536 (comment)) + * misc framework updates (#1602) + + add official Python 3.12 support + + bump deps (NiklasRosenstein/pydoc-markdown#329, tikitu/jsmin#44) +- Drop fix-issues-with-python3.13.patch, merged upstream + ------------------------------------------------------------------- Fri Aug 2 09:05:03 UTC 2024 - John Paul Adrian Glaubitz diff --git a/python-tqdm.spec b/python-tqdm.spec index e7b6ccb..5304157 100644 --- a/python-tqdm.spec +++ b/python-tqdm.spec @@ -28,14 +28,12 @@ %endif %{?sle15_python_module_pythons} Name: python-tqdm%{pkg_suffix} -Version: 4.66.4 +Version: 4.67.0 Release: 0 Summary: An extensible progress meter License: MIT AND MPL-2.0 URL: https://github.com/tqdm/tqdm Source: https://files.pythonhosted.org/packages/source/t/tqdm/tqdm-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#qdm/tqdm#1595 - Fix multiple issues with Python 3.13+ -Patch1: https://github.com/tqdm/tqdm/pull/1595.patch#/fix-issues-with-python3.13.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools_scm} diff --git a/tqdm-4.66.4.tar.gz b/tqdm-4.66.4.tar.gz deleted file mode 100644 index b6dcab9..0000000 --- a/tqdm-4.66.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb -size 169392 diff --git a/tqdm-4.67.0.tar.gz b/tqdm-4.67.0.tar.gz new file mode 100644 index 0000000..332b372 --- /dev/null +++ b/tqdm-4.67.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe5a6f95e6fe0b9755e9469b77b9c3cf850048224ecaa8293d7d2d31f97d869a +size 169739