Skip to content

Commit 5948b01

Browse files
authored
Merge branch 'goauthentik:main' into sdko/integrations-all/migr-to-wizard
2 parents bdad599 + 3eccef8 commit 5948b01

File tree

153 files changed

+10269
-7309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+10269
-7309
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2025.2.1
2+
current_version = 2025.2.2
33
tag = True
44
commit = True
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<rc_t>[a-zA-Z-]+)(?P<rc_n>[1-9]\\d*))?

.github/actions/setup/action.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,22 @@ inputs:
99
runs:
1010
using: "composite"
1111
steps:
12-
- name: Install poetry & deps
12+
- name: Install apt deps
1313
shell: bash
1414
run: |
15-
pipx install poetry || true
1615
sudo apt-get update
1716
sudo apt-get install --no-install-recommends -y libpq-dev openssl libxmlsec1-dev pkg-config gettext libkrb5-dev krb5-kdc krb5-user krb5-admin-server
18-
- name: Setup python and restore poetry
17+
- name: Install uv
18+
uses: astral-sh/setup-uv@v5
19+
with:
20+
enable-cache: true
21+
- name: Setup python
1922
uses: actions/setup-python@v5
2023
with:
2124
python-version-file: "pyproject.toml"
22-
cache: "poetry"
25+
- name: Install Python deps
26+
shell: bash
27+
run: uv sync --all-extras --dev --frozen
2328
- name: Setup node
2429
uses: actions/setup-node@v4
2530
with:
@@ -39,10 +44,9 @@ runs:
3944
run: |
4045
export PSQL_TAG=${{ inputs.postgresql_version }}
4146
docker compose -f .github/actions/setup/docker-compose.yml up -d
42-
poetry sync
4347
cd web && npm ci
4448
- name: Generate config
45-
shell: poetry run python {0}
49+
shell: uv run python {0}
4650
run: |
4751
from authentik.lib.generators import generate_id
4852
from yaml import safe_dump

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ updates:
9898
prefix: "lifecycle/aws:"
9999
labels:
100100
- dependencies
101-
- package-ecosystem: pip
101+
- package-ecosystem: uv
102102
directory: "/"
103103
schedule:
104104
interval: daily

.github/workflows/ci-aws-cfn.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
npm ci
3434
- name: Check changes have been applied
3535
run: |
36-
poetry run make aws-cfn
36+
uv run make aws-cfn
3737
git diff --exit-code
3838
ci-aws-cfn-mark:
3939
if: always()

.github/workflows/ci-main.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
- name: Setup authentik env
3535
uses: ./.github/actions/setup
3636
- name: run job
37-
run: poetry run make ci-${{ matrix.job }}
37+
run: uv run make ci-${{ matrix.job }}
3838
test-migrations:
3939
runs-on: ubuntu-latest
4040
steps:
4141
- uses: actions/checkout@v4
4242
- name: Setup authentik env
4343
uses: ./.github/actions/setup
4444
- name: run migrations
45-
run: poetry run python -m lifecycle.migrate
45+
run: uv run python -m lifecycle.migrate
4646
test-make-seed:
4747
runs-on: ubuntu-latest
4848
steps:
@@ -69,19 +69,21 @@ jobs:
6969
fetch-depth: 0
7070
- name: checkout stable
7171
run: |
72-
# Delete all poetry envs
73-
rm -rf /home/runner/.cache/pypoetry
7472
# Copy current, latest config to local
73+
# Temporarly comment the .github backup while migrating to uv
7574
cp authentik/lib/default.yml local.env.yml
76-
cp -R .github ..
75+
# cp -R .github ..
7776
cp -R scripts ..
7877
git checkout $(git tag --sort=version:refname | grep '^version/' | grep -vE -- '-rc[0-9]+$' | tail -n1)
79-
rm -rf .github/ scripts/
80-
mv ../.github ../scripts .
78+
# rm -rf .github/ scripts/
79+
# mv ../.github ../scripts .
80+
rm -rf scripts/
81+
mv ../scripts .
8182
- name: Setup authentik env (stable)
8283
uses: ./.github/actions/setup
8384
with:
8485
postgresql_version: ${{ matrix.psql }}
86+
continue-on-error: true
8587
- name: run migrations to stable
8688
run: poetry run python -m lifecycle.migrate
8789
- name: checkout current code
@@ -91,15 +93,13 @@ jobs:
9193
git reset --hard HEAD
9294
git clean -d -fx .
9395
git checkout $GITHUB_SHA
94-
# Delete previous poetry env
95-
rm -rf /home/runner/.cache/pypoetry/virtualenvs/*
9696
- name: Setup authentik env (ensure latest deps are installed)
9797
uses: ./.github/actions/setup
9898
with:
9999
postgresql_version: ${{ matrix.psql }}
100100
- name: migrate to latest
101101
run: |
102-
poetry run python -m lifecycle.migrate
102+
uv run python -m lifecycle.migrate
103103
- name: run tests
104104
env:
105105
# Test in the main database that we just migrated from the previous stable version
@@ -108,7 +108,7 @@ jobs:
108108
CI_RUN_ID: ${{ matrix.run_id }}
109109
CI_TOTAL_RUNS: "5"
110110
run: |
111-
poetry run make ci-test
111+
uv run make ci-test
112112
test-unittest:
113113
name: test-unittest - PostgreSQL ${{ matrix.psql }} - Run ${{ matrix.run_id }}/5
114114
runs-on: ubuntu-latest
@@ -133,7 +133,7 @@ jobs:
133133
CI_RUN_ID: ${{ matrix.run_id }}
134134
CI_TOTAL_RUNS: "5"
135135
run: |
136-
poetry run make ci-test
136+
uv run make ci-test
137137
- if: ${{ always() }}
138138
uses: codecov/codecov-action@v5
139139
with:
@@ -156,8 +156,8 @@ jobs:
156156
uses: helm/[email protected]
157157
- name: run integration
158158
run: |
159-
poetry run coverage run manage.py test tests/integration
160-
poetry run coverage xml
159+
uv run coverage run manage.py test tests/integration
160+
uv run coverage xml
161161
- if: ${{ always() }}
162162
uses: codecov/codecov-action@v5
163163
with:
@@ -214,8 +214,8 @@ jobs:
214214
npm run build
215215
- name: run e2e
216216
run: |
217-
poetry run coverage run manage.py test ${{ matrix.job.glob }}
218-
poetry run coverage xml
217+
uv run coverage run manage.py test ${{ matrix.job.glob }}
218+
uv run coverage xml
219219
- if: ${{ always() }}
220220
uses: codecov/codecov-action@v5
221221
with:

.github/workflows/gen-update-webauthn-mds.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: authentik-gen-update-webauthn-mds
22
on:
33
workflow_dispatch:
44
schedule:
5-
- cron: '30 1 1,15 * *'
5+
- cron: "30 1 1,15 * *"
66

77
env:
88
POSTGRES_DB: authentik
@@ -24,7 +24,7 @@ jobs:
2424
token: ${{ steps.generate_token.outputs.token }}
2525
- name: Setup authentik env
2626
uses: ./.github/actions/setup
27-
- run: poetry run ak update_webauthn_mds
27+
- run: uv run ak update_webauthn_mds
2828
- uses: peter-evans/create-pull-request@v7
2929
id: cpr
3030
with:

.github/workflows/publish-source-docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
uses: ./.github/actions/setup
2222
- name: generate docs
2323
run: |
24-
poetry run make migrate
25-
poetry run ak build_source_docs
24+
uv run make migrate
25+
uv run ak build_source_docs
2626
- name: Publish
2727
uses: netlify/actions/cli@master
2828
with:

.github/workflows/translation-extract-compile.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
run: make gen-client-ts
3737
- name: run extract
3838
run: |
39-
poetry run make i18n-extract
39+
uv run make i18n-extract
4040
- name: run compile
4141
run: |
42-
poetry run ak compilemessages
42+
uv run ak compilemessages
4343
make web-check-compile
4444
- name: Create Pull Request
4545
if: ${{ github.event_name != 'pull_request' }}

.vscode/tasks.json

+35-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,26 @@
33
"tasks": [
44
{
55
"label": "authentik/core: make",
6-
"command": "poetry",
7-
"args": ["run", "make", "lint-fix", "lint"],
6+
"command": "uv",
7+
"args": [
8+
"run",
9+
"make",
10+
"lint-fix",
11+
"lint"
12+
],
813
"presentation": {
914
"panel": "new"
1015
},
1116
"group": "test"
1217
},
1318
{
1419
"label": "authentik/core: run",
15-
"command": "poetry",
16-
"args": ["run", "ak", "server"],
20+
"command": "uv",
21+
"args": [
22+
"run",
23+
"ak",
24+
"server"
25+
],
1726
"group": "build",
1827
"presentation": {
1928
"panel": "dedicated",
@@ -23,13 +32,17 @@
2332
{
2433
"label": "authentik/web: make",
2534
"command": "make",
26-
"args": ["web"],
35+
"args": [
36+
"web"
37+
],
2738
"group": "build"
2839
},
2940
{
3041
"label": "authentik/web: watch",
3142
"command": "make",
32-
"args": ["web-watch"],
43+
"args": [
44+
"web-watch"
45+
],
3346
"group": "build",
3447
"presentation": {
3548
"panel": "dedicated",
@@ -39,19 +52,26 @@
3952
{
4053
"label": "authentik: install",
4154
"command": "make",
42-
"args": ["install", "-j4"],
55+
"args": [
56+
"install",
57+
"-j4"
58+
],
4359
"group": "build"
4460
},
4561
{
4662
"label": "authentik/website: make",
4763
"command": "make",
48-
"args": ["website"],
64+
"args": [
65+
"website"
66+
],
4967
"group": "build"
5068
},
5169
{
5270
"label": "authentik/website: watch",
5371
"command": "make",
54-
"args": ["website-watch"],
72+
"args": [
73+
"website-watch"
74+
],
5575
"group": "build",
5676
"presentation": {
5777
"panel": "dedicated",
@@ -60,8 +80,12 @@
6080
},
6181
{
6282
"label": "authentik/api: generate",
63-
"command": "poetry",
64-
"args": ["run", "make", "gen"],
83+
"command": "uv",
84+
"args": [
85+
"run",
86+
"make",
87+
"gen"
88+
],
6589
"group": "build"
6690
}
6791
]

CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ schemas/ @goauthentik/backend
1010
scripts/ @goauthentik/backend
1111
tests/ @goauthentik/backend
1212
pyproject.toml @goauthentik/backend
13-
poetry.lock @goauthentik/backend
13+
uv.lock @goauthentik/backend
1414
go.mod @goauthentik/backend
1515
go.sum @goauthentik/backend
1616
# Infrastructure

0 commit comments

Comments
 (0)