From 145939f534d161534bc4b581c034c27a0670f44e Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Tue, 18 Apr 2023 17:40:43 +0100
Subject: [PATCH 1/2] automate pypi manifest checking

---
 .github/workflows/ci-manifest.yml | 26 ++++++++++++++++++++++++++
 MANIFEST.in                       | 31 +++++++++++++++++++------------
 pyproject.toml                    |  7 +++++++
 3 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/ci-manifest.yml

diff --git a/.github/workflows/ci-manifest.yml b/.github/workflows/ci-manifest.yml
new file mode 100644
index 0000000000..6f0818d9c8
--- /dev/null
+++ b/.github/workflows/ci-manifest.yml
@@ -0,0 +1,26 @@
+# Reference
+#    - https://github.com/actions/checkout
+
+name: ci-manifest
+
+on:
+  pull_request:
+    branches:
+      - "*"
+
+  push:
+    branches-ignore:
+      - "auto-update-lockfiles"
+      - "pre-commit-ci-update-config"
+      - "dependabot/*"
+
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  manifest:
+    name: "check-manifest"
+    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2023.04.3
diff --git a/MANIFEST.in b/MANIFEST.in
index ad28df9c7c..70b3d74294 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,18 +1,25 @@
-# Top-level files
-include CHANGES COPYING COPYING.LESSER
 prune .github
+prune benchmarks
+prune docs
+prune etc
+recursive-include lib *.cdl *.cml *.json *.md *.py *.template *.txt *.xml
+prune requirements
+prune tools
+exclude .git-blame-ignore-revs
+exclude .git_archival.txt
+exclude .gitattributes
 exclude .gitignore
+exclude .mailmap
+exclude .pre-commit-config.yaml
+exclude .readthedocs.yml
+exclude CHANGES
+exclude codecov.yml
+include COPYING
+include COPYING.LESSER
+exclude Makefile
+exclude noxfile.py
 
-# Files required for conda package management
-recursive-include requirements *
-
-# Files required to build docs
-recursive-include docs *
-prune docs/src/_build
-prune docs/src/generated
-prune docs/gallery_tests
-
-# Files required to build std_names module
+# files required to build iris.std_names module
 include tools/generate_std_names.py
 include etc/cf-standard-name-table.xml
 
diff --git a/pyproject.toml b/pyproject.toml
index a97f47d0b7..8d21951c48 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -66,3 +66,10 @@ exclude_lines = [
 [tool.codespell]
 ignore-words-list = "alpha-numeric,degreee,discontiguities,lazyness,meaned,nin"
 skip = "_build,*.css,*.ipynb,*.js,*.html,*.svg,*.xml,.git,generated"
+
+[tool.check-manifest]
+ignore = [
+    "lib/iris/_version.py",
+    "lib/iris/std_names.py",
+    "lib/iris/tests/results/PP/extra_char_data.w_data_loaded.pp.txt",
+]

From c3d1c3c650a8885d36b5914c169b910a91f4b1c3 Mon Sep 17 00:00:00 2001
From: Bill Little <bill.little@metoffice.gov.uk>
Date: Wed, 19 Apr 2023 11:11:10 +0100
Subject: [PATCH 2/2] Update pyproject.toml

Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8d21951c48..232ddb7c5a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,5 +71,4 @@ skip = "_build,*.css,*.ipynb,*.js,*.html,*.svg,*.xml,.git,generated"
 ignore = [
     "lib/iris/_version.py",
     "lib/iris/std_names.py",
-    "lib/iris/tests/results/PP/extra_char_data.w_data_loaded.pp.txt",
 ]