0001-Use-setuptools-scm-v7-for-building-the-dists.patch 3.3 KB

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