From c3270f3892887bd3b9bc049d2d28e37571010278 Mon Sep 17 00:00:00 2001 From: Zeke Sikelianos Date: Thu, 8 Feb 2024 09:40:36 -0800 Subject: [PATCH 1/2] remove unstable git archival config --- python/.git_archival.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/python/.git_archival.txt b/python/.git_archival.txt index 8fb235d704..7c5100942a 100644 --- a/python/.git_archival.txt +++ b/python/.git_archival.txt @@ -1,4 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ -ref-names: $Format:%D$ From ee83adf15ea411c640c73004acdc692b3a5a7bc9 Mon Sep 17 00:00:00 2001 From: Nick Stenning Date: Fri, 9 Feb 2024 15:20:38 +0100 Subject: [PATCH 2/2] Move .git_archival to package root The code in setuptools_scm [requires][1] that the .git_archival.txt file lives at the package root. The package root was originally python/ but that was changed by d86fb17 and this got left behind. [1]: https://github.com/pypa/setuptools_scm/blob/a23d5fe61d9dc421666d5f23334d454426ad311c/src/setuptools_scm/git.py#L334 --- python/.git_archival.txt => .git_archival.txt | 0 .gitattributes | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename python/.git_archival.txt => .git_archival.txt (100%) diff --git a/python/.git_archival.txt b/.git_archival.txt similarity index 100% rename from python/.git_archival.txt rename to .git_archival.txt diff --git a/.gitattributes b/.gitattributes index 52c3284a24..a8b478799e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -python/.git_archival.txt export-subst +.git_archival.txt export-subst Makefile -linguist-detectable