Skip to content

Commit a3a0d2c

Browse files
committed
Merge branch 'beta' into feat/better-api-erasure
2 parents 74c77da + 9ee9775 commit a3a0d2c

9 files changed

Lines changed: 100 additions & 129 deletions

File tree

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ updates:
4242
prefix: "chore(deps):"
4343
open-pull-requests-limit: 10
4444
groups:
45-
actions-version-updates:
45+
docker-version-updates:
4646
patterns:
4747
- "*"
4848
applies-to: "version-updates"
49-
actions-security-updates:
49+
docker-security-updates:
5050
patterns:
5151
- "*"
5252
applies-to: "security-updates"

.github/workflows/depcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Dependency Review
22

33
on:
4-
pull_request:
4+
push:
55

66
permissions:
77
contents: read

.github/workflows/pipeline.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Pipeline
22

33
on:
44
push:
5-
branches:
6-
- main
7-
pull_request:
85

96
permissions:
107
contents: write
@@ -72,7 +69,7 @@ jobs:
7269
name: Check Build Status
7370
runs-on: ubuntu-latest
7471
needs:
75-
#- lint-commits
72+
- lint-commits
7673
- code-style
7774
- compat-check
7875
- type-check

.releaserc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[
1919
"@semantic-release/exec",
2020
{
21-
"prepareCmd": "sed -i 's/[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+/${nextRelease.version}/' zitadel_client/version.py"
21+
"prepareCmd": "sed -i 's/[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+[-a-zA-Z0-9\\.]*/${nextRelease.version}/' zitadel_client/version.py"
2222
}
2323
],
2424
[

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-slim@sha256:31a416db24bd8ade7dac5fd5999ba6c234d7fa79d4add8781e95f41b187f4c9a
1+
FROM python:3.13-slim@sha256:6544e0e002b40ae0f59bc3618b07c1e48064c4faed3a15ae2fbd2e8f663e8283
22

33
WORKDIR /app
44

poetry.lock

Lines changed: 86 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ documentation = "https://github.com/zitadel/client-python"
2929

3030
[tool.poetry]
3131
include = ["zitadel_client/py.typed"]
32-
version = "4.1.0b1"
32+
version = "4.1.0b2"
3333

3434
[tool.poetry.group.dev.dependencies]
3535
pytest = ">= 7.2.1"
@@ -38,11 +38,10 @@ tox = ">= 3.9.0"
3838
types-python-dateutil = ">= 2.8.19.14"
3939
mypy = ">= 1.5"
4040
testcontainers = "3.7.1"
41-
python-dotenv = "1.0.1"
42-
ruff = "^0.11.8"
41+
python-dotenv = "1.1.1"
42+
ruff = "^0.12.4"
4343
sphinx-rtd-theme = "^3.0.2"
44-
sphinx = "7.1.2"
45-
setuptools = "^80.9.0"
44+
sphinx = "7.4.7"
4645

4746
[build-system]
4847
requires = ["poetry-core>=1.0.0"]

test/test_configuration.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ def test_user_agent(self) -> None:
2020
authenticator = NoAuthAuthenticator(self.oauth_host, "test-token")
2121
config = Configuration(authenticator)
2222

23-
self.assertTrue(
24-
config.user_agent.startswith("zitadel-client/")
25-
and "lang=python" in config.user_agent
26-
and "os=" in config.user_agent
27-
and "arch=" in config.user_agent
23+
self.assertRegex(
24+
config.user_agent,
25+
r"^zitadel-client/\d+\.\d+\.\d+(-[a-zA-Z0-9]+(\.\d+)?)? \(lang=python; lang_version=[^;]+; os=[^;]+; arch=[^;]+\)$",
2826
)
2927

3028
"""

zitadel_client/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ class Version:
22
def __init__(self) -> None:
33
pass
44

5-
VERSION = "4.1.0-beta.1"
5+
VERSION = "4.1.0-beta.2"

0 commit comments

Comments
 (0)