Bump aiohttp from 3.11.3 to 3.11.7

.github/workflows/ci.yaml

@@ -50,10 +50,10 @@ jobs:
     runs-on: ubuntu-latest
     env:
       PYTHONIOENCODING: utf-8
-      NEURO_STAGING_URL: ${{ secrets.NEURO_STAGING_URL }}
-      APOLO_TOKEN: ${{ secrets.NEURO_TOKEN }}
+      PLATFORM_API_ENDPOINT: https://api.dev.apolo.us/api/v1
+      APOLO_TOKEN: ${{ secrets.CLIENT_TEST_E2E_USER_NAME }}
       APOLO_CLUSTER: default
-      APOLO_PROJECT: e2e-tests
+      APOLO_PROJECT: apolo-extras
       APOLO_EXTRAS_PRESET: cpu-small
       # Note: ${{ github.sha }} not working, see https://github.com/actions/checkout/issues/299
       SHA: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -77,7 +77,7 @@ jobs:
       - name: Install and configure apolo
         run: |
           python -m pip install -r requirements/base.txt
-          apolo config login-with-token ${{ env.APOLO_TOKEN }} ${{ env.NEURO_STAGING_URL }}
+          apolo config login-with-token ${{ env.APOLO_TOKEN }} ${{ env.PLATFORM_API_ENDPOINT }}
           apolo config switch-cluster ${{ env.APOLO_CLUSTER }}
           apolo config switch-project ${{ env.APOLO_PROJECT }}
           apolo --color=no config show
@@ -171,14 +171,14 @@ jobs:
 
       - name: Configure environment
         env:
-          NEURO_STAGING_URL: ${{ secrets.NEURO_STAGING_URL }}
-          APOLO_TOKEN: ${{ secrets.NEURO_TOKEN }}
+          PLATFORM_API_ENDPOINT: https://api.dev.apolo.us/api/v1
+          APOLO_TOKEN: ${{ secrets.CLIENT_TEST_E2E_USER_NAME }}
           APOLO_CLUSTER: default
-          APOLO_PROJECT: e2e-tests
+          APOLO_PROJECT: apolo-extras
           APOLO_EXTRAS_PRESET: cpu-small
           AZURE_SAS_TOKEN: ${{ secrets.AZURE_SAS_TOKEN }}
         run: |
-          apolo config login-with-token ${{ env.APOLO_TOKEN }} ${{ env.NEURO_STAGING_URL }}
+          apolo config login-with-token ${{ env.APOLO_TOKEN }} ${{ env.PLATFORM_API_ENDPOINT }}
           apolo config switch-cluster ${{ env.APOLO_CLUSTER }}
           apolo config switch-project ${{ env.APOLO_PROJECT }}
           apolo --color=no config show

.pre-commit-config.yaml

@@ -1,81 +1,81 @@
 repos:
-- repo: local
-  hooks:
-  - id: gen-cli-docs
-    name: Generate CLI docs
-    language: system
-    entry: make docs
-    pass_filenames: false
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v4.6.0'
-  hooks:
-  - id: check-merge-conflict
-    exclude: "rst$"
-- repo: https://github.com/asottile/yesqa
-  rev: v1.5.0
-  hooks:
-  - id: yesqa
-- repo: https://github.com/PyCQA/isort
-  rev: '5.13.2'
-  hooks:
-  - id: isort
-- repo: https://github.com/psf/black
-  rev: '24.10.0'
-  hooks:
-  - id: black
-    language_version: python3   # Should be a command that runs python3.6+
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v4.6.0'
-  hooks:
-  - id: check-case-conflict
-  - id: check-json
-  - id: check-xml
-  - id: debug-statements
-  - id: check-added-large-files
-  - id: end-of-file-fixer
-    exclude: "^docs/"
-  - id: requirements-txt-fixer
-  - id: trailing-whitespace
-  - id: check-symlinks
-  - id: debug-statements
-# Another entry is required to apply file-contents-sorter to another file
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v4.6.0'
-  hooks:
-  - id: file-contents-sorter
-    files: |
-      docs/spelling_wordlist.txt|
-      .gitignore
-- repo: https://github.com/asottile/pyupgrade
-  rev: 'v3.18.0'
-  hooks:
-  - id: pyupgrade
-    args: ['--py38-plus']
-- repo: https://github.com/PyCQA/flake8
-  rev: '7.1.1'
-  hooks:
-  - id: flake8
-    exclude: "^docs/"
-- repo: https://github.com/rhysd/actionlint
-  rev: v1.7.3
-  hooks:
-  - id: actionlint-docker
-    args:
-    - -ignore
-    - 'SC2155:'
-    - -ignore
-    - 'SC2086:'
-    - -ignore
-    - 'SC1004:'
-    - -ignore
-    - 'SC2193:'
-- repo: https://github.com/sirosen/check-jsonschema
-  rev: 0.29.4
-  hooks:
-  - id: check-github-actions
+  - repo: local
+    hooks:
+      - id: gen-cli-docs
+        name: Generate CLI docs
+        language: system
+        entry: make docs
+        pass_filenames: false
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: "v5.0.0"
+    hooks:
+      - id: check-merge-conflict
+        exclude: "rst$"
+  - repo: https://github.com/asottile/yesqa
+    rev: v1.5.0
+    hooks:
+      - id: yesqa
+  - repo: https://github.com/PyCQA/isort
+    rev: "5.13.2"
+    hooks:
+      - id: isort
+  - repo: https://github.com/psf/black
+    rev: "24.10.0"
+    hooks:
+      - id: black
+        language_version: python3 # Should be a command that runs python3.6+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: "v5.0.0"
+    hooks:
+      - id: check-case-conflict
+      - id: check-json
+      - id: check-xml
+      - id: debug-statements
+      - id: check-added-large-files
+      - id: end-of-file-fixer
+        exclude: "^docs/"
+      - id: requirements-txt-fixer
+      - id: trailing-whitespace
+      - id: check-symlinks
+      - id: debug-statements
+  # Another entry is required to apply file-contents-sorter to another file
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: "v5.0.0"
+    hooks:
+      - id: file-contents-sorter
+        files: |
+          docs/spelling_wordlist.txt|
+          .gitignore
+  - repo: https://github.com/asottile/pyupgrade
+    rev: "v3.19.0"
+    hooks:
+      - id: pyupgrade
+        args: ["--py38-plus"]
+  - repo: https://github.com/PyCQA/flake8
+    rev: "7.1.1"
+    hooks:
+      - id: flake8
+        exclude: "^docs/"
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.4
+    hooks:
+      - id: actionlint-docker
+        args:
+          - -ignore
+          - "SC2155:"
+          - -ignore
+          - "SC2086:"
+          - -ignore
+          - "SC1004:"
+          - -ignore
+          - "SC2193:"
+  - repo: https://github.com/sirosen/check-jsonschema
+    rev: 0.29.4
+    hooks:
+      - id: check-github-actions
 ci:
   # pre-commit ci do not install dependencies from setup.py
   skip:
