.gitlab-ci.yml

@@ -168,7 +168,7 @@ pages:
     - tags
 
 docs-deploy:
-  image: node:16
+  image: node:18
   stage: release
 
   dependencies:
@@ -191,7 +191,7 @@ docs-deploy:
     - surge public ${CI_ENVIRONMENT_URL}
 
 docs-stop-surge:
-  image: node:16
+  image: node:18
   stage: release
   when: manual
 

docs-requirements.txt

 doc8==0.11.1
 recommonmark==0.7.1
-Sphinx==4.5.0
+Sphinx==5.1.1
 sphinx-rtd-theme==1.0.0

requirements.txt

 arkindex-client==1.0.9
-peewee==3.14.10
-Pillow>=9.0
-python-gitlab==2.7.1
-python-gnupg==0.4.8
-sh==1.14.2
-shapely==1.8.2
+peewee==3.15.2
+Pillow==9.2.0
+python-gitlab==3.9.0
+python-gnupg==0.5.0
+sh==1.14.3
+shapely==1.8.4
 tenacity==8.0.1
 zstandard==0.18.0

tests-requirements.txt

-pytest==7.1.1
-pytest-mock==3.7.0
+pytest==7.1.2
+pytest-mock==3.8.2
 pytest-responses==0.5.0
 requests==2.27.1

tests/test_git.py

@@ -4,6 +4,7 @@ from pathlib import Path
 import pytest
 from gitlab import GitlabCreateError, GitlabError
 from requests import ConnectionError
+from responses import matchers
 
 from arkindex_worker.git import GitlabHelper
 
@@ -216,12 +217,13 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
 
     fake_responses.add(
         fake_responses.PUT,
-        f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True",
+        f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
         json={
             "iid": MERGE_REQUEST_ID,
             "state": "merged",
             # several fields omitted
         },
+        match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
     )
 
     # the fake_responses are defined in the same order as they are expected to be called
@@ -233,7 +235,6 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
     gitlab_helper._wait_for_rebase_to_finish.return_value = True
 
     success = gitlab_helper.merge(SOURCE_BRANCH, MR_TITLE)
-
     assert success
     assert len(fake_responses.calls) == 4
     assert [c.request.method for c in fake_responses.calls] == expected_http_methods
@@ -255,9 +256,10 @@ def test_merge_request_fail(fake_responses, fake_gitlab_helper_factory, mocker):
 
     fake_responses.add(
         fake_responses.PUT,
-        f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True",
+        f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
         json={"error": "Method not allowed"},
         status=405,
+        match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
     )
 
     # the fake_responses are defined in the same order as they are expected to be called
@@ -340,12 +342,13 @@ def test_merge_request__success_after_errors(
 
     fake_responses.add(
         fake_responses.PUT,
-        f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True",
+        f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
         json={
             "iid": MERGE_REQUEST_ID,
             "state": "merged",
             # several fields omitted
         },
+        match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
     )
 
     # the fake_responses are defined in the same order as they are expected to be called

worker-{{cookiecutter.slug}}/requirements.txt

-arkindex-base-worker==0.2.3
+arkindex-base-worker==0.2.4