Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 0 additions & 79 deletions .github/workflows/test-integrations-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,85 +22,6 @@ env:
CACHED_BUILD_PATHS: |
${{ github.workspace }}/dist-serverless
jobs:
test-cloud-latest:
name: Cloud (latest)
timeout-minutes: 30
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: ["3.8","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-22.04]
services:
docker:
image: docker:dind # Required for Docker network management
options: --privileged # Required for Docker-in-Docker operations
# Use Docker container only for Python 3.6
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
if: ${{ matrix.python-version != '3.6' }}
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
- name: Setup Test Env
run: |
pip install "coverage[toml]" tox
- name: Erase coverage
run: |
coverage erase
- name: Test aws_lambda latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda-latest"
- name: Test boto3 latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-boto3-latest"
- name: Test chalice latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-chalice-latest"
- name: Test cloud_resource_context latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-cloud_resource_context-latest"
- name: Test gcp latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
run: |
coverage combine .coverage-sentry-*
coverage xml
- name: Upload coverage to Codecov
if: ${{ !cancelled() }}
uses: codecov/[email protected]
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage.xml
# make sure no plugins alter our coverage reports
plugins: noop
verbose: true
- name: Upload test results to Codecov
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: .junitxml
verbose: true
test-cloud-pinned:
name: Cloud (pinned)
timeout-minutes: 30
Expand Down
6 changes: 6 additions & 0 deletions scripts/populate_tox/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@
"py3.7": ["importlib-metadata<5.0"],
},
},
"chalice": {
"package": "chalice",
"deps": {
"*": ["pytest-chalice"],
},
},
"clickhouse_driver": {
"package": "clickhouse-driver",
},
Expand Down
1 change: 0 additions & 1 deletion scripts/populate_tox/populate_tox.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"potel",
# Integrations that can be migrated -- we should eventually remove all
# of these from the IGNORE list
"chalice",
"gcp",
"httpx",
"pure_eval",
Expand Down
9 changes: 0 additions & 9 deletions scripts/populate_tox/tox.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ envlist =
# AWS Lambda
{py3.8,py3.9,py3.11,py3.13}-aws_lambda

# Chalice
{py3.6,py3.9}-chalice-v{1.16}
{py3.8,py3.12,py3.13}-chalice-latest

# Cloud Resource Context
{py3.6,py3.12,py3.13}-cloud_resource_context

Expand Down Expand Up @@ -158,11 +154,6 @@ deps =
aws_lambda: requests
aws_lambda: uvicorn

# Chalice
chalice: pytest-chalice==0.0.5
chalice-v1.16: chalice~=1.16.0
chalice-latest: chalice

# HTTPX
httpx-v0.16: pytest-httpx==0.10.0
httpx-v0.18: pytest-httpx==0.12.0
Expand Down
4 changes: 2 additions & 2 deletions tests/integrations/chalice/test_chalice.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def every_hour(event):


@pytest.mark.skipif(
parse_version(CHALICE_VERSION) >= (1, 28),
parse_version(CHALICE_VERSION) >= (1, 26, 0),
reason="different behavior based on chalice version",
)
def test_bad_request_old(client: RequestHandler) -> None:
Expand All @@ -124,7 +124,7 @@ def test_bad_request_old(client: RequestHandler) -> None:


@pytest.mark.skipif(
parse_version(CHALICE_VERSION) < (1, 28),
parse_version(CHALICE_VERSION) < (1, 26, 0),
reason="different behavior based on chalice version",
)
def test_bad_request(client: RequestHandler) -> None:
Expand Down
22 changes: 12 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# The file (and all resulting CI YAMLs) then need to be regenerated via
# "scripts/generate-test-files.sh".
#
# Last generated: 2025-09-05T07:14:50.663886+00:00
# Last generated: 2025-09-05T07:52:27.350774+00:00

[tox]
requires =
Expand Down Expand Up @@ -42,10 +42,6 @@ envlist =
# AWS Lambda
{py3.8,py3.9,py3.11,py3.13}-aws_lambda

# Chalice
{py3.6,py3.9}-chalice-v{1.16}
{py3.8,py3.12,py3.13}-chalice-latest

# Cloud Resource Context
{py3.6,py3.12,py3.13}-cloud_resource_context

Expand Down Expand Up @@ -152,6 +148,11 @@ envlist =
{py3.7,py3.11,py3.12}-boto3-v1.28.85
{py3.9,py3.12,py3.13}-boto3-v1.40.24

{py3.6,py3.7,py3.8}-chalice-v1.16.0
{py3.6,py3.7,py3.8}-chalice-v1.21.9
{py3.6,py3.8,py3.9}-chalice-v1.26.6
{py3.9,py3.12,py3.13}-chalice-v1.32.0


# ~~~ DBs ~~~
{py3.7,py3.8,py3.9}-asyncpg-v0.23.0
Expand Down Expand Up @@ -372,11 +373,6 @@ deps =
aws_lambda: requests
aws_lambda: uvicorn

# Chalice
chalice: pytest-chalice==0.0.5
chalice-v1.16: chalice~=1.16.0
chalice-latest: chalice

# HTTPX
httpx-v0.16: pytest-httpx==0.10.0
httpx-v0.18: pytest-httpx==0.12.0
Expand Down Expand Up @@ -541,6 +537,12 @@ deps =
boto3-v1.40.24: boto3==1.40.24
{py3.7,py3.8}-boto3: urllib3<2.0.0

chalice-v1.16.0: chalice==1.16.0
chalice-v1.21.9: chalice==1.21.9
chalice-v1.26.6: chalice==1.26.6
chalice-v1.32.0: chalice==1.32.0
chalice: pytest-chalice


# ~~~ DBs ~~~
asyncpg-v0.23.0: asyncpg==0.23.0
Expand Down