diff --git a/python-tableprint.changes b/python-tableprint.changes index b9f1b2f..590090b 100644 --- a/python-tableprint.changes +++ b/python-tableprint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 8 03:52:38 UTC 2023 - Steve Kowalik + +- Add patch remove-future-requirement.patch, remove requirement of future. +- Switch to autosetup and pyproject macros. + ------------------------------------------------------------------- Thu Oct 20 13:25:13 UTC 2022 - pgajdos@suse.com diff --git a/python-tableprint.spec b/python-tableprint.spec index 8ac0d24..e73858f 100644 --- a/python-tableprint.spec +++ b/python-tableprint.spec @@ -1,7 +1,7 @@ # # spec file for package python-tableprint # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2021, Martin Hauke # # All modifications and additions to the file contributed by third parties @@ -17,25 +17,23 @@ # -%define skip_python2 1 -%define skip_python36 1 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-tableprint Version: 0.9.1 Release: 0 Summary: Pretty console printing of tabular data License: MIT -Group: Development/Languages/Python URL: https://github.com/nirum/tableprint Source: https://github.com/nirum/tableprint/archive/v%{version}.tar.gz#/tableprint-%{version}.tar.gz -BuildRequires: %{python_module future} +# PATCH-FIX-UPSTREAM gh#nirum/tableprint#24 +Patch0: remove-future-requirement.patch BuildRequires: %{python_module pandas} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wcwidth} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-future Requires: python-wcwidth BuildArch: noarch %python_subpackages @@ -47,13 +45,13 @@ Unlike other modules, you can print single rows of data at a time (useful for printing ongoing computation results). %prep -%setup -q -n tableprint-%{version} +%autosetup -p1 -n tableprint-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -63,6 +61,6 @@ Unlike other modules, you can print single rows of data at a time %license License.md %doc README.md %{python_sitelib}/tableprint -%{python_sitelib}/tableprint*egg-info +%{python_sitelib}/tableprint-%{version}.dist-info %changelog diff --git a/remove-future-requirement.patch b/remove-future-requirement.patch new file mode 100644 index 0000000..005bcb4 --- /dev/null +++ b/remove-future-requirement.patch @@ -0,0 +1,39 @@ +From f546dbab758defb2eb9bd8fc2184ee8a260d705b Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +Date: Fri, 8 Sep 2023 13:49:33 +1000 +Subject: [PATCH] Remove future from install_requires + +The future module is not used, so remove it from install_requires. I've +also cleaned up the readme, dropping it and six. +--- + README.md | 3 +-- + setup.py | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/README.md b/README.md +index 42f6191..abad06d 100644 +--- a/README.md ++++ b/README.md +@@ -67,8 +67,7 @@ Hosted at Read The Docs: [tableprint.readthedocs.org](http://tableprint.readthed + ## 📦 Dependencies + + - Python 3.6+ +-- [future](https://pypi.org/project/future/) +-- [six](https://pypi.org/project/six/) ++- [wcwidth](https://pypi.org/project/wcwidth/) + + ## :heart: Contributors + +diff --git a/setup.py b/setup.py +index a533f99..814d138 100644 +--- a/setup.py ++++ b/setup.py +@@ -56,7 +56,7 @@ + # project is installed. For an analysis of "install_requires" vs pip's + # requirements files see: + # https://packaging.python.org/en/latest/requirements.html +- install_requires=['future', 'wcwidth'], ++ install_requires=['wcwidth'], + + # List additional groups of dependencies here (e.g. development dependencies). + # You can install these using the following syntax, for example: