Skip to content

Commit 0bf6aa9

Browse files
horghhorgh
authored
Merge pull request #201 from maxmind/greg/eng-1823
Modernize tox config and switch to tox-gh
2 parents 93e4f0a + 0f87d20 commit 0bf6aa9

4 files changed

Lines changed: 90 additions & 85 deletions

File tree

‎.github/workflows/test-libmaxminddb.yml‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,41 @@ jobs:
1313

1414
strategy:
1515
matrix:
16+
env: [3.9, "3.10", 3.11, 3.12, 3.13]
1617
# We don't test on Windows currently due to issues
1718
# build libmaxminddb there.
18-
platform: [macos-latest, ubuntu-latest]
19-
python-version: [3.9, "3.10", 3.11, 3.12, 3.13]
19+
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
2020

21-
name: Python ${{ matrix.python-version }} on ${{ matrix.platform }}
22-
runs-on: ${{ matrix.platform }}
21+
name: Python ${{ matrix.env }} on ${{ matrix.os }}
22+
runs-on: ${{ matrix.os }}
2323
env:
2424
MAXMINDDB_REQUIRE_EXTENSION: 1
2525
MAXMINDDB_USE_SYSTEM_LIBMAXMINDDB: 1
2626
MM_FORCE_EXT_TESTS: 1
2727

2828
steps:
29-
- name: Checkout
30-
uses: actions/checkout@v4
29+
- uses: actions/checkout@v4
3130
with:
3231
submodules: true
3332
persist-credentials: false
3433

35-
- name: Set up Python ${{ matrix.python-version }}
36-
uses: actions/setup-python@v5
37-
with:
38-
python-version: ${{ matrix.python-version }}
34+
- name: Install the latest version of uv
35+
uses: astral-sh/setup-uv@v3
3936

40-
- name: Install dependencies
41-
run: |
42-
python -m pip install --upgrade pip
43-
pip install setuptools tox tox-gh-actions uv wheel
37+
- name: Install tox
38+
run: uv tool install --python-preference only-managed --python 3.13 tox --with tox-uv --with tox-gh
4439

40+
- name: Install Python
41+
if: matrix.env != '3.13'
42+
run: uv python install --python-preference only-managed ${{ matrix.env }}
4543

4644
- name: Install libmaxminddb
4745
run: sudo apt install libmaxminddb-dev
48-
if: matrix.platform == 'ubuntu-latest'
46+
if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm'
4947

5048
- name: Install libmaxminddb
5149
run: brew install libmaxminddb
52-
if: matrix.platform == 'macos-latest'
50+
if: matrix.os == 'macos-latest'
5351

5452
- name: "Work around macos arm64 homebrew directory changes"
5553
if: runner.os == 'macOS' && runner.arch == 'ARM64'
@@ -62,5 +60,12 @@ jobs:
6260
env:
6361
CFLAGS: "${{ env.CFLAGS }} -Werror -Wall -Wextra"
6462

65-
- name: Test with tox (system libmaxminddb)
66-
run: tox
63+
- name: Setup test suite
64+
run: tox run -vv --notest --skip-missing-interpreters false
65+
env:
66+
TOX_GH_MAJOR_MINOR: ${{ matrix.env }}
67+
68+
- name: Run test suite
69+
run: tox run --skip-pkg-install
70+
env:
71+
TOX_GH_MAJOR_MINOR: ${{ matrix.env }}

‎.github/workflows/test.yml‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,33 @@ on:
99
permissions: {}
1010

