From fa515d4df6295c4984cb2a594513a8dd79c6ab4a Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Thu, 7 Nov 2024 22:21:47 +0000 Subject: [PATCH 1/3] Clean up tasks --- .vscode/tasks.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index bc4a0691c9..d4fdd8a2fe 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,14 +3,6 @@ "tasks": [ { "label": "Start App", - "type": "dotenv", - "targetTasks": [ - "Start App (Script)" - ], - "file": "${input:dotEnvFilePath}" - }, - { - "label": "Start App (Script)", "type": "shell", "command": "${workspaceFolder}/app/start.sh", "windows": { @@ -24,12 +16,5 @@ }, "problemMatcher": [] } - ], - "inputs": [ - { - "id": "dotEnvFilePath", - "type": "command", - "command": "azure-dev.commands.getDotEnvFilePath" - } ] } From 0e6a9c4d7ec7f69b56d56c71bd52f4c8f3bf0f8f Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Thu, 7 Nov 2024 22:29:49 +0000 Subject: [PATCH 2/3] Update precommit and run on files --- .pre-commit-config.yaml | 6 +++--- app/frontend/src/assets/github.svg | 2 +- app/frontend/src/assets/search.svg | 2 +- app/frontend/src/locales/da/translation.json | 2 +- app/frontend/src/locales/nl/translation.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cca9034f9e..401a97262c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,17 +1,17 @@ exclude: '^tests/snapshots/' repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v5.0.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.14 + rev: v0.7.2 hooks: - id: ruff - repo: https://github.com/psf/black - rev: 24.1.0 + rev: 24.10.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier diff --git a/app/frontend/src/assets/github.svg b/app/frontend/src/assets/github.svg index d5e6491854..c679c236fd 100644 --- a/app/frontend/src/assets/github.svg +++ b/app/frontend/src/assets/github.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/app/frontend/src/assets/search.svg b/app/frontend/src/assets/search.svg index feadc50b25..28b410ea66 100644 --- a/app/frontend/src/assets/search.svg +++ b/app/frontend/src/assets/search.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/app/frontend/src/locales/da/translation.json b/app/frontend/src/locales/da/translation.json index c9580acaa7..da1f083fb6 100644 --- a/app/frontend/src/locales/da/translation.json +++ b/app/frontend/src/locales/da/translation.json @@ -134,4 +134,4 @@ "useOidSecurityFilter": "Filtrér søgeresultater baseret på den godkendte brugers OID.", "useGroupsSecurityFilter": "Filtrér søgeresultater baseret på den godkendte brugers adgangsgrupper." } -} \ No newline at end of file +} diff --git a/app/frontend/src/locales/nl/translation.json b/app/frontend/src/locales/nl/translation.json index 23cc209181..427eb9985f 100644 --- a/app/frontend/src/locales/nl/translation.json +++ b/app/frontend/src/locales/nl/translation.json @@ -81,7 +81,7 @@ "minimumSearchScore": "Minimale zoekscore", "minimumRerankerScore": "Minimale reranker score", "retrieveCount": "Dit aantal zoekresultaten ophalen:", - "includeCategory": "Categorie opnemen", + "includeCategory": "Categorie opnemen", "includeCategoryOptions": { "all": "Alle" }, @@ -151,4 +151,4 @@ "useOidSecurityFilter": "Filtert zoekresultaten op basis van de OID van de geauthenticeerde gebruiker.", "useGroupsSecurityFilter": "Filtert zoekresultaten op basis van de groepen van de geauthenticeerde gebruiker." } -} \ No newline at end of file +} From e739ef854a6571057f8f5dfd60cc2c2dba7fe6a2 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Thu, 7 Nov 2024 22:39:11 +0000 Subject: [PATCH 3/3] Use uv for workflow --- .github/workflows/python-test.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-test.yaml b/.github/workflows/python-test.yaml index 63665e15c7..81df0a3d0d 100644 --- a/.github/workflows/python-test.yaml +++ b/.github/workflows/python-test.yaml @@ -26,6 +26,8 @@ jobs: matrix: os: ["ubuntu-20.04", "windows-latest"] python_version: ["3.9", "3.10", "3.11", "3.12"] + env: + UV_SYSTEM_PYTHON: 1 steps: - uses: actions/checkout@v4 - name: Setup python @@ -33,6 +35,12 @@ jobs: with: python-version: ${{ matrix.python_version }} architecture: x64 + - name: Install uv + uses: astral-sh/setup-uv@v3 + with: + enable-cache: true + version: "0.4.20" + cache-dependency-glob: "requirements**.txt" - name: Setup node uses: actions/setup-node@v4 with: @@ -44,8 +52,7 @@ jobs: npm run build - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install -r requirements-dev.txt + uv pip install -r requirements-dev.txt - name: Lint with ruff run: ruff check . - name: Check types with mypy