From 74a6fc6fdc1b1627275e3f0d55300897018084c25f3a9b75602fda88c0620b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 20 May 2025 08:06:42 +0000 Subject: [PATCH] Accepting request 1278378 from home:glaubitz:branches:devel:languages:python - Update to 1.7.7 * Merged pull requests: + chore(deps-dev): bump black from 22.12.0 to 24.3.0 + chore(deps-dev): bump jinja2 from 3.1.4 to 3.1.6 + chore(deps-dev): bump requests from 2.31.0 to 2.32.2 + chore(deps-dev): bump virtualenv from 20.21.1 to 20.26.6 + chore(deps-dev): bump zipp from 3.15.0 to 3.19.1 + chore(deps-dev): bump urllib3 from 2.0.7 to 2.2.2 - from version 1.7.6 * Features + prefer new unittest.mock from the standard library #280 + Handle abbreviation 'etc.' (et cetera) #273 * Bug Fixes + Do not double-process urls #284 * Merged pull requests: + Fix pre-commit syntax #266 + Update version listed in documentation's Pre-Commit example #262 + Add missing comma in requirements table #261 - Drop remove-mock.patch, merged upstream - Drop support-python-312.patch, merged upstream - Use Python 3.11 on SLE-15 by default OBS-URL: https://build.opensuse.org/request/show/1278378 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docformatter?expand=0&rev=23 --- docformatter-1.7.5.tar.gz | 3 -- docformatter-1.7.7.tar.gz | 3 ++ python-docformatter.changes | 25 ++++++++++++ python-docformatter.spec | 9 ++--- remove-mock.patch | 28 -------------- support-python-312.patch | 76 ------------------------------------- 6 files changed, 31 insertions(+), 113 deletions(-) delete mode 100644 docformatter-1.7.5.tar.gz create mode 100644 docformatter-1.7.7.tar.gz delete mode 100644 remove-mock.patch delete mode 100644 support-python-312.patch diff --git a/docformatter-1.7.5.tar.gz b/docformatter-1.7.5.tar.gz deleted file mode 100644 index b59c96b..0000000 --- a/docformatter-1.7.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d35de4c83b78172bf618500a8b0e9075378ec41aa4a71b28f2f633a60668b3ab -size 265766 diff --git a/docformatter-1.7.7.tar.gz b/docformatter-1.7.7.tar.gz new file mode 100644 index 0000000..312bc3f --- /dev/null +++ b/docformatter-1.7.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d76165e3a52384ed982889672751bf3d96f3126b57c47c04f66925b35dd7374 +size 315538 diff --git a/python-docformatter.changes b/python-docformatter.changes index 6d48786..2350d7b 100644 --- a/python-docformatter.changes +++ b/python-docformatter.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon May 19 10:01:24 UTC 2025 - John Paul Adrian Glaubitz + +- Update to 1.7.7 + * Merged pull requests: + + chore(deps-dev): bump black from 22.12.0 to 24.3.0 + + chore(deps-dev): bump jinja2 from 3.1.4 to 3.1.6 + + chore(deps-dev): bump requests from 2.31.0 to 2.32.2 + + chore(deps-dev): bump virtualenv from 20.21.1 to 20.26.6 + + chore(deps-dev): bump zipp from 3.15.0 to 3.19.1 + + chore(deps-dev): bump urllib3 from 2.0.7 to 2.2.2 +- from version 1.7.6 + * Features + + prefer new unittest.mock from the standard library #280 + + Handle abbreviation 'etc.' (et cetera) #273 + * Bug Fixes + + Do not double-process urls #284 + * Merged pull requests: + + Fix pre-commit syntax #266 + + Update version listed in documentation's Pre-Commit example #262 + + Add missing comma in requirements table #261 +- Drop remove-mock.patch, merged upstream +- Drop support-python-312.patch, merged upstream +- Use Python 3.11 on SLE-15 by default + ------------------------------------------------------------------- Thu Jan 16 14:06:31 UTC 2025 - Markéta Machová diff --git a/python-docformatter.spec b/python-docformatter.spec index fb06a8b..3c2350e 100644 --- a/python-docformatter.spec +++ b/python-docformatter.spec @@ -16,19 +16,16 @@ # +%{?sle15_python_module_pythons} Name: python-docformatter -Version: 1.7.5 +Version: 1.7.7 Release: 0 Summary: Utility to re-format docstrings per PEP 257 License: MIT URL: https://github.com/myint/docformatter Source: https://github.com/PyCQA/docformatter/archive/refs/tags/v%{version}.tar.gz#/docformatter-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#PyCQA/docformatter#280 -Patch0: remove-mock.patch -# PATCH-FIX-UPSTREAM gh#PyCQA/docformatter#296 -Patch1: support-python-312.patch # PATCH-FIX-OPENSUSE Do not require virtualenvs to run the tests -Patch2: do-not-require-venv.patch +Patch0: do-not-require-venv.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core} diff --git a/remove-mock.patch b/remove-mock.patch deleted file mode 100644 index 53c3225..0000000 --- a/remove-mock.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ba56f8498a1ebed724316e3affcc2c98eeac4ca7 Mon Sep 17 00:00:00 2001 -From: Alexandre Detiste -Date: Sat, 27 Apr 2024 13:44:08 +0200 -Subject: [PATCH] prefer new unittest.mock from the standard library - ---- - tests/test_utility_functions.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/test_utility_functions.py b/tests/test_utility_functions.py -index c9fffd3..e127f33 100644 ---- a/tests/test_utility_functions.py -+++ b/tests/test_utility_functions.py -@@ -36,9 +36,13 @@ - - is_some_sort_of_code() - """ - -+try: -+ from unittest.mock import patch -+except ImportError: -+ from mock import patch -+ - # Third Party Imports - import pytest --from mock import patch - - # docformatter Package Imports - import docformatter diff --git a/support-python-312.patch b/support-python-312.patch deleted file mode 100644 index 9a42cbb..0000000 --- a/support-python-312.patch +++ /dev/null @@ -1,76 +0,0 @@ -From ea60c5528506361f1f9edbeabb75ff874bb77046 Mon Sep 17 00:00:00 2001 -From: finswimmer -Date: Sat, 19 Oct 2024 13:22:28 +0200 -Subject: [PATCH 1/2] feat: drop support for Python < 3.9 - -Added CI pipelines for Pyton 3.12, 3.13 ---- - .github/workflows/ci.yml | 6 +-- - pyproject.toml | 46 ++++++++++---------- - tests/_data/string_files/do_format_code.toml | 6 +-- - tests/test_docformatter.py | 14 +++--- - 4 files changed, 35 insertions(+), 37 deletions(-) - -diff --git a/tests/_data/string_files/do_format_code.toml b/tests/_data/string_files/do_format_code.toml -index 5d886f3..469c78b 100644 ---- a/tests/_data/string_files/do_format_code.toml -+++ b/tests/_data/string_files/do_format_code.toml -@@ -37,7 +37,7 @@ instring=''' - CONST = 123 - - """docstring for CONST.""" -- ''' -+''' - outstring=''' - CONST = 123 - """docstring for CONST.""" -@@ -50,7 +50,7 @@ instring=''' - :cvar test_int: a class attribute. - ..py.method: big_method() - """ -- ''' -+''' - outstring=''' - class TestClass: - """This is a class docstring. -@@ -74,7 +74,7 @@ instring=''' - - - """This is a second class variable docstring.""" -- ''' -+''' - outstring=''' - class TestClass: - """This is a class docstring.""" -diff --git a/tests/test_docformatter.py b/tests/test_docformatter.py -index 20c0809..dbad7c0 100644 ---- a/tests/test_docformatter.py -+++ b/tests/test_docformatter.py -@@ -688,9 +688,9 @@ class TestEndToEndPyproject: - "contents", - [ - '''\ -- class TestFoo(): -- """Docstring that should not have a pre-summary space.""" -- ''' -+class TestFoo(): -+ """ Docstring that should not have a pre-summary space.""" -+''' - ], - ) - @pytest.mark.parametrize( -@@ -725,10 +725,10 @@ def test_no_pre_summary_space_using_pyproject( - See issue #119. - """ - assert '''\ --@@ -1,3 +1,2 @@ -- class TestFoo(): -- """Docstring that should not have a pre-summary space.""" --- -+@@ -1,2 +1,2 @@ -+ class TestFoo(): -+- """ Docstring that should not have a pre-summary space.""" -++ """Docstring that should not have a pre-summary space.""" - ''' == "\n".join( - run_docformatter.communicate()[0].decode().replace("\r", "").split("\n")[2:] - )