Skip to content

Commit a8b63b4

Browse files
Merge branch 'master' into refactor/rename-aconnect-to-aio-connect
2 parents 9fe598c + 324e66f commit a8b63b4

File tree

4 files changed

+83
-48
lines changed

4 files changed

+83
-48
lines changed

.github/workflows/release.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@ jobs:
3333
- name: Release
3434
uses: softprops/action-gh-release@v2
3535
with:
36-
files: dist/*
36+
files: |
37+
dist/*.whl
38+
dist/*.tar.gz
3739
generate_release_notes: true

.github/workflows/test-suite.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Test Suite
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
test-type:
7+
required: true
8+
type: string
9+
10+
jobs:
11+
run:
12+
runs-on: ubuntu-latest
13+
14+
env:
15+
TEST_TYPE: ${{ inputs.test-type }}
16+
AWS_DEFAULT_REGION: us-west-2
17+
AWS_ATHENA_S3_STAGING_DIR: s3://laughingman7743-pyathena/github/
18+
AWS_ATHENA_WORKGROUP: pyathena
19+
AWS_ATHENA_SPARK_WORKGROUP: pyathena-spark
20+
AWS_ATHENA_MANAGED_WORKGROUP: pyathena-managed
21+
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
26+
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v4
30+
31+
- uses: astral-sh/setup-uv@v5
32+
with:
33+
python-version: ${{ matrix.python-version }}
34+
enable-cache: true
35+
# TODO: In the case of Python 3.13+, the following error occurs, so install Python using setup-python.
36+
# ../meson.build:44:2: ERROR: Problem encountered: Cannot compile
37+
# `Python.h`. Perhaps you need to install python-dev|python-devel
38+
- uses: actions/setup-python@v5
39+
with:
40+
python-version: ${{ matrix.python-version }}
41+
if: matrix.python-version == '3.13' || matrix.python-version == '3.14'
42+
- run: |
43+
make tool
44+
45+
- name: Configure AWS credentials
46+
uses: aws-actions/configure-aws-credentials@v4
47+
with:
48+
role-to-assume: arn:aws:iam::676287850544:role/github-actions-oidc-pyathena
49+
role-session-name: PyAthenaTestSession
50+
aws-region: ${{ env.AWS_DEFAULT_REGION }}
51+
52+
- name: Test
53+
run: |
54+
make tox

.github/workflows/test.yaml

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Test
22

33
on:
4-
push:
4+
pull_request:
55
schedule:
66
- cron: '0 0 * * 0'
77

@@ -11,45 +11,18 @@ permissions:
1111

1212
jobs:
1313
test:
14-
runs-on: ubuntu-latest
15-
16-
env:
17-
AWS_DEFAULT_REGION: us-west-2
18-
AWS_ATHENA_S3_STAGING_DIR: s3://laughingman7743-pyathena/github/
19-
AWS_ATHENA_WORKGROUP: pyathena
20-
AWS_ATHENA_SPARK_WORKGROUP: pyathena-spark
21-
AWS_ATHENA_MANAGED_WORKGROUP: pyathena-managed
22-
23-
strategy:
24-
fail-fast: false
25-
matrix:
26-
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
27-
28-
steps:
29-
- name: Checkout
30-
uses: actions/checkout@v4
31-
32-
- uses: astral-sh/setup-uv@v5
33-
with:
34-
python-version: ${{ matrix.python-version }}
35-
enable-cache: true
36-
# TODO: In the case of Python 3.13+, the following error occurs, so install Python using setup-python.
37-
# ../meson.build:44:2: ERROR: Problem encountered: Cannot compile
38-
# `Python.h`. Perhaps you need to install python-dev|python-devel
39-
- uses: actions/setup-python@v5
40-
with:
41-
python-version: ${{ matrix.python-version }}
42-
if: matrix.python-version == '3.13' || matrix.python-version == '3.14'
43-
- run: |
44-
make tool
45-
46-
- name: Configure AWS credentials
47-
uses: aws-actions/configure-aws-credentials@v4
48-
with:
49-
role-to-assume: arn:aws:iam::676287850544:role/github-actions-oidc-pyathena
50-
role-session-name: PyAthenaTestSession
51-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
52-
53-
- name: Test
54-
run: |
55-
make tox
14+
uses: ./.github/workflows/test-suite.yaml
15+
with:
16+
test-type: pyathena
17+
18+
test-sqla:
19+
needs: [test]
20+
uses: ./.github/workflows/test-suite.yaml
21+
with:
22+
test-type: sqla
23+
24+
test-sqla-async:
25+
needs: [test-sqla]
26+
uses: ./.github/workflows/test-suite.yaml
27+
with:
28+
test-type: sqla_async

pyproject.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ exclude = [
178178
legacy_tox_ini = """
179179
[tox]
180180
isolated_build = true
181-
envlist = py{310,311,312,313,314}
181+
envlist = py{310,311,312,313,314}-{pyathena,sqla,sqla_async}
182182
183183
[gh-actions]
184184
python =
@@ -188,16 +188,22 @@ python =
188188
3.13: py313
189189
3.14: py314
190190
191+
[gh-actions:env]
192+
TEST_TYPE =
193+
pyathena: pyathena
194+
sqla: sqla
195+
sqla_async: sqla_async
196+
191197
[testenv]
192198
allowlist_externals =
193199
uv
194200
uvx
195201
make
196202
commands =
197203
uv sync --group dev
198-
make test
199-
make test-sqla
200-
make test-sqla-async
204+
pyathena: make test
205+
sqla: make test-sqla
206+
sqla_async: make test-sqla-async
201207
passenv =
202208
TOXENV
203209
AWS_*

0 commit comments

Comments
 (0)