DEV - Clean and update dependencies

.github/workflows/build_docker_image.yaml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Retrieve secret from Vault 🗝"
-        uses: hashicorp/vault-action@v2
+        uses: hashicorp/vault-action@v3
         with:
           method: jwt
           url: "https://quansight-vault-public-vault-b2379fa7.d415e30e.z1.hashicorp.cloud:8200"

.github/workflows/release.yaml

@@ -39,13 +39,13 @@ jobs:
       - run: echo "Running on ${{ matrix.directory }}"
 
       - name: "Check package build - ${{ matrix.directory }} 📦"
-        uses: hynek/build-and-inspect-python-package@v1
+        uses: hynek/build-and-inspect-python-package@v2
         with:
           path: ${{ matrix.directory }}
 
       # Adding a separate upload for publishing
       - name: "Upload build artefacts 📤"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.directory }}-package
           path: |
@@ -69,7 +69,7 @@ jobs:
 
     steps:
       - name: "Download build artefacts 📥"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.directory }}-package
           path: dist
@@ -101,7 +101,7 @@ jobs:
 
     steps:
       - name: "Download build artefacts 📥"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.directory }}-package
           path: dist

.github/workflows/tests.yaml

@@ -20,13 +20,6 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu", "macos", "windows"]
-        include:
-          - os: ubuntu
-            environment-file: conda-store-server/environment-dev.yaml
-          - os: macos
-            environment-file: conda-store-server/environment-macos-dev.yaml
-          - os: windows
-            environment-file: conda-store-server/environment-windows-dev.yaml
     runs-on: ${{ matrix.os }}-latest
     defaults:
       run:
@@ -37,9 +30,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Set up env ${{ matrix.os }} 🐍"
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
-            environment-file: ${{ matrix.environment-file }}
+            environment-file: conda-store-server/environment-dev.yaml
             miniforge-version: latest
 
       # This fixes a "DLL not found" issue importing ctypes from the hatch env
@@ -54,12 +47,16 @@ jobs:
 
       - name: "Linting Checks 🧹"
         run: |
-          hatch env run -e dev lint
+          hatch env run -e lint lint
 
       - name: "Build package 📦"
         run: |
           hatch build
 
