Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit d1e1e70

Browse files
committed
Change kuksa-client version handling
Does the following: - For Docker copy whole repo so we get the expected version from tag (previously always 0.1.6) - Using 0.1.6 as default version does not make sense, 0.0.0 works better to show that version lookup failed - Tag pattern seems to be difficult to get correct, it always complain and seems to have no effect - Aligning grpcio-tools version with what is defined in setup.cfg The reason is that all docker build on master previously got v0.1.6 except possible if that specific version was tagged, which gives odd behavior if downloading kuksa-client:master
1 parent be11622 commit d1e1e70

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

kuksa-client/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010

1111
FROM python:3.10-alpine as build
1212
RUN apk update && apk add git alpine-sdk linux-headers
13-
COPY kuksa-client /kuksa.val/kuksa-client/
14-
COPY kuksa_certificates /kuksa.val/kuksa_certificates/
15-
COPY proto/kuksa/val/v1/*.proto /kuksa.val/kuksa-client/kuksa/val/v1/
16-
WORKDIR /kuksa.val/kuksa-client
1713
RUN pip install --upgrade pip build
14+
# We must copy the whole repository otherwise version lookup by tag would not work
15+
COPY . /kuksa.val/
16+
WORKDIR /kuksa.val/kuksa-client
1817
RUN rm -rf dist
1918
RUN python3 -m build
2019
RUN mkdir /kuksa-client

kuksa-client/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[build-system]
22
requires = [
3-
"grpcio-tools>=1.46.0",
3+
"grpcio-tools>=1.54.2",
44
"setuptools>=42",
55
"setuptools-git-versioning",
66
"wheel",
77
]
88
build-backend = "setuptools.build_meta"
99

1010
[tool.setuptools-git-versioning]
11-
starting_version = "0.1.6"
12-
tag_filter = "[0-9]+.[0-9]+.[0-9]+"
11+
# Starting version is just a dummy value that never shall be used in CI
12+
starting_version = "0.0.0"
1313

1414
[tool.pylint.design]
1515
max-args = 8

0 commit comments

Comments
 (0)