Skip to content

Commit adbe960

Browse files
authored
Merge branch 'master' into feat/query-string-as-media
2 parents 69df029 + cdf9deb commit adbe960

File tree

8 files changed

+41
-36
lines changed

8 files changed

+41
-36
lines changed

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- env: py314_cython
6363
python-version: "3.14"
6464
- env: py315
65-
python-version: "3.15.0-alpha.1 - 3.15.0"
65+
python-version: "3.15.0-alpha.3 - 3.15.0"
6666
- env: py312_nocover
6767
os: macos-latest
6868
platform-label: ' (macos)'
@@ -119,7 +119,7 @@ jobs:
119119
coverage combine
120120
121121
- name: Upload coverage to Codecov
122-
uses: codecov/codecov-action@v4
122+
uses: codecov/codecov-action@v5
123123
if: ${{ matrix.tox.coverage }}
124124
with:
125125
env_vars: PYTHON

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ listed below by date of first contribution:
219219
* Tudor Gradinaru (TudorGR)
220220
* Swapnaneel Patra (thisisrick25)
221221
* 0x1618
222+
* 0xMattB
223+
* bricklayer (bricklayer25)
222224

223225
(et al.)
224226

docs/changes/4.3.0.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Contributors to this Release
2323
Many thanks to all of our talented and stylish contributors for this release!
2424

2525
- `0x1618 <https://github.com/0x1618>`__
26+
- `0xMattB <https://github.com/0xMattB>`__
27+
- `bricklayer25 <https://github.com/bricklayer25>`__
2628
- `thisisrick25 <https://github.com/thisisrick25>`__
2729
- `TudorGR <https://github.com/TudorGR>`__
2830
- `vytas7 <https://github.com/vytas7>`__

falcon/testing/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@ def redirected(
13721372
"""Redirect stdout or stderr temporarily.
13731373
13741374
For instance, this helper can be used to capture output from Falcon
1375-
reources under tests::
1375+
resources under tests::
13761376
13771377
import io
13781378

falcon/testing/test_case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import falcon
2727
import falcon.request
2828

29-
# TODO hoist for backwards compat. Remove in falcon 4.
29+
# TODO: Hoist for backwards compat. Remove in Falcon 5.0.
3030
from falcon.testing.client import Result # NOQA
3131
from falcon.testing.client import TestClient
3232

pyproject.toml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -115,37 +115,37 @@ module = [
115115
ignore_missing_imports = true
116116

117117
[tool.towncrier]
118-
package = "falcon"
119-
package_dir = ""
120-
filename = "docs/changes/4.3.0.rst"
121-
directory = "docs/_newsfragments"
122-
issue_format = "`#{issue} <https://github.com/falconry/falcon/issues/{issue}>`__"
123-
124-
# TODO(vytas): title_format = false seems to have no effect in towncrier==21.3.0.
125-
# For now, we just have to remember to check the rendered changelog, and,
126-
# if needed, remove the unwanted auto-generated title.
127-
# See also: https://github.com/twisted/towncrier/issues/345.
128-
title_format = false
129-
130-
[[tool.towncrier.type]]
131-
directory = "breakingchange"
132-
name = "Breaking Changes"
133-
showcontent = true
134-
135-
[[tool.towncrier.type]]
136-
directory = "newandimproved"
137-
name = "New & Improved"
138-
showcontent = true
139-
140-
[[tool.towncrier.type]]
141-
directory = "bugfix"
142-
name = "Fixed"
143-
showcontent = true
144-
145-
[[tool.towncrier.type]]
146-
directory = "misc"
147-
name = "Misc"
148-
showcontent = true
118+
package = "falcon"
119+
package_dir = ""
120+
filename = "docs/changes/4.3.0.rst"
121+
directory = "docs/_newsfragments"
122+
issue_format = "`#{issue} <https://github.com/falconry/falcon/issues/{issue}>`__"
123+
124+
# TODO(vytas): title_format = false seems to have no effect in towncrier==21.3.0.
125+
# For now, we just have to remember to check the rendered changelog, and,
126+
# if needed, remove the unwanted auto-generated title.
127+
# See also: https://github.com/twisted/towncrier/issues/345.
128+
title_format = false
129+
130+
[[tool.towncrier.type]]
131+
directory = "breakingchange"
132+
name = "Breaking Changes"
133+
showcontent = true
134+
135+
[[tool.towncrier.type]]
136+
directory = "newandimproved"
137+
name = "New & Improved"
138+
showcontent = true
139+
140+
[[tool.towncrier.type]]
141+
directory = "bugfix"
142+
name = "Fixed"
143+
showcontent = true
144+
145+
[[tool.towncrier.type]]
146+
directory = "misc"
147+
name = "Misc"
148+
showcontent = true
149149

150150
[tool.black]
151151
# this is kept to avoid reformatting all the code if one were to

requirements/tests

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ coverage >= 4.1
22
pytest >= 7.0
33
pyyaml
44
requests
5-
testtools
65

76
# ASGI Specific (Daphne & Hypercorn are installed in their own tox env)
87
aiofiles

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,15 @@ commands = coverage run -m pytest tests -k 'not slow' []
6969
deps = {[testenv]deps}
7070
pytest-randomly
7171
jsonschema
72+
testtools
7273
commands = coverage run -m pytest tests []
7374

7475
[testenv:py312]
7576
basepython = python3.12
7677
deps = {[testenv]deps}
7778
pytest-randomly
7879
jsonschema
80+
testtools
7981
commands = {[with-coverage]commands}
8082

8183
[testenv:py312_nocover]

0 commit comments

Comments
 (0)