Skip to content

Commit

Permalink
Build fixes for PexOS
Browse files Browse the repository at this point in the history
  • Loading branch information
mhy-pexip committed Jan 28, 2025
1 parent 88cb971 commit 06deada
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
19 changes: 19 additions & 0 deletions debian/patches/pexip_disable_test_for_pytest7.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Index: starlette/tests/test_routing.py
===================================================================
--- starlette.orig/tests/test_routing.py
+++ starlette/tests/test_routing.py
@@ -655,9 +655,11 @@ def test_lifespan_with_on_events(test_cl
shutdown_called = True

with pytest.deprecated_call(match="The on_startup and on_shutdown parameters are deprecated"):
- with pytest.warns(
- UserWarning, match="The `lifespan` parameter cannot be used with `on_startup` or `on_shutdown`."
- ):
+ # We temporarily do not allow stacking of the pytest contextlib functions as
+ # pytest 7.x doesn't seem to support this
+ #with pytest.warns(
+ # UserWarning, match="The `lifespan` parameter cannot be used with `on_startup` or `on_shutdown`."
+ #):
app = Router(on_startup=[run_startup], on_shutdown=[run_shutdown], lifespan=lifespan)

assert not lifespan_called
12 changes: 12 additions & 0 deletions debian/patches/pexip_remove_python313_tag.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Index: starlette/pyproject.toml
===================================================================
--- starlette.orig/pyproject.toml
+++ starlette/pyproject.toml
@@ -23,7 +23,6 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
- "Programming Language :: Python :: 3.13",
"Topic :: Internet :: WWW/HTTP",
]
dependencies = [
2 changes: 2 additions & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pexip_remove_python313_tag.diff
pexip_disable_test_for_pytest7.diff

0 comments on commit 06deada

Please sign in to comment.