1111
jobs:
12-
build:
13-
12+
test:
13+
name: test with ${{ matrix.env }} on ${{ matrix.os }}
14+
runs-on: ${{ matrix.os }}
1415
strategy:
16+
fail-fast: false
1517
matrix:
16-
platform: [macos-latest, ubuntu-24.04-arm, ubuntu-latest, windows-latest]
17-
python-version: [3.9, "3.10", 3.11, 3.12, 3.13]
18-
19-
name: Python ${{ matrix.python-version }} on ${{ matrix.platform }}
20-
runs-on: ${{ matrix.platform }}
21-
18+
env: [3.9, "3.10", 3.11, 3.12, 3.13]
19+
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest]
2220
steps:
23-
- name: Checkout
24-
uses: actions/checkout@v4
21+
- uses: actions/checkout@v4
2522
with:
2623
submodules: true
2724
persist-credentials: false
28-
29-
- name: Set up Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@v5
31-
with:
32-
python-version: ${{ matrix.python-version }}
33-
34-
- name: Install dependencies
35-
run: |
36-
python -m pip install --upgrade pip
37-
pip install tox tox-gh-actions
38-
39-
- name: Test with tox (vendored libmaxminddb)
40-
run: tox
25+
- name: Install the latest version of uv
26+
uses: astral-sh/setup-uv@v3
27+
- name: Install tox
28+
run: uv tool install --python-preference only-managed --python 3.13 tox --with tox-uv --with tox-gh
29+
- name: Install Python
30+
if: matrix.env != '3.13'
31+
run: uv python install --python-preference only-managed ${{ matrix.env }}
32+
- name: Setup test suite
33+
run: tox run -vv --notest --skip-missing-interpreters false
34+
env:
35+
TOX_GH_MAJOR_MINOR: ${{ matrix.env }}
36+
- name: Run test suite
37+
run: tox run --skip-pkg-install
4138
env:
4239
MAXMINDDB_REQUIRE_EXTENSION: 1
4340
MM_FORCE_EXT_TESTS: 1
41+
TOX_GH_MAJOR_MINOR: ${{ matrix.env }}

‎pyproject.toml‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ dev = [
3636
]
3737
lint = [
3838
"black>=25.1.0",
39+
"flake8>=7.2.0",
3940
"mypy>=1.15.0",
4041
"pylint>=3.3.6",
4142
"ruff>=0.11.6",
@@ -49,8 +50,12 @@ requires = [
4950
]
5051
build-backend = "setuptools.build_meta"
5152

53+
[tool.setuptools]
54+
include-package-data = true
55+
packages = ["maxminddb"]
56+
5257
[tool.setuptools.package-data]
53-
maxminddb = ["py.typed"]
58+
maxminddb = ["extension.pyi", "py.typed"]
5459

5560
[tool.black]
5661
# src is showing up in our GitHub linting builds. It seems to
@@ -82,3 +87,43 @@ ignore = [
8287

8388
[tool.ruff.lint.per-file-ignores]
8489
"tests/*" = ["ANN201", "D"]
90+
91+
[tool.tox]
92+
env_list = [
93+
"3.9",
94+
"3.10",
95+
"3.11",
96+
"3.12",
97+
"3.13",
98+
"lint",
99+
]
100+
skip_missing_interpreters = false
101+
102+
[tool.tox.env_run_base]
103+
dependency_groups = [
104+
"dev",
105+
]
106+
commands = [
107+
["pytest", "tests"],
108+
]
109+
110+
[tool.tox.env.lint]
111+
description = "Code linting"
112+
python = "3.13"
113+
dependency_groups = [
114+
"dev",
115+
"lint",
116+
]
117+
commands = [
118+
["black", "--check", "--diff", "."],
119+
["flake8", "maxminddb"],
120+
["mypy", "maxminddb", "tests"],
121+
["pylint", "maxminddb"],
122+
]
123+
124+
[tool.tox.gh.python]
125+
"3.13" = ["3.13", "lint"]
126+
"3.12" = ["3.12"]
127+
"3.11" = ["3.11"]
128+
"3.10" = ["3.10"]
129+
"3.9" = ["3.9"]

‎setup.cfg‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,3 @@
22
extend-ignore = E203
33
# black uses 88 : ¯\_(ツ)_/¯
44
max-line-length = 88
5-
6-
[options]
7-
package_dir =
8-
maxminddb = maxminddb
9-
packages = maxminddb
10-
install_requires =
11-
include_package_data = True
12-
python_requires = >=3.9
13-
14-
[options.package_data]
15-
maxminddb = extension.pyi; py.typed
16-
17-
[tox:tox]
18-
envlist = {py39,py310,py311,py312,py313}-test,py313-{black,lint,flake8,mypy}
19-
20-
[gh-actions]
21-
python =
22-
3.9: py39
23-
3.10: py310
24-
3.11: py311
25-
3.12: py312
26-
3.13: py313,black,lint,flake8,mypy
27-
28-
[testenv:{py39,py310,py311,py312,py313}-test]
29-
deps = pytest
30-
commands = pytest tests
31-
passenv = *
32-
33-
[testenv:py313-black]
34-
deps = black
35-
commands = black --check --diff .
36-
37-
[testenv:py313-lint]
38-
deps = pylint
39-
commands = pylint maxminddb
40-
41-
[testenv:py313-flake8]
42-
deps = flake8
43-
commands = flake8 maxminddb
44-
45-
[testenv:py313-mypy]
46-
deps = mypy
47-
commands = mypy maxminddb tests

0 commit comments

Comments
 (0)