From c0011e13b1edabcd541610d7fbef084bcb387183 Mon Sep 17 00:00:00 2001
From: Mike Taves <mwtoews@gmail.com>
Date: Sat, 10 Sep 2022 18:13:27 +1200
Subject: [PATCH] Remove unnecessary build dependencies, use build defaults,
 strict twine check (#6979)

---
 .github/workflows/pypi-release.yaml     | 6 +++---
 .github/workflows/testpypi-release.yaml | 7 +++----
 pyproject.toml                          | 5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pypi-release.yaml b/.github/workflows/pypi-release.yaml
index 42255048235..4c1b18542a2 100644
--- a/.github/workflows/pypi-release.yaml
+++ b/.github/workflows/pypi-release.yaml
@@ -23,17 +23,17 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install setuptools setuptools-scm wheel twine check-manifest
+          python -m pip install build twine
 
       - name: Build tarball and wheels
         run: |
           git clean -xdf
           git restore -SW .
-          python -m build --sdist --wheel .
+          python -m build
 
       - name: Check built artifacts
         run: |
-          python -m twine check dist/*
+          python -m twine check --strict dist/*
           pwd
           if [ -f dist/xarray-0.0.0.tar.gz ]; then
             echo "❌ INVALID VERSION NUMBER"
diff --git a/.github/workflows/testpypi-release.yaml b/.github/workflows/testpypi-release.yaml
index ff63341eb57..04b61b08302 100644
--- a/.github/workflows/testpypi-release.yaml
+++ b/.github/workflows/testpypi-release.yaml
@@ -23,7 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install build setuptools setuptools-scm wheel twine check-manifest
+          python -m pip install build twine
           python -m pip install tomli tomli_w
 
       - name: Disable local versions
@@ -35,12 +35,11 @@ jobs:
       - name: Build tarball and wheels
         run: |
           git clean -xdf
-          python -m build --sdist --wheel .
+          python -m build
 
       - name: Check built artifacts
         run: |
-          python -m twine check dist/*
-          pwd
+          python -m twine check --strict dist/*
           if [ -f dist/xarray-0.0.0.tar.gz ]; then
             echo "❌ INVALID VERSION NUMBER"
             exit 1
diff --git a/pyproject.toml b/pyproject.toml
index f1f1a2ac8a6..616e7335fdb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,9 +1,8 @@
 [build-system]
 requires = [
     "setuptools>=42",
-    "wheel",
-    "setuptools_scm[toml]>=3.4",
-    "setuptools_scm_git_archive",
+    "setuptools-scm[toml]>=3.4",
+    "setuptools-scm-git-archive",
 ]
 build-backend = "setuptools.build_meta"