From 4598de7a2d925bacc4632015a92af95358b7d1b7 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 29 Jun 2022 02:40:08 -0400
Subject: [PATCH 4/4] Revert "Backport pull request #2057"

This reverts commit c978fadc3e7cb166437e86fd5b52b161eb75785b.

Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
 .appveyor.yml                    | 3 ++-
 .circleci/config.yml             | 1 +
 .git_archival.txt                | 1 +
 .github/workflows/ci-testing.yml | 3 ++-
 .github/workflows/release.yml    | 3 ++-
 pyproject.toml                   | 3 ++-
 6 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .git_archival.txt

diff --git a/.appveyor.yml b/.appveyor.yml
index 1d702c46..cfb916a5 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,7 +16,8 @@ install:
   - conda config --add channels conda-forge/label/testing
   - set ENV_NAME=test-environment
   - set PACKAGES=%PACKAGES% flufl.lock owslib pep8 pillow pyshp pytest
-  - set PACKAGES=%PACKAGES% requests setuptools_scm shapely
+  - set PACKAGES=%PACKAGES% requests setuptools_scm setuptools_scm_git_archive
+  - set PACKAGES=%PACKAGES% 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 cc9c1b31..d9807a81 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,6 +46,7 @@ deps-run: &deps-install
         requests \
         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
new file mode 100644
index 00000000..95cb3eea
--- /dev/null
+++ b/.git_archival.txt
@@ -0,0 +1 @@
+ref-names: $Format:%D$
diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml
index 5cf4593e..6ef1be70 100644
--- a/.github/workflows/ci-testing.yml
+++ b/.github/workflows/ci-testing.yml
@@ -48,7 +48,8 @@ jobs:
       - name: Install dependencies
         run: |
           PACKAGES="$PACKAGES flufl.lock owslib pep8 pillow pyshp pytest"
-          PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm shapely"
+          PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm"
+          PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
           # openssl 3.0 updated the legacy renegotiation default, which causes
           # failures in NASA's WMTS server. They will need to update their
           # server before we can use a newer openssl.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 85b52b05..fd09d902 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,8 @@ jobs:
         run: |
           PACKAGES="cython fiona matplotlib-base numpy pyproj pykdtree scipy"
           PACKAGES="$PACKAGES flufl.lock owslib pep8 pillow pyshp pytest"
-          PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm shapely"
+          PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm"
+          PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
           conda install $PACKAGES
 
       - name: Create sdist
diff --git a/pyproject.toml b/pyproject.toml
index b905cf90..9738a040 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,6 +4,7 @@ requires = [
     "setuptools >= 40.6.0",
     "Cython >= 0.29.13",
     "oldest-supported-numpy",
-    "setuptools_scm >= 7.0.0",
+    "setuptools_scm",
+    "setuptools_scm_git_archive",
 ]
 build-backend = "setuptools.build_meta"
-- 
2.36.1