+      - name: "Installed built conda-store-server 📦"
+        run: |
+          pip install dist/*.whl
+
       - name: "Unit tests ✅"
         run: |
           pytest -m "not extended_prefix and not user_journey" tests
@@ -89,7 +86,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Set up env 🐍"
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           environment-file: conda-store-server/environment-dev.yaml
           miniforge-version: latest
@@ -114,11 +111,11 @@ jobs:
           pytest --video on ../tests/test_playwright.py
 
       - name: "Upload test results 📤"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: playwright-tests
-          path: conda-store-server/test-results
+          path: conda-store-server/test-results/
 
       - name: "Run integration tests ✅"
         run: |
@@ -142,13 +139,13 @@ jobs:
         working-directory: conda-store
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
       - name: "Checkout Repository 🛎"
         uses: actions/checkout@v4
 
       - name: "Set up Python 🐍"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -174,9 +171,9 @@ jobs:
           wait-for-it localhost:9000 # minio
           wait-for-it localhost:8080 # conda-store-server
 
-      - name: "Install conda-store for tests 📦"
+      - name: "Install built conda-store for tests 📦"
         run: |
-          pip install .
+          pip install dist/*.whl
 
       - name: "Run basic tests -  not authenticated"
         run: |
@@ -212,17 +209,17 @@ jobs:
       - name: "Checkout Repository"
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
+      - name: "Set up Docker Buildx"
         uses: docker/setup-buildx-action@v3
 
-      - name: Lint Dockerfiles
+      - name: "Lint Dockerfiles"
         uses: jbergstroem/hadolint-gh-action@v1
         with:
           dockerfile: ${{ matrix.docker-image }}/Dockerfile
           output_format: tty
           error_level: 0
 
-      - name: Docker Meta
+      - name: "Docker Meta"
         id: meta
         uses: docker/metadata-action@v5
         with:
@@ -231,7 +228,7 @@ jobs:
           tags: |
             type=sha
 
-      - name: Build docker
+      - name: "Build docker"
         uses: docker/build-push-action@v5
         with:
           context: "${{ matrix.docker-image }}"

.pre-commit-config.yaml

@@ -8,23 +8,28 @@
 # - Register git hooks: pre-commit install --install-hooks
 # - Run on all files:   pre-commit run --all-files
 
+ci:
+  autoupdate_schedule: monthly
+  autofix_commit_msg: |
+    [pre-commit.ci] Apply automatic pre-commit fixes
+
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 24.3.0
     hooks:
       - id: black
         exclude: "examples|tests/assets"
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.0.289"
+    rev: "v0.3.3"
     hooks:
       - id: ruff
         exclude: "examples|tests/assets"
         args: ["--fix"]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         name: isort
@@ -34,7 +39,7 @@ repos:
         exclude: "conda-store-server/conda_store_server/action/__init__.py"
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         files: ".*\\.py"
@@ -44,7 +49,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         exclude: ^(examples/|templates/|)

conda-store-server/conda_store_server/alembic/versions/03c839888c82_add_canceled_status.py

@@ -5,6 +5,7 @@
 Create Date: 2024-01-29 03:56:36.889909
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/0f7e23ff24ee_add_worker.py

@@ -5,6 +5,7 @@
 Create Date: 2023-12-13 21:01:45.546591
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/16f65805dc8f_split_conda_package_into_conda_package_.py

@@ -5,6 +5,7 @@
 Create Date: 2022-08-24 12:01:48.461989
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/30b37e725c32_add_build_key_version.py

@@ -5,6 +5,7 @@
 Create Date: 2023-11-17 14:34:40.688865
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/48be4072fe58_initial_schema.py

@@ -5,6 +5,7 @@
 Create Date: 2022-06-01 18:37:12.396138
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/57cd11b949d5_add_installer.py

@@ -5,6 +5,7 @@
 Create Date: 2024-01-28 14:31:35.723505
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/5ad723de2abd_adding_container_registry_value_to_enum.py

@@ -5,6 +5,7 @@
 Create Date: 2022-08-05 22:14:34.110642
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/771180018e1b_add_v2_role_mappings.py

@@ -5,6 +5,7 @@
 Create Date: 2023-11-29 09:02:35.835664
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/8d63a091aff8_add_environment_description.py

@@ -5,6 +5,7 @@
 Create Date: 2022-07-15 14:22:00.351131
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/abd7248d5327_adding_a_settings_table.py

@@ -5,6 +5,7 @@
 Create Date: 2023-05-11 16:38:12.210549
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/b387747ca9b7_role_mapping.py

@@ -5,6 +5,7 @@
 Create Date: 2023-07-04 14:35:48.177574
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/alembic/versions/d78e9889566a_add_status_info.py

@@ -5,6 +5,7 @@
 Create Date: 2023-11-07 12:25:04.416192
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

conda-store-server/conda_store_server/server/views/api.py

@@ -145,9 +145,11 @@ async def api_get_permissions(
         "status": "ok",
         "data": {
             "authenticated": authenticated,
-            "primary_namespace": entity.primary_namespace
-            if authenticated
-            else conda_store.default_namespace,
+            "primary_namespace": (
+                entity.primary_namespace
+                if authenticated
+                else conda_store.default_namespace
+            ),
             "entity_permissions": entity_binding_permissions,
             "entity_roles": entity_binding_roles,
             "expiration": entity.exp if authenticated else None,

conda-store-server/conda_store_server/server/views/registry.py

@@ -159,9 +159,11 @@ def list_tags(
     try:
         auth.authorize_request(
             request,
-            image
-            if parts[0] != "conda-store-dynamic"
-            else "conda-store-dynamic/python",
+            (
+                image
+                if parts[0] != "conda-store-dynamic"
+                else "conda-store-dynamic/python"
+            ),
             {Permissions.ENVIRONMENT_READ},
             require=True,
         )