From 343f41e8023c9ea4f3474e9b194f17ff1a185ecd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 7 Mar 2022 14:19:30 -0500 Subject: [PATCH] Update to 0.20.1 (close RHBZ#2061214) --- .gitignore | 1 + hatchling-0.11.0-allow-tomli-1.2.2.patch | 12 ------------ python-hatchling.spec | 12 ++---------- sources | 2 +- 4 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 hatchling-0.11.0-allow-tomli-1.2.2.patch diff --git a/.gitignore b/.gitignore index d3e01c2..42fc2d0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /hatchling-0.16.0.tar.gz /hatchling-0.17.0.tar.gz /hatchling-0.18.0.tar.gz +/hatchling-0.20.1.tar.gz diff --git a/hatchling-0.11.0-allow-tomli-1.2.2.patch b/hatchling-0.11.0-allow-tomli-1.2.2.patch deleted file mode 100644 index 895fa4f..0000000 --- a/hatchling-0.11.0-allow-tomli-1.2.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur hatchling-0.11.0-original/src/hatchling/ouroboros.py hatchling-0.11.0/src/hatchling/ouroboros.py ---- hatchling-0.11.0-original/src/hatchling/ouroboros.py 2020-02-01 19:00:00.000000000 -0500 -+++ hatchling-0.11.0/src/hatchling/ouroboros.py 2022-02-05 07:40:37.160670864 -0500 -@@ -40,7 +40,7 @@ - 'pluggy~=1.0.0; python_version > "3"', - 'pluggy~=0.13; python_version < "3"', - 'toml~=0.10.2; python_version < "3"', -- 'tomli~=2.0.0; python_version > "3"', -+ 'tomli>=1.2.2; python_version > "3"', - ], - 'scripts': {'hatchling': 'hatchling.cli:hatchling'}, - 'dynamic': ['version'], diff --git a/python-hatchling.spec b/python-hatchling.spec index 59b5eec..5f34347 100644 --- a/python-hatchling.spec +++ b/python-hatchling.spec @@ -1,5 +1,5 @@ Name: python-hatchling -Version: 0.18.0 +Version: 0.20.1 Release: %autorelease Summary: The build backend used by Hatch @@ -10,14 +10,6 @@ Source0: %{pypi_source hatchling} # metadata and --help output Source1: hatchling.1 -# Based on https://github.com/hukkin/tomli/blob/2.0.0/CHANGELOG.md#200, we -# should be able to use tomli 1.2.2 until -# https://bugzilla.redhat.com/show_bug.cgi?id=2032020 is closed. -# -# It doesn’t make sense to upstream this, as it really would be better to use a -# current release. -Patch: hatchling-0.11.0-allow-tomli-1.2.2.patch - BuildArch: noarch BuildRequires: python3-devel @@ -35,7 +27,7 @@ Summary: %{summary} %prep -%autosetup -n hatchling-%{version} -p1 +%autosetup -n hatchling-%{version} %generate_buildrequires diff --git a/sources b/sources index 54fd4f0..2adcba9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hatchling-0.18.0.tar.gz) = 7e70497112baa58880c96de704d993509409fc6eb4383312f4d49d62eb2e6bb3fc40c5d80852f2b49f89831be2c40f508ea8a9817b3104a740fe6f95572d1ebc +SHA512 (hatchling-0.20.1.tar.gz) = 65c053ecf2e982d08ac6f047cfcc939c4bd2d064b805a94a9cb2236ca85359389a5e6673f6d2f9e40cf3604b61359ba41bcae740c6f2956515e862fedf83c283