-  - gen-cli-docs
-  - actionlint-docker
-  - check-github-actions
+    - gen-cli-docs
+    - actionlint-docker
+    - check-github-actions

requirements/base.txt

@@ -1,5 +1,5 @@
-apolo-cli==24.10.1
-apolo-sdk==24.11.0
+apolo-cli==24.11.1
+apolo-sdk==24.11.1
 click==8.1.7
 pyyaml==6.0.2
 toml==0.10.2

requirements/cleanup.txt

@@ -1 +1 @@
-aiohttp==3.11.3
+aiohttp==3.11.7

requirements/test.txt

@@ -4,7 +4,6 @@ deepdiff==8.0.1
 pytest==8.3.3
 pytest-asyncio==0.24.0
 pytest-clarity==1.0.1
-pytest-lazy-fixture==0.6.3
 pytest-xdist==3.6.1
 tenacity==9.0.0
 towncrier==24.8.0

setup.py

@@ -20,7 +20,7 @@
     url="https://github.com/neuro-inc/neuro-extras",
     packages=find_packages(),
     install_requires=[
-        "apolo-cli>=24.10.1",
+        "apolo-cli>=24.11.1",
         "click>=8.0",
         "toml>=0.10.0",
         "pyyaml>=3.0",

tests/e2e/data/test_data_cp.py

@@ -10,7 +10,6 @@
 import apolo_sdk
 import pytest
 from apolo_sdk import Client
-from pytest_lazyfixture import lazy_fixture  # type: ignore
 from tenacity import retry, stop_after_attempt, wait_random_exponential
 
 from ..conftest import (
@@ -104,8 +103,8 @@ def archive_types_are_compatible(
     ids=str,
 )
 def data_copy_config(request: pytest.FixtureRequest) -> Iterable[CopyTestConfig]:
-    config: CopyTestConfig = request.param
-    yield config
+    config = request.param
+    yield request.getfixturevalue(config)
     logger.info(f"Cleaning up destination after '{config.as_command(minimized=True)}'")
     config.destination.remove()
 
@@ -115,8 +114,8 @@ def data_copy_config(request: pytest.FixtureRequest) -> Iterable[CopyTestConfig]
     ids=str,
 )
 def data_copy_config_smoke(request: pytest.FixtureRequest) -> Iterable[CopyTestConfig]:
-    config: CopyTestConfig = request.param
-    yield config
+    config = request.param
+    yield request.getfixturevalue(config)
     logger.info(f"Cleaning up destination after '{config.as_command(minimized=True)}'")
     config.destination.remove()
 
@@ -135,9 +134,7 @@ def tempdir_fixture() -> Iterator[str]:
 
 
 @pytest.mark.xfail(strict=False)  # TODO: remove when platform stabilizes
-@pytest.mark.parametrize(
-    argnames="config", argvalues=[lazy_fixture("data_copy_config")]
-)
+@pytest.mark.parametrize(argnames="config", argvalues=["data_copy_config"])
 @pytest.mark.skipif(sys.platform == "win32", reason="tools don't work on Windows")
 def test_data_copy(config: CopyTestConfig, tempdir_fixture: str, disk: str) -> None:
     config.source.patch_tempdir(tempdir_fixture)
@@ -150,9 +147,7 @@ def test_data_copy(config: CopyTestConfig, tempdir_fixture: str, disk: str) -> N
 @pytest.mark.smoke
 @pytest.mark.smoke_only
 @pytest.mark.xfail(strict=False)  # TODO: remove when platform stabilizes
-@pytest.mark.parametrize(
-    argnames="config", argvalues=[lazy_fixture("data_copy_config_smoke")]
-)
+@pytest.mark.parametrize(argnames="config", argvalues=["data_copy_config_smoke"])
 @pytest.mark.skipif(sys.platform == "win32", reason="tools don't work on Windows")
 def test_data_copy_smoke(
     config: CopyTestConfig, tempdir_fixture: str, disk: str

tests/unit/image/conftest.py

@@ -75,7 +75,7 @@ def _load_mock_sdk_config() -> _ConfigData:
         version="1.0.0",
         project_name="myproject",
         cluster_name="mycluster",
-        org_name=None,
+        org_name="mocked-org",
         clusters=_get_mock_clusters(),
         projects=_get_mock_projects(),
     )