From 76c4d78441c51944fbaa48006eb6ce426f3e0344 Mon Sep 17 00:00:00 2001
From: Ryan May <rmay@ucar.edu>
Date: Mon, 27 Jun 2022 19:16:28 -0600
Subject: [PATCH] Remove use of setuptools_scm_git_archive (Fixes #2053)

The .git_archival.txt in the sdist is breaking installation with new
versions of pip (version comes up 0.0). Support for git archives is
baked into setuptools_scm itself now with version 7.
---
 .appveyor.yml                    | 3 +--
 .circleci/config.yml             | 1 -
 .git_archival.txt                | 1 -
 .github/workflows/ci-testing.yml | 3 +--
 .github/workflows/release.yml    | 3 +--
 environment.yml                  | 1 -
 pyproject.toml                   | 3 +--
 7 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 .git_archival.txt

diff --git a/.appveyor.yml b/.appveyor.yml
index 26368421e..a28916df4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,8 +16,7 @@ install:
   - conda config --add channels conda-forge/label/testing
   - set ENV_NAME=test-environment
   - set PACKAGES=%PACKAGES% owslib pep8 pillow pyshp pytest pytest-mpl
-  - set PACKAGES=%PACKAGES% setuptools_scm setuptools_scm_git_archive
-  - set PACKAGES=%PACKAGES% shapely
+  - set PACKAGES=%PACKAGES% setuptools_scm shapely
   - conda create -n %ENV_NAME% python=%PYTHON_VERSION% %PACKAGES%
   - activate %ENV_NAME%
   - set INCLUDE=%CONDA_PREFIX%\Library\include;%INCLUDE%
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53668828b..1c2fff434 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,7 +45,6 @@ deps-run: &deps-install
         pyshp \
         scipy \
         setuptools_scm \
-        setuptools_scm_git_archive \
         shapely \
         $EXTRA_PACKAGES \
         --file docs/doc-requirements.txt
diff --git a/.git_archival.txt b/.git_archival.txt
deleted file mode 100644
index 95cb3eea4..000000000
--- a/.git_archival.txt
+++ /dev/null
@@ -1 +0,0 @@
-ref-names: $Format:%D$
diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml
index a274f9e86..e9641e587 100644
--- a/.github/workflows/ci-testing.yml
+++ b/.github/workflows/ci-testing.yml
@@ -49,8 +49,7 @@ jobs:
       - name: Install dependencies
         run: |
           PACKAGES="$PACKAGES owslib pep8 pillow pyshp pytest pytest-mpl"
-          PACKAGES="$PACKAGES pytest-xdist setuptools_scm"
-          PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
+          PACKAGES="$PACKAGES pytest-xdist setuptools_scm shapely"
           conda install $PACKAGES
           conda info -a
           conda list
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3e34cd2c7..32f4f87c7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,8 +26,7 @@ jobs:
         run: |
           PACKAGES="cython fiona matplotlib-base numpy pyproj pykdtree scipy"
           PACKAGES="$PACKAGES owslib pep8 pillow pyshp pytest"
-          PACKAGES="$PACKAGES pytest-xdist setuptools_scm"
-          PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
+          PACKAGES="$PACKAGES pytest-xdist setuptools_scm shapely"
           conda install $PACKAGES
 
       - name: Create sdist
diff --git a/environment.yml b/environment.yml
index 1c4d667a6..26af3cdab 100644
--- a/environment.yml
+++ b/environment.yml
@@ -39,4 +39,3 @@ dependencies:
   - flake8
   - pykdtree
   - setuptools_scm
-  - setuptools_scm_git_archive
diff --git a/pyproject.toml b/pyproject.toml
index 9738a040c..b905cf90a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,6 @@ requires = [
     "setuptools >= 40.6.0",
     "Cython >= 0.29.13",
     "oldest-supported-numpy",
-    "setuptools_scm",
-    "setuptools_scm_git_archive",
+    "setuptools_scm >= 7.0.0",
 ]
 build-backend = "setuptools.build_meta"