Merge branch 'main' into feat/registry-protection-rule-deletion

nejch · web-flow · commit 99e628ca6610 · 2025-12-25T00:25:57.000+01:00
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -22,9 +22,9 @@ jobs:
   sphinx:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.1
       - name: Set up Python
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: "3.14"
       - name: Install dependencies
@@ -37,9 +37,9 @@ jobs:
   twine-check:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.1
       - name: Set up Python
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: "3.14"
       - name: Install dependencies
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,10 +22,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v6.0.0
+      - uses: actions/setup-python@v6.1.0
         with:
           python-version: "3.14"
       - run: pip install --upgrade tox
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
@@ -15,6 +15,6 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5.0.1
+      - uses: dessant/lock-threads@v6.0.0
         with:
           process-only: 'issues'
diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml
@@ -29,8 +29,8 @@ jobs:
   pre_commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.0
-      - uses: actions/setup-python@v6.0.0
+      - uses: actions/checkout@v6.0.1
+      - uses: actions/setup-python@v6.1.0
         with:
           python-version: "3.14"
       - name: install tox
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,14 +14,14 @@ jobs:
       id-token: write
     environment: pypi.org
     steps:
-    - uses: actions/checkout@v5.0.0
+    - uses: actions/checkout@v6.0.1
       with:
         fetch-depth: 0
         token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
 
     - name: Python Semantic Release
       id: release
-      uses: python-semantic-release/python-semantic-release@v10.5.2
+      uses: python-semantic-release/python-semantic-release@v10.5.3
       with:
         github_token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
 
@@ -32,7 +32,7 @@ jobs:
       if: steps.release.outputs.released == 'true'
 
     - name: Publish package distributions to GitHub Releases
-      uses: python-semantic-release/publish-action@v10.5.2
+      uses: python-semantic-release/publish-action@v10.5.3
       if: steps.release.outputs.released == 'true'
       with:
         github_token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10.1.0
+      - uses: actions/stale@v10.1.1
         with:
           operations-per-run: 500
           stale-issue-label: "stale"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,9 +46,9 @@ jobs:
               version: "3.14"
               toxenv: py314,smoke
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.1
       - name: Set up Python ${{ matrix.python.version }}
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: ${{ matrix.python.version }}
       - name: Install dependencies
@@ -65,9 +65,9 @@ jobs:
       matrix:
         toxenv: [api_func_v4, cli_func_v4]
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.1
       - name: Set up Python
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: "3.14"
       - name: Install dependencies
@@ -77,7 +77,7 @@ jobs:
           TOXENV: ${{ matrix.toxenv }}
         run: tox -- --override-ini='log_cli=True'
       - name: Upload codecov coverage
-        uses: codecov/codecov-action@v5.5.1
+        uses: codecov/codecov-action@v5.5.2
         with:
           files: ./coverage.xml
           flags: ${{ matrix.toxenv }}
@@ -87,9 +87,9 @@ jobs:
   coverage:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.1
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: "3.14"
       - name: Install dependencies
@@ -100,7 +100,7 @@ jobs:
           TOXENV: cover
         run: tox
       - name: Upload codecov coverage
-        uses: codecov/codecov-action@v5.5.1
+        uses: codecov/codecov-action@v5.5.2
         with:
           files: ./coverage.xml
           flags: unit
@@ -111,8 +111,8 @@ jobs:
     runs-on: ubuntu-latest
     name: Python wheel
     steps:
-    - uses: actions/checkout@v5.0.0
-    - uses: actions/setup-python@v6.0.0
+    - uses: actions/checkout@v6.0.1
+    - uses: actions/setup-python@v6.1.0
       with:
         python-version: "3.14"
     - name: Install dependencies
@@ -129,9 +129,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [dist]
     steps:
-    - uses: actions/checkout@v5.0.0
+    - uses: actions/checkout@v6.0.1
     - name: Set up Python
-      uses: actions/setup-python@v6.0.0
+      uses: actions/setup-python@v6.1.0
       with:
         python-version: '3.14'
     - uses: actions/download-artifact@v6.0.0
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,11 +3,11 @@ default_language_version:
 
 repos:
   - repo: https://github.com/psf/black
-    rev: 25.11.0
+    rev: 25.12.0
     hooks:
       - id: black
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.10.0
+    rev: v4.10.1
     hooks:
       - id: commitizen
         stages: [commit-msg]
