From 24cb196d027edf8f5d79c7cb92ec3d9373ad4ae2 Mon Sep 17 00:00:00 2001 From: wenyuzifang Date: Fri, 19 Sep 2025 00:28:38 +0800 Subject: [PATCH] Update code from upstream --- 0001-Drop-depedency-on-hatch-vcs.patch | 54 ++++++++++++++++++++++++++ python-prettytable.spec | 13 ++++++- 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 0001-Drop-depedency-on-hatch-vcs.patch diff --git a/0001-Drop-depedency-on-hatch-vcs.patch b/0001-Drop-depedency-on-hatch-vcs.patch new file mode 100644 index 0000000..b54c808 --- /dev/null +++ b/0001-Drop-depedency-on-hatch-vcs.patch @@ -0,0 +1,54 @@ +From c34f3d01eb258ca6f97fc72d7bf8162aa40b4cab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Budai?= +Date: Tue, 6 Aug 2024 11:00:39 +0200 +Subject: [PATCH] Drop depedency on hatch-vcs + +We want to remove it from EL10, we don't need automatic versions there. +--- + pyproject.toml | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 410c5de..d7c3cb0 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,12 +1,12 @@ + [build-system] + build-backend = "hatchling.build" + requires = [ +- "hatch-vcs", + "hatchling", + ] + + [project] + name = "prettytable" ++version = "3.6.0" + description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format" + readme = "README.md" + license = {text = "BSD (3 clause)"} +@@ -17,9 +17,6 @@ dependencies = [ + 'importlib-metadata; python_version < "3.8"', + "wcwidth", + ] +-dynamic = [ +- "version", +-] + classifiers = [ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", +@@ -46,12 +43,5 @@ tests = [ + Homepage = "https://github.com/jazzband/prettytable" + Source = "https://github.com/jazzband/prettytable" + +- +-[tool.hatch] +-version.source = "vcs" +- +-[tool.hatch.version.raw-options] +-local_scheme = "no-local-version" +- + [tool.isort] + profile = "black" +-- +2.45.2 + diff --git a/python-prettytable.spec b/python-prettytable.spec index d757f12..e301b88 100644 --- a/python-prettytable.spec +++ b/python-prettytable.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %define debug_package %{nil} %global pypi_name prettytable @@ -10,9 +10,16 @@ Release: %{anolis_release}%{?dist} Summary: A simple Python library for easily displaying tabular data in a visually appealing ASCII table format License: BSD (3 clause) URL: https://pypi.org/project/prettytable/ -Source0: https://files.pythonhosted.org/packages/ba/b6/8e78337766d4c324ac22cb887ecc19487531f508dbf17d922b91492d55bb/prettytable-3.6.0.tar.gz +Source0: https://files.pythonhosted.org/packages/source/p/prettytable/prettytable-3.6.0.tar.gz +Patch1: 0001-Drop-depedency-on-hatch-vcs.patch BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(pytest-lazy-fixture) +BuildRequires: python3dist(wcwidth) +BuildRequires: sed BuildArch: noarch %global _description\ @@ -65,6 +72,8 @@ doc files for python3-%{pypi_name} %doc README.md CHANGELOG.md %changelog +* Fri Sep 19 2025 wenyuzifang - 3.6.0-3 +- Ensure reproducible builds by using a static version and removing reliance on VCS tools * Wed Mar 13 2024 Zhao Hang - 3.6.0-2 - Rebuild with python3.11 -- Gitee