Skip to content

Commit fa40f34

Browse files
committed
chg: address PR feedback, update ci matrix, add pypi upload job to release
* expand tox platform list to match github ci matrix Signed-off-by: Stephen L Arnold <[email protected]>
1 parent 03f409b commit fa40f34

File tree

4 files changed

+35
-58
lines changed

4 files changed

+35
-58
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-22.04, macos-latest, windows-latest]
26-
python-version: [3.9, '3.10', '3.11', '3.12']
25+
os: [macos-15, macos-latest, ubuntu-latest, ubuntu-22.04, ubuntu-24.04-arm, windows-latest, windows-2025]
26+
python-version: [3.9, '3.10', '3.11', '3.12', '3.13']
2727

2828
steps:
2929
- name: Checkout

.github/workflows/release.yml

+25-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ubuntu-latest, macos-latest, windows-latest]
22-
python-version: [3.9, '3.10', '3.11', '3.12']
22+
python-version: [3.9, '3.10', '3.11', '3.12', '3.13']
2323

2424
steps:
2525
- name: Set git crlf/eol
@@ -44,11 +44,11 @@ jobs:
4444
- name: Install dependencies
4545
run: |
4646
python -m pip install --upgrade pip wheel
47-
pip install tox tox-gh-actions
47+
pip install tox
4848
4949
- name: Build dist pkgs
5050
run: |
51-
tox -e build
51+
tox -e build,check
5252
5353
- name: Upload artifacts
5454
if: matrix.python-version == 3.9 && runner.os == 'Linux'
@@ -77,7 +77,7 @@ jobs:
7777
- uses: actions/download-artifact@v4
7878

7979
- name: Generate changes file
80-
uses: sarnold/gitchangelog-action@master
80+
uses: sarnold/gitchangelog-action@915234f151ceffb7a8c4f76de77e4ae321087b8f # 1.1.1
8181
with:
8282
github_token: ${{ secrets.GITHUB_TOKEN}}
8383

@@ -94,3 +94,24 @@ jobs:
9494
prerelease: false
9595
files: |
9696
packages/cpplint*
97+
98+
# When a GitHub release is made, upload the artifacts to PyPI
99+
upload:
100+
name: Upload to PyPI
101+
runs-on: ubuntu-22.04
102+
needs: [wheels]
103+
104+
steps:
105+
- uses: actions/setup-python@v5
106+
107+
- uses: actions/download-artifact@v4
108+
109+
- name: check artifacts
110+
run: find packages/ -maxdepth 2 -name cpplint-\* -type f
111+
112+
# - name: Publish bdist and sdist packages
113+
# uses: pypa/gh-action-pypi-publish@release/v1
114+
# with:
115+
# password: ${{ secrets.PYPI_API_TOKEN }}
116+
# packages_dir: packages/
117+
# print_hash: true

setup.py

-47
This file was deleted.

tox.ini

+8-5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ python =
1616
PLATFORM =
1717
ubuntu-latest: linux
1818
ubuntu-22.04: linux
19+
ubuntu-24.04-arm: linux
1920
macos-latest: macos
21+
macos-15: macos
2022
windows-latest: windows
23+
windows-2025: windows
2124

2225
[testenv]
2326
skip_install = true
@@ -41,12 +44,12 @@ allowlist_externals =
4144
bash
4245

4346
deps =
44-
-e .[test,dev]
47+
-e .[test]
4548

4649
commands =
47-
python -m pytest {posargs:}
48-
python -m pylint cpplint.py
49-
python -m flake8 cpplint.py
50+
python -m pytest {posargs:}
51+
python -m pylint cpplint.py
52+
python -m flake8 cpplint.py
5053

5154
[testenv:build]
5255
skip_install = true
@@ -83,7 +86,7 @@ changedir =
8386
dist/
8487

8588
commands =
86-
python -m pip install cpplint --force-reinstall --pre --prefer-binary -f ./
89+
python -m pip install cpplint --force --pre --prefer-binary -f ./
8790

8891
[testenv:clean]
8992
skip_install = true

0 commit comments

Comments
 (0)