1From f0c51af263e20f332c6f675aa90ec6705ae4f5d1 Mon Sep 17 00:00:00 2001
2From: Serhii Abarovskyi <aserhii@protonmail.com>
3Date: Tue, 9 May 2023 18:33:54 +0300
4Subject: [PATCH] Use setuptools-scm v7+ for building the dists
5
6Since version 7, setuptools-scm has native support for git archive,
7so the setuptools-scm-git-archive project is obsolete
8and this patch removes it from the build dependencies.
9Close #515
10
11Upstream: https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1
12Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
13---
14 .git_archival.txt                       |  3 +++
15 pyproject.toml                          |  3 +--
16 requirements/dist-build-constraints.in  |  3 +--
17 requirements/dist-build-constraints.txt | 16 +++++++---------
18 setup.cfg                               |  3 +--
19 5 files changed, 13 insertions(+), 15 deletions(-)
20
21diff --git a/.git_archival.txt b/.git_archival.txt
22index 95cb3eea4e..3994ec0a83 100644
23--- a/.git_archival.txt
24+++ b/.git_archival.txt
25@@ -1 +1,4 @@
26+node: $Format:%H$
27+node-date: $Format:%cI$
28+describe-name: $Format:%(describe:tags=true)$
29 ref-names: $Format:%D$
30diff --git a/pyproject.toml b/pyproject.toml
31index b1e5f60a80..88df57dcc1 100644
32--- a/pyproject.toml
33+++ b/pyproject.toml
34@@ -6,8 +6,7 @@ requires = [
35     "setuptools>=34.4",
36
37     # Plugins
38-    "setuptools_scm[toml]>=3.5",
39-    "setuptools_scm_git_archive>=1.1",
40+    "setuptools-scm >= 7.0.0",
41 ]
42 build-backend = "setuptools.build_meta"
43
44diff --git a/requirements/dist-build-constraints.in b/requirements/dist-build-constraints.in
45index 26b57228a9..a37baef1a9 100644
46--- a/requirements/dist-build-constraints.in
47+++ b/requirements/dist-build-constraints.in
48@@ -5,8 +5,7 @@
49 setuptools >= 34.4
50
51 # Plugins
52-setuptools_scm[toml] >= 3.5
53-setuptools_scm_git_archive >= 1.1
54+setuptools-scm[toml] >= 7.0.0
55
56 # Dynamic (coming from setuptools' PEP 517 build backend)
57 wheel
58diff --git a/requirements/dist-build-constraints.txt b/requirements/dist-build-constraints.txt
59index 525f2be30f..8bd4343ff6 100644
60--- a/requirements/dist-build-constraints.txt
61+++ b/requirements/dist-build-constraints.txt
62@@ -1,18 +1,16 @@
63 #
64-# This file is autogenerated by pip-compile with python 3.10
65-# To update, run:
66+# This file is autogenerated by pip-compile with Python 3.10
67+# by the following command:
68 #
69 #    pip-compile --allow-unsafe --output-file=requirements/dist-build-constraints.txt --strip-extras requirements/dist-build-constraints.in
70 #
71-packaging==21.3
72+packaging==23.1
73     # via setuptools-scm
74-pyparsing==3.0.6
75-    # via packaging
76-setuptools-scm==6.3.2
77+setuptools-scm==7.1.0
78     # via -r requirements/dist-build-constraints.in
79-setuptools-scm-git-archive==1.1
80-    # via -r requirements/dist-build-constraints.in
81-tomli==2.0.0
82+tomli==2.0.1
83+    # via setuptools-scm
84+typing-extensions==4.6.3
85     # via setuptools-scm
86 wheel==0.37.1
87     # via -r requirements/dist-build-constraints.in
88diff --git a/setup.cfg b/setup.cfg
89index 1f2b08f4c3..900c7b4feb 100644
90--- a/setup.cfg
91+++ b/setup.cfg
92@@ -64,8 +64,7 @@ include_package_data = True
93 packages = find:
94 include_package_data = True
95 setup_requires =
96-	setuptools_scm>=1.15.0
97-	setuptools_scm_git_archive>=1.0
98+	setuptools_scm >= 7.0.0
99 install_requires =
100 	importlib_metadata; python_version < '3.8'
101 	more_itertools >= 2.6
102