From fee997d2e848b634a84ce0c4e9025e3b3e761640 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:06:05 -0700 Subject: [PATCH 1/5] Update build-system requirements of setuptools-scm to >= 7.0.5 Co-authored-by: David Runge --- .git_archival.txt | 4 ++++ CHANGES.txt | 5 +++++ pyproject.toml | 5 ++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.git_archival.txt b/.git_archival.txt index 95cb3eea..9eb3075f 100644 --- a/.git_archival.txt +++ b/.git_archival.txt @@ -1 +1,5 @@ +node: $Format:%H$ +node-date: $Format:%cI$ +describe-name: $Format:%(describe:tags=true)$ ref-names: $Format:%D$ + diff --git a/CHANGES.txt b/CHANGES.txt index e7fe2231..c04899d9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,11 @@ Changes ------- +next (unreleased) +^^^^^^^^^^^^^^^^^ + +* Update build-system requirements to drop the use of setuptools-scm-git-archive #955 + 0.2.0 (2023-06-11) ^^^^^^^^^^^^^^^^^^ diff --git a/pyproject.toml b/pyproject.toml index f521df04..99f645ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,11 +1,10 @@ [build-system] requires = [ # Essentials - "setuptools >= 42", + "setuptools >= 45", # Plugins - "setuptools_scm[toml] >= 6.4, < 7", - "setuptools_scm_git_archive >= 1.1", + "setuptools_scm[toml] >= 7.0.5", ] build-backend = "setuptools.build_meta" From 9045eae00f06f3481c9c7949d8b0118dd8edd1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=87=BA=F0=9F=87=A6=20Sviatoslav=20Sydorenko=20=28?= =?UTF-8?q?=D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B8=D0=B4=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE=29?= Date: Mon, 10 Mar 2025 21:11:24 +0100 Subject: [PATCH 2/5] Drop stray trailing LF from `.git_archival.txt` --- .git_archival.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.git_archival.txt b/.git_archival.txt index 9eb3075f..3994ec0a 100644 --- a/.git_archival.txt +++ b/.git_archival.txt @@ -2,4 +2,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true)$ ref-names: $Format:%D$ - From cdef05644e24decec8585d0621ab1f7b16ebac07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=87=BA=F0=9F=87=A6=20Sviatoslav=20Sydorenko=20=28?= =?UTF-8?q?=D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B8=D0=B4=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE=29?= Date: Mon, 10 Mar 2025 21:11:54 +0100 Subject: [PATCH 3/5] Switch the change note to past tense This also highlights the removed dep name. --- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index c04899d9..3d8721eb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,7 +4,7 @@ Changes next (unreleased) ^^^^^^^^^^^^^^^^^ -* Update build-system requirements to drop the use of setuptools-scm-git-archive #955 +* Updated build-system requirements to drop the use of `setuptools-scm-git-archive` #955 0.2.0 (2023-06-11) ^^^^^^^^^^^^^^^^^^ From 2ab0d5cb1f2f90685b9240055df3830633cd4f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=87=BA=F0=9F=87=A6=20Sviatoslav=20Sydorenko=20=28?= =?UTF-8?q?=D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B8=D0=B4=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE=29?= Date: Mon, 10 Mar 2025 21:12:34 +0100 Subject: [PATCH 4/5] Drop `ref-names` from `.git_archival.txt` template --- .git_archival.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.git_archival.txt b/.git_archival.txt index 3994ec0a..3e26627d 100644 --- a/.git_archival.txt +++ b/.git_archival.txt @@ -1,4 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true)$ -ref-names: $Format:%D$ From dc741887bc9d4aeba7ccfa48593ebaa055ea67ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=87=BA=F0=9F=87=A6=20Sviatoslav=20Sydorenko=20=28?= =?UTF-8?q?=D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B8=D0=B4=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE=29?= Date: Mon, 10 Mar 2025 21:13:04 +0100 Subject: [PATCH 5/5] Filter the tags starting w/ `v` @ `.git_archival.txt` --- .git_archival.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.git_archival.txt b/.git_archival.txt index 3e26627d..6acb3b41 100644 --- a/.git_archival.txt +++ b/.git_archival.txt @@ -1,3 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ -describe-name: $Format:%(describe:tags=true)$ +describe-name: $Format:%(describe:tags=true,match=v[0-9]*)$