Skip to content

Commit b612468

Browse files
authored
Fix GitHub Actions (#570)
* initial github actions fixes * testing stuff * fix matrix.python-version conditional * test removing UV_SYSTEM_PYTHON * test on ubuntu, windows, and macos * upgrade aiohttp to use a version that supports 3.14 * actually run job on the os * Remove dependency on outdated docformatter package * remove os matrix and commented lines * update branch from master to main
1 parent 3977311 commit b612468

File tree

4 files changed

+82
-179
lines changed

4 files changed

+82
-179
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,24 @@ on:
44
push:
55
branches:
66
- develop
7+
- main
78

89
pull_request:
910
branches:
1011
- develop
1112

12-
env:
13-
UV_SYSTEM_PYTHON: true
14-
1513
jobs:
1614
ci:
1715
runs-on: ubuntu-latest
1816
strategy:
1917
fail-fast: false
2018
matrix:
21-
python-version: ["3.12", "3.13", "3.14-dev"]
19+
python-version: ["3.12", "3.13", "3.14"]
2220

2321
steps:
2422
- name: Checkout Repository
2523
uses: actions/checkout@v5
2624

27-
- name: Set up Python ${{ matrix.python-version }}
28-
uses: actions/setup-python@v6
29-
3025
- name: Set up JDK 17
3126
uses: actions/setup-java@v5
3227
with:
@@ -36,18 +31,19 @@ jobs:
3631
- name: Setup Gradle
3732
uses: gradle/actions/setup-gradle@v5
3833

39-
- name: Install uv
34+
- name: Install uv and set the Python version
4035
uses: astral-sh/setup-uv@v7
4136
with:
37+
python-version: ${{ matrix.python-version }}
4238
activate-environment: true
39+
enable-cache: true
4340

4441
- name: Setup workspace
4542
run: |
46-
export UV_PROJECT_ENVIRONMENT="${pythonLocation}"
47-
echo "UV_PROJECT_ENVIRONMENT=$UV_PROJECT_ENVIRONMENT" >> "$GITHUB_ENV"
4843
make install
4944
5045
- name: Check python packages
46+
if: ${{ matrix.python-version == '3.12' }}
5147
run: |
5248
make check-py
5349

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ lint-py: ## Runs linters and formatters on the python packages.
2727

2828

2929
check-py: ## Runs checks (formatting, lints, type-checking) on the python packages.
30-
uv run docformatter packages
3130
uv run ruff check packages --config pyproject.toml
3231
uv run ruff format --check --config pyproject.toml
3332
uv run pyright packages

pyproject.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ test = [
1414
"freezegun>=1.5.1",
1515
]
1616
lint = [
17-
"black>=25.1.0",
1817
"ruff>=0.9.7",
19-
"docformatter>=1.7.5",
2018
]
2119
typing = [
2220
"pyright>=1.1.400",
@@ -50,10 +48,6 @@ asyncio_mode = "auto" # makes pytest run async tests without having to be marked
5048
addopts = [ "--import-mode=importlib", "--cov", "--cov-report=term-missing" ]
5149
consider_namespace_packages = true
5250

53-
[tool.docformatter]
54-
recursive = true
55-
black = true
56-
5751
[tool.ruff]
5852
target-version = "py312"
5953

0 commit comments

Comments
 (0)