Skip to content

Commit

Permalink
chore: temporarily pin importlib-resources in some CI gates (#2153)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
vytas7 authored Jul 12, 2023
1 parent 574a0d0 commit 7191be4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/mintest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
python-version:
- "3.8"
- "3.10"
- "3.11.0-rc - 3.11"
- "3.11"

steps:
- name: Checkout repo
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions tools/testing/fetch_mailman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 7191be4

Please sign in to comment.