Merge branch '2.1' into auto-backport-of-pr-651-on-2.1

sunpy · Nov 16, 2023 · f652215 · f652215
2 parents a7da557 + 1c2d897
commit f652215
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
     needs: [core]
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
+      default_python: '3.9'
       submodules: false
       coverage: codecov
       toxdeps: tox-pypi-filter

diff --git a/setup.cfg b/setup.cfg
@@ -56,6 +56,8 @@ docs =
     pytest-doctestplus>=0.9.0
     sphinx
     sphinx-automodapi
+    # Remove next line when fixed in towncrier; see https://github.com/twisted/towncrier/issues/528
+    importlib-resources<6
     sphinx-changelog>=1.1.0
     sphinx-gallery
     sphinxext-opengraph