From e5e2f1b7cec4c2969326d18e2c00eb37bb416331f673cf6b5a72a488e1ea7317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 20 Jan 2025 10:33:48 +0000 Subject: [PATCH] Accepting request 1238892 from home:ojkastl_buildservice:Branch_devel_languages_python update to 4.12.0 OBS-URL: https://build.opensuse.org/request/show/1238892 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-click-extra?expand=0&rev=7 --- click-extra-4.11.7.tar.gz | 3 --- click-extra-4.12.0.tar.gz | 3 +++ click818.patch | 24 ------------------------ python-click-extra.changes | 13 +++++++++++++ python-click-extra.spec | 12 ++++-------- 5 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 click-extra-4.11.7.tar.gz create mode 100644 click-extra-4.12.0.tar.gz delete mode 100644 click818.patch diff --git a/click-extra-4.11.7.tar.gz b/click-extra-4.11.7.tar.gz deleted file mode 100644 index d7deb5a..0000000 --- a/click-extra-4.11.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d440b110ddb2d6ec6c15824ed3ae62ed7c6facc7240e9d8813b26bab2457cb89 -size 505886 diff --git a/click-extra-4.12.0.tar.gz b/click-extra-4.12.0.tar.gz new file mode 100644 index 0000000..ebcd810 --- /dev/null +++ b/click-extra-4.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de9d947842f104ac1e202ba06590ec27f59e814425336b39dd51b04e45f90510 +size 506330 diff --git a/click818.patch b/click818.patch deleted file mode 100644 index 9b9ae71..0000000 --- a/click818.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ab9cff085aefff5787a2c9c7def8e71c9d3ed379 Mon Sep 17 00:00:00 2001 -From: Kevin Deldycke -Date: Fri, 3 Jan 2025 08:47:19 +0400 -Subject: [PATCH] Fix 8.1.8 tests - ---- - pyproject.toml | 5 +---- - tests/test_parameters.py | 2 +- - uv.lock | 2 +- - 3 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/tests/test_parameters.py b/tests/test_parameters.py -index f064b448d..032c9cffd 100644 ---- a/tests/test_parameters.py -+++ b/tests/test_parameters.py -@@ -407,7 +407,7 @@ def show_params(): - table = [ - ( - "show-params.help", -- "click.core.Option", -+ "click.decorators.HelpOption", - "--help", - "click.types.BoolParamType", - "bool", diff --git a/python-click-extra.changes b/python-click-extra.changes index a5f2062..cd28847 100644 --- a/python-click-extra.changes +++ b/python-click-extra.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jan 20 06:03:47 UTC 2025 - Johannes Kastl + +- update to 4.12.0 + - Remove Click Extra's own implementation of HelpOption class now + that fixes have reached Click's upstream. + - Redefine @help_option decorator to default to --help/-h + options. + - Add more logging examples in documentation. + - Add tests on ubuntu-24.04-arm and ubuntu-22.04-arm. + - Use uv to install specific versions of Python. +- remove patch click818.patch + ------------------------------------------------------------------- Thu Jan 16 11:19:15 UTC 2025 - Markéta Machová diff --git a/python-click-extra.spec b/python-click-extra.spec index 53f1cbb..bf7467a 100644 --- a/python-click-extra.spec +++ b/python-click-extra.spec @@ -19,14 +19,12 @@ %define module_name click-extra %{?sle15_python_module_pythons} Name: python-click-extra -Version: 4.11.7 +Version: 4.12.0 Release: 0 Summary: Drop-in replacement for Click to make user-friendly and colorful CLI License: GPL-2.0-or-later URL: https://github.com/kdeldycke/click-extra Source: https://github.com/kdeldycke/click-extra/archive/v%{version}.tar.gz#/%{module_name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/kdeldycke/click-extra/commit/ab9cff085aefff5787a2c9c7def8e71c9d3ed379 Fix 8.1.8 tests -Patch: click818.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core >= 1.0.0} BuildRequires: %{python_module setuptools} @@ -35,9 +33,9 @@ BuildRequires: %{python_module wheel} # https://github.com/kdeldycke/click-extra/blob/v4.8.3/pyproject.toml#L67 BuildRequires: %{python_module PyYAML >= 6.0.0} BuildRequires: %{python_module boltons >= 24.1.0} -BuildRequires: %{python_module click >= 8.1.4} +BuildRequires: %{python_module click >= 8.1.8} BuildRequires: %{python_module cloup >= 3.0.5} -BuildRequires: %{python_module extra-platforms >= 1.6.0} +BuildRequires: %{python_module extra-platforms >= 2.0.0} BuildRequires: %{python_module mergedeep >= 1.3.4} BuildRequires: %{python_module requests >= 2.32.3} BuildRequires: %{python_module tabulate >= 0.9} @@ -89,9 +87,7 @@ BuildArch: noarch %check # remove coverage configuration -sed -i '/cov=/d' pyproject.toml -sed -i '/cov-report=/d' pyproject.toml -sed -i '/cov-config=pyproject.toml/d' pyproject.toml +sed -i '/--cov.*",/d' pyproject.toml # ignore test that requires network connectivity %pytest -k 'not (test_ansi_lexers_candidates)'