From a246b59559adca5f96e0cdb9cf5c6e626c66a2a4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 Jul 2023 00:40:16 -0400 Subject: [PATCH] Update to 0.19 (fix RHBZ#2137292, fix RHBZ#2220407) - Unbundle python-appdirs and document bundled python-flexcache This is the first upstream release that is compatible with numpy in F37 and later. --- .gitignore | 1 + python-pint.spec | 22 +++++++++++++++++++++- sources | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9328b77..36f0be5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Pint-0.16.tar.gz /Pint-0.16.1.tar.gz /Pint-0.17.tar.gz +/Pint-0.19.tar.gz diff --git a/python-pint.spec b/python-pint.spec index ffab6b3..1a9ccf8 100644 --- a/python-pint.spec +++ b/python-pint.spec @@ -1,8 +1,11 @@ Name: python-pint -Version: 0.17 +Version: 0.19 Release: %autorelease Summary: Physical quantities module +# The entire source is BSD-3-Clause, except: +# - pint/_vendor/appdirs.py is MIT, but is unbundled in %%prep +# - pint/_vendor/flexcache.py is also BSD-3-Clause License: BSD-3-Clause URL: https://github.com/hgrecco/pint Source0: %{pypi_source Pint} @@ -22,6 +25,11 @@ constants.} %package -n python3-pint Summary: %{summary} +# TODO: Package this separately so it can be devendored/unbundled. +# pint/_vendor/flexcache.py +# https://github.com/hgrecco/flexcache +Provides: bundled(python3dist(flexcache)) = 0.2 + %description -n python3-pint %{_description} # We omit the “uncertainties” extra because python-uncertainties is not yet @@ -58,6 +66,18 @@ rm -rvf docs/_themes # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters sed -r -i '/pytest-cov/d' setup.cfg +# Unbundle python-appdirs +# http://github.com/ActiveState/appdirs +# Provides: bundled(python3dist(appdirs)) = 1.4.4 +rm -vf pint/_vendor/appdirs.py +# Add devendored dependencies back in as regular dependencies +sed -r -i 's/^setup_requires/install_requires = appdirs\n&/' setup.cfg +# The find-then-modify pattern keeps us from discarding mtimes on sources that +# do not need modification. +find pint -type f -exec \ + gawk '/^from \.+_vendor import (appdirs)/ { print FILENAME; nextfile }' '{}' '+' | + xargs -r -t sed -r -i 's/^from \.+_vendor (import (appdirs))/\1/' + %generate_buildrequires # We omit the “uncertainties” extra because python-uncertainties is not yet # packaged. diff --git a/sources b/sources index 8566f24..3378552 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Pint-0.17.tar.gz) = 3e715d67b4a7b931ccaf7cdbeda4aa2338e7129840de447837f86696efb52117c6e6e832d1cc3605d160f12a631f3ce2e5dceff46be0de91460c3fec4c605146 +SHA512 (Pint-0.19.tar.gz) = 7d76d3b23e78c6e02f9d96b07da2823b779fef83325258737e04eabf6658bd8480b5fb43688186f9d05cf09db5787947148a2a81d068e90895da48e2cb06769a