From 7191be4d19592401f38a7b8e824e9669d34dad2b Mon Sep 17 00:00:00 2001
From: Vytautas Liuolia <vytautas.liuolia@gmail.com>
Date: Wed, 12 Jul 2023 10:16:48 +0200
Subject: [PATCH] chore: temporarily pin `importlib-resources` in some CI gates
 (#2153)

* chore: temporarily pin `importlib-resources` to unblock CI

* chore: check if Mailman gate is fixed

* chore: do not run Mailman gate on every PR

* fix: include e2e-tests in `sdist`

* chore: remove the rc option from 3.11

* chore: check full coverage on 3.11

* chore: undo prototyping

* chore: clean up a comment in tox.ini
---
 .github/workflows/mintest.yaml | 4 ++--
 MANIFEST.in                    | 1 +
 tools/testing/fetch_mailman.sh | 3 +++
 tox.ini                        | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mintest.yaml b/.github/workflows/mintest.yaml
index 179d84785..6fbe2c640 100644
--- a/.github/workflows/mintest.yaml
+++ b/.github/workflows/mintest.yaml
@@ -17,7 +17,7 @@ jobs:
         python-version:
           - "3.8"
           - "3.10"
-          - "3.11.0-rc - 3.11"
+          - "3.11"
 
     steps:
       - name: Checkout repo
@@ -37,7 +37,7 @@ jobs:
           tox --version
 
       - name: Adjust .coveragerc
-        if: ${{ matrix.python-version == '3.8' }}
+        if: ${{ matrix.python-version != '3.10' }}
         run: |
           tools/sed_coverage_rc.py
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 06c1485c7..fa3728c1a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 recursive-include docs *.rst *.html *.ico *.png *.py *.svg
+recursive-include e2e-tests *.py *.css *.html *.js
 recursive-include examples *.py
 recursive-include falcon *.pyx
 recursive-include tests *.py *.pyx
diff --git a/tools/testing/fetch_mailman.sh b/tools/testing/fetch_mailman.sh
index d5a6aa74d..18135e786 100755
--- a/tools/testing/fetch_mailman.sh
+++ b/tools/testing/fetch_mailman.sh
@@ -19,11 +19,14 @@ cd $MAILMAN_PATH
 # git checkout tags/$MAILMAN_VERSION
 
 # NOTE(vytas): Patch tox.ini to introduce a new Falcon environment.
+# TODO(vytas): Remove the shim pinning importlib-resources once
+#   https://gitlab.com/mailman/mailman/-/merge_requests/1130 is merged upstream.
 cat <<EOT >> tox.ini
 
 [testenv:falcon-nocov]
 basepython = python3.8
 commands_pre =
+    pip install "importlib-resources < 6.0"
     pip uninstall -y falcon
     pip install $FALCON_ROOT
 EOT
diff --git a/tox.ini b/tox.ini
index 459a37faa..98ba87223 100644
--- a/tox.ini
+++ b/tox.ini
@@ -389,8 +389,12 @@ deps = -r{toxinidir}/requirements/docs
 commands =
     sphinx-build -j auto -W -E -b html docs docs/_build/html []
 
+# NOTE(vytas): importlib-resources is wreaking havoc by backporting future
+#   removals from 3.13 (3.11 being the current stable at the time of writing);
+#   hence we pin it manually here.
 [testenv:towncrier]
 deps = -r{toxinidir}/requirements/docs
+        importlib-resources < 6.0
         toml
         towncrier
 commands =