Skip to content

Commit a8f49b7

Browse files
Attempt to fix ci
1 parent 7de03b0 commit a8f49b7

File tree

6 files changed

+15
-34
lines changed

6 files changed

+15
-34
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12.12", "3.13"]
1919
resolution: ["highest", "lowest-direct"]
2020
env:
2121
# Shared env variables for all the tests
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install Go
2929
uses: actions/setup-go@v6
3030
with:
31-
go-version: stable
31+
go-version: "1.25.x"
3232
cache: false
3333
- uses: astral-sh/setup-uv@v7
3434
with:

.github/workflows/protovalidate-gencode-pypi-sync.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,27 @@ on:
55

66
permissions:
77
contents: read
8-
id-token: write
98

109
jobs:
1110
push-pypi:
1211
name: Push latest bufbuild-protovalidate-protocolbuffers to PyPI
1312
runs-on: ubuntu-latest
13+
permissions:
14+
id-token: write
1415
steps:
1516
- name: Checkout code
1617
uses: actions/checkout@v5
1718
with:
1819
fetch-depth: 1
20+
- name: Install Go
21+
uses: actions/setup-go@v6
22+
with:
23+
go-version: stable
1924
- uses: astral-sh/setup-uv@v6
2025
with:
21-
python-version: 3.9
26+
python-version: 3.10
2227
- name: Install dependencies
23-
run: cd bufbuild-protovalidate-protocolbuffers && uv sync --frozen
28+
run: cd bufbuild-protovalidate-protocolbuffers && uv sync --frozen && make build && rm -rf dist
2429
- name: Build and publish
2530
run: cd bufbuild-protovalidate-protocolbuffers && uv run sync_to_pypi.py --pypi-url https://test.pypi.org
2631
- name: Publish package distributions to TestPyPI
@@ -30,3 +35,4 @@ jobs:
3035
uses: pypa/gh-action-pypi-publish@release/v1
3136
with:
3237
repository-url: https://test.pypi.org/legacy/
38+
packages-dir: bufbuild-protovalidate-protocolbuffers/dist

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ test: generate install $(TESTDATA_FILE) ## Run unit tests
6666

6767
.PHONY: conformance
6868
conformance: $(BIN)/protovalidate-conformance generate install ## Run conformance tests
69+
uv run pip freeze
6970
$(BIN)/protovalidate-conformance $(CONFORMANCE_ARGS) uv run test/conformance/runner.py
7071

7172
.PHONY: lint
@@ -78,7 +79,7 @@ lint: install $(BIN)/buf ## Lint code
7879

7980
.PHONY: install
8081
install: ## Install dependencies
81-
uv sync --dev
82+
uv sync --dev --python 3.12
8283

8384
.PHONY: checkgenerate
8485
checkgenerate: generate

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ ban-relative-imports = "all"
118118
testpaths = ["test"]
119119

120120
[tool.mypy]
121-
mypy_path = "gen"
121+
mypy_path = "test/gen"
122122

123123
[tool.ty.environment]
124-
extra-paths = ["gen"]
124+
extra-paths = ["test/gen"]

test/__init__.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

test/conformance/__init__.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)