From 95ba6a7127574de1842367b0fa05ccfca54ebcb3 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Fri, 4 Nov 2022 00:15:37 +1300 Subject: [PATCH] Remove setuptools-scm-git-archive, require setuptools-scm>=7 --- .git_archival.txt | 3 +++ asv_bench/asv.conf.json | 3 +-- pyproject.toml | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.git_archival.txt b/.git_archival.txt index 95cb3eea4e3..8fb235d7045 100644 --- a/.git_archival.txt +++ b/.git_archival.txt @@ -1 +1,4 @@ +node: $Format:%H$ +node-date: $Format:%cI$ +describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ ref-names: $Format:%D$ diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 5de6d6a4f76..b43e4d1e4e8 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -58,8 +58,7 @@ // "pip+emcee": [""], // emcee is only available for install with pip. // }, "matrix": { - "setuptools_scm[toml]": [""], // GH6609 - "setuptools_scm_git_archive": [""], // GH6609 + "setuptools_scm": [""], // GH6609 "numpy": [""], "pandas": [""], "netcdf4": [""], diff --git a/pyproject.toml b/pyproject.toml index 271abc0aab1..85b96fb47c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,8 +2,7 @@ build-backend = "setuptools.build_meta" requires = [ "setuptools>=42", - "setuptools-scm[toml]>=3.4", - "setuptools-scm-git-archive", + "setuptools-scm>=7", ] [tool.setuptools_scm]