@@ -20,7 +20,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/pycqa/pylint
-    rev: v4.0.3
+    rev: v4.0.4
     hooks:
       - id: pylint
         additional_dependencies:
@@ -32,7 +32,7 @@ repos:
           - requests-toolbelt==1.0.0
         files: 'gitlab/'
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.2
+    rev: v1.19.1
     hooks:
       - id: mypy
         args: []
@@ -51,6 +51,6 @@ repos:
       - id: rst-directive-colons
       - id: rst-inline-touching-normal
   - repo: https://github.com/maxbrunet/pre-commit-renovate
-    rev: 42.11.0
+    rev: 42.64.1
     hooks:
       - id: renovate-config-validator
diff --git a/gitlab/utils.py b/gitlab/utils.py
@@ -133,7 +133,7 @@ def handle_retry_on_status(
             if "Retry-After" in headers:
                 wait_time = int(headers["Retry-After"])
             elif "RateLimit-Reset" in headers:
-                wait_time = int(headers["RateLimit-Reset"]) - time.time()
+                wait_time = max(0, int(headers["RateLimit-Reset"]) - time.time())
             self.cur_retries += 1
             time.sleep(wait_time)
             return True
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -1,5 +1,5 @@
 -r requirements.txt
-furo==2025.9.25
+furo==2025.12.19
 jinja2==3.1.6
 myst-parser==4.0.1
 sphinx==8.2.3
diff --git a/requirements-lint.txt b/requirements-lint.txt
@@ -1,14 +1,14 @@
 -r requirements.txt
 argcomplete==2.0.0
-black==25.11.0
-commitizen==4.10.0
+black==25.12.0
+commitizen==4.10.1
 flake8==7.3.0
 isort==7.0.0
-mypy==1.18.2
-pylint==4.0.3
-pytest==9.0.1
+mypy==1.19.1
+pylint==4.0.4
+pytest==9.0.2
 responses==0.25.8
 respx==0.22.0
 types-PyYAML==6.0.12.20250915
 types-requests==2.32.4.20250913
-types-setuptools==80.9.0.20250822
+types-setuptools==80.9.0.20251221
diff --git a/requirements-precommit.txt b/requirements-precommit.txt
@@ -1 +1 @@
-pre-commit==4.4.0
+pre-commit==4.5.1
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,11 +1,11 @@
 -r requirements.txt
-anyio==4.11.0
+anyio==4.12.0
 build==1.3.0
-coverage==7.11.3
+coverage==7.13.0
 pytest-console-scripts==1.4.1
 pytest-cov==7.0.0
 pytest-github-actions-annotate-failures==0.3.0
-pytest==9.0.1
+pytest==9.0.2
 PyYaml==6.0.3
 responses==0.25.8
 respx==0.22.0
diff --git a/tests/functional/api/test_epics.py b/tests/functional/api/test_epics.py
@@ -15,18 +15,20 @@ def test_epics(group):
     assert group.epics.list()
 
 
-@pytest.mark.xfail(reason="404 on issue.id")
 def test_epic_issues(epic, issue):
     assert not epic.issues.list()
 
+    # FYI: Creating an issue causes a note to be created
     epic_issue = epic.issues.create({"issue_id": issue.id})
     assert epic.issues.list()
 
+    # FYI: Deleting an issue causes a note to be created
     epic_issue.delete()
 
 
 def test_epic_notes(epic):
-    assert not epic.notes.list()
+    notes = epic.notes.list(get_all=True)
 
     epic.notes.create({"body": "Test note"})
-    assert epic.notes.list()
+    new_notes = epic.notes.list(get_all=True)
+    assert len(new_notes) == (len(notes) + 1), f"{new_notes} {notes}"
diff --git a/tests/functional/api/test_keys.py b/tests/functional/api/test_keys.py
@@ -38,6 +38,14 @@ def test_keys_deploy(gl, project, DEPLOY_KEY):
     key_by_fingerprint = gl.keys.get(fingerprint=fingerprint)
     assert key_by_fingerprint.title == key.title
     assert key_by_fingerprint.key == key.key
-    assert len(key_by_fingerprint.deploy_keys_projects) == 1
+
+    if not any(
+        key_project.get("project_id") == project.id
+        for key_project in key_by_fingerprint.deploy_keys_projects
+    ):
+        raise AssertionError(
+            f"Project {project} not found in 'deploy_keys_projects' "
+            f"{key_by_fingerprint.pformat()}"
+        )
 
     key.delete()
diff --git a/tests/functional/api/test_project_job_token_scope.py b/tests/functional/api/test_project_job_token_scope.py
@@ -1,3 +1,6 @@
+import pytest
+
+
 # https://docs.gitlab.com/ee/ci/jobs/ci_job_token.html#allow-any-project-to-access-your-project
 def test_enable_limit_access_to_this_project(gl, project):
     scope = project.job_token_scope.get()
@@ -10,6 +13,7 @@ def test_enable_limit_access_to_this_project(gl, project):
     assert scope.inbound_enabled
 
 
+@pytest.mark.xfail(reason="https://gitlab.com/gitlab-org/gitlab/-/issues/582271")
 def test_disable_limit_access_to_this_project(gl, project):
     scope = project.job_token_scope.get()
 
diff --git a/tests/functional/api/test_projects.py b/tests/functional/api/test_projects.py
@@ -26,9 +26,9 @@ def test_create_project(gl, user):
 
     sudo_project = gl.projects.create({"name": "sudo_project"}, sudo=user.id)
 
-    created = gl.projects.list()
+    created = gl.projects.list(get_all=True)
     created_gen = gl.projects.list(iterator=True)
-    owned = gl.projects.list(owned=True)
+    owned = gl.projects.list(owned=True, get_all=True)
 
     assert admin_project in created and sudo_project in created
     assert admin_project in owned and sudo_project not in owned
diff --git a/tests/functional/fixtures/.env b/tests/functional/fixtures/.env
@@ -1,4 +1,4 @@
 GITLAB_IMAGE=gitlab/gitlab-ee
-GITLAB_TAG=17.8.2-ee.0
+GITLAB_TAG=18.7.0-ee.0
 GITLAB_RUNNER_IMAGE=gitlab/gitlab-runner
 GITLAB_RUNNER_TAG=96856197
diff --git a/tests/functional/fixtures/docker-compose.yml b/tests/functional/fixtures/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     entrypoint:
       - /bin/sh
       - -c
-      - ruby /create_license.rb && /assets/wrapper
+      - ruby /create_license.rb && /assets/init-container
     volumes:
       - ${PWD}/tests/functional/fixtures/create_license.rb:/create_license.rb
     ports:
diff --git a/tests/functional/helpers.py b/tests/functional/helpers.py
@@ -9,6 +9,7 @@
 import gitlab
 import gitlab.base
 import gitlab.exceptions
+import gitlab.v4.objects
 
 SLEEP_INTERVAL = 0.5
 TIMEOUT = 60  # seconds before timeout will occur
@@ -37,6 +38,11 @@ def safe_delete(object: gitlab.base.RESTObject) -> None:
             object = manager.get(object.get_id())  # type: ignore[attr-defined]
         except gitlab.exceptions.GitlabGetError:
             return
+        # If object is already marked for deletion we have succeeded
+        if getattr(object, "marked_for_deletion_on", None) is not None:
+            # 'Group' and 'Project' objects have a 'marked_for_deletion_on' attribute
+            logging.info(f"{object!r} is marked for deletion.")
+            return
 
         if index:
             logging.info(f"Attempt {index + 1} to delete {object!r}.")
@@ -52,22 +58,16 @@ def safe_delete(object: gitlab.base.RESTObject) -> None:
                     # we shouldn't cause test to fail if it still exists
                     return
             elif isinstance(object, gitlab.v4.objects.Project):
-                # Immediately delete rather than waiting for at least 1day
-                # https://docs.gitlab.com/ee/api/projects.html#delete-project
-                object.delete(permanently_remove=True)
-                pass
+                # Starting in GitLab 18, projects can't be immediately deleted.
+                # So this will mark it for deletion.
+                object.delete()
             else:
                 # We only attempt to delete parent groups to prevent dangling sub-groups
-                # However parent groups can only be deleted on a delay in Gl 16
+                # However parent groups can only be deleted on a delay in GitLab 16
                 # https://docs.gitlab.com/ee/api/groups.html#remove-group
                 object.delete()
         except gitlab.exceptions.GitlabDeleteError:
-            logging.info(f"{object!r} already deleted or scheduled for deletion.")
-            if isinstance(object, gitlab.v4.objects.Group):
-                # Parent groups can never be immediately deleted in GL 16,
-                # so don't cause test to fail if it still exists
-                return
-            pass
+            logging.exception(f"Error attempting to delete: {object.pformat()}")
 
         time.sleep(SLEEP_INTERVAL)
     pytest.fail(f"{object!r} was not deleted")
