Skip to content

Commit 68d498c

Browse files
skykaninmallport
andauthored
Update dapla-auth-client version (#460)
* add backstage docs * update dapla-auth-client version and prep release * remove 3.10 tests, add 3.13 tests * more fixup * more fixup * even more fixup * uppdate datadoc metadata handling when returning raw metadata from pseudo-service and user hasn't specified '.with_metadata()' then we return a list of variables instead of wrapping it in a metadata container * update dapla-toolbelt-metadata version * fixup mypy issues * make integration tests use poetry * fix mypy * Bump versio --------- Co-authored-by: Michael Moen Allport <mmallport@gmail.com>
1 parent 85a342f commit 68d498c

25 files changed

+358
-486
lines changed

.github/workflows/pseudo-service-integration-test.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- { python: "3.10"}
2524
- { python: "3.11"}
2625
- { python: "3.12"}
26+
- { python: "3.13"}
2727
steps:
2828
- name: Checkout Repository
2929
uses: actions/checkout@v4
@@ -52,13 +52,20 @@ jobs:
5252
uses: actions/setup-python@v5
5353
with:
5454
python-version: ${{ matrix.python }}
55-
- name : Install requirements
55+
56+
- name: Install Poetry
57+
run: |
58+
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
59+
pipx inject poetry poetry-plugin-export
60+
poetry --version
61+
62+
- name: Install Nox
5663
run: |
57-
pip install .
58-
pip install pytest
59-
pip install pytest_cases
60-
pip install pytest_mock
64+
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" nox
65+
pipx inject --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" nox nox-poetry
66+
nox --version
67+
6168
- name: Integration test
6269
env:
6370
PSEUDO_SERVICE_AUTH_TOKEN: ${{ steps.get-id-token.outputs.PSEUDO_SERVICE_AUTH_TOKEN }}
64-
run: pytest tests/v1/integration
71+
run: nox --python=${{ matrix.python }} --session tests -- tests/v1/integration

.github/workflows/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
include:
21-
- { python: "3.10", os: "ubuntu-latest", session: "pre-commit" }
22-
- { python: "3.10", os: "ubuntu-latest", session: "mypy" }
21+
- { python: "3.13", os: "ubuntu-latest", session: "pre-commit" }
22+
- { python: "3.13", os: "ubuntu-latest", session: "mypy" }
2323
- { python: "3.11", os: "ubuntu-latest", session: "mypy" }
2424
- { python: "3.12", os: "ubuntu-latest", session: "mypy" }
25-
- { python: "3.10", os: "ubuntu-latest", session: "tests" }
25+
- { python: "3.13", os: "ubuntu-latest", session: "tests" }
2626
- { python: "3.11", os: "ubuntu-latest", session: "tests" }
2727
- { python: "3.12", os: "ubuntu-latest", session: "tests" }
2828
- { python: "3.12", os: "windows-latest", session: "tests" }
2929
- { python: "3.12", os: "macos-latest", session: "tests" }
30-
- { python: "3.10", os: "ubuntu-latest", session: "typeguard" }
31-
- { python: "3.10", os: "ubuntu-latest", session: "xdoctest" }
32-
- { python: "3.10", os: "ubuntu-latest", session: "docs-build" }
30+
- { python: "3.13", os: "ubuntu-latest", session: "typeguard" }
31+
- { python: "3.13", os: "ubuntu-latest", session: "xdoctest" }
32+
- { python: "3.13", os: "ubuntu-latest", session: "docs-build" }
3333

3434
env:
3535
NOXSESSION: ${{ matrix.session }}
@@ -127,7 +127,7 @@ jobs:
127127
- name: Set up Python
128128
uses: actions/setup-python@v5.3.0
129129
with:
130-
python-version: "3.10"
130+
python-version: "3.13"
131131
- name: Upgrade pip
132132
run: |
133133
pip install -c ${{ github.workspace }}/.github/workflows/constraints.txt pip

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ dp.write_pandas(df, "gs://bucket/test.parquet", file_format="parquet") # The met
378378

379379
## Requirements
380380

381-
- Python >= 3.10
381+
- Python >= 3.11
382382
- Dependencies can be found in `pyproject.toml`
383383

384384
## Installation

backstage.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: backstage.io/v1alpha1
2+
kind: Component
3+
metadata:
4+
name: dapla-toolbelt-pseudo
5+
title: Dapla Toolbelt Pseudo
6+
description: |
7+
A python client for doing pseudonymisation operations on data
8+
tags:
9+
- python
10+
- encryption
11+
annotations:
12+
github.com/project-slug: statisticsnorway/dapla-toolbelt-pseudo
13+
spec:
14+
type: library
15+
owner: dapla-stat-developers
16+
lifecycle: production
17+
dependsOn:
18+
- component: dapla-toolbelt-metadata

noxfile.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
raise SystemExit(dedent(message)) from None
2424

2525
package = "dapla_pseudo"
26-
python_versions = ["3.10", "3.11", "3.12"]
26+
python_versions = ["3.11", "3.12", "3.13"]
2727
nox.needs_version = ">= 2021.6.6"
2828
nox.options.sessions = (
2929
"pre-commit",
@@ -118,7 +118,7 @@ def insert_header_in_hook(header: dict[str, str], lines: list[str]) -> str:
118118
return "\n".join(lines)
119119

120120

121-
@session(name="pre-commit", python=python_versions[0])
121+
@session(name="pre-commit", python=python_versions[2])
122122
def precommit(session: Session) -> None:
123123
"""Lint using pre-commit."""
124124
args = session.posargs or [
@@ -178,7 +178,7 @@ def tests(session: Session) -> None:
178178
session.notify("coverage", posargs=[])
179179

180180

181-
@session(python=python_versions[0])
181+
@session(python=python_versions[2])
182182
def coverage(session: Session) -> None:
183183
"""Produce the coverage report."""
184184
args = session.posargs or ["report", "--skip-empty"]
@@ -191,7 +191,7 @@ def coverage(session: Session) -> None:
191191
session.run("coverage", *args)
192192

193193

194-
@session(python=python_versions[0])
194+
@session(python=python_versions[2])
195195
def typeguard(session: Session) -> None:
196196
"""Runtime type checking using Typeguard."""
197197
session.install(".")
@@ -223,7 +223,7 @@ def xdoctest(session: Session) -> None:
223223
session.run("python", "-m", "xdoctest", *args)
224224

225225

226-
@session(name="docs-build", python=python_versions[0])
226+
@session(name="docs-build", python=python_versions[2])
227227
def docs_build(session: Session) -> None:
228228
"""Build the documentation."""
229229
args = session.posargs or ["docs", "docs/_build"]

0 commit comments

Comments
 (0)