diff options
30 files changed, 81 insertions, 77 deletions
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b5a413d..0dce859 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,9 +3,10 @@ name: Docs on: push: branches: - - master + - main pull_request: branches: + - main - master env: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4f04e7b..ceb0f5d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,9 +3,10 @@ name: Lint on: push: branches: - - master + - main pull_request: branches: + - main - master env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 43ea68a..b8cd39e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,9 +3,10 @@ name: Test on: push: branches: - - master + - main pull_request: branches: + - main - master env: @@ -7,8 +7,8 @@ .. image:: https://readthedocs.org/projects/python-gitlab/badge/?version=latest :target: https://python-gitlab.readthedocs.org/en/latest/?badge=latest -.. image:: https://codecov.io/github/python-gitlab/python-gitlab/coverage.svg?branch=master - :target: https://codecov.io/github/python-gitlab/python-gitlab?branch=master +.. image:: https://codecov.io/github/python-gitlab/python-gitlab/coverage.svg?branch=main + :target: https://codecov.io/github/python-gitlab/python-gitlab?branch=main .. image:: https://img.shields.io/pypi/pyversions/python-gitlab.svg :target: https://pypi.python.org/pypi/python-gitlab @@ -96,4 +96,4 @@ You can build the documentation using ``sphinx``:: Contributing ============ -For guidelines for contributing to ``python-gitlab``, refer to `CONTRIBUTING.rst <https://github.com/python-gitlab/python-gitlab/blob/master/CONTRIBUTING.rst>`_. +For guidelines for contributing to ``python-gitlab``, refer to `CONTRIBUTING.rst <https://github.com/python-gitlab/python-gitlab/blob/main/CONTRIBUTING.rst>`_. diff --git a/docs/gl_objects/branches.rst b/docs/gl_objects/branches.rst index aeba8ea..a9c80c0 100644 --- a/docs/gl_objects/branches.rst +++ b/docs/gl_objects/branches.rst @@ -22,12 +22,12 @@ Get the list of branches for a repository:: Get a single repository branch:: - branch = project.branches.get('master') + branch = project.branches.get('main') Create a repository branch:: branch = project.branches.create({'branch': 'feature1', - 'ref': 'master'}) + 'ref': 'main'}) Delete a repository branch:: diff --git a/docs/gl_objects/commits.rst b/docs/gl_objects/commits.rst index a1d878c..efe6546 100644 --- a/docs/gl_objects/commits.rst +++ b/docs/gl_objects/commits.rst @@ -40,7 +40,7 @@ Create a commit:: # See https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions # for actions detail data = { - 'branch': 'master', + 'branch': 'main', 'commit_message': 'blah blah blah', 'actions': [ { diff --git a/docs/gl_objects/deployments.rst b/docs/gl_objects/deployments.rst index 945ad41..ae10103 100644 --- a/docs/gl_objects/deployments.rst +++ b/docs/gl_objects/deployments.rst @@ -29,7 +29,7 @@ Create a new deployment:: deployment = project.deployments.create({ "environment": "Test", "sha": "1agf4gs", - "ref": "master", + "ref": "main", "tag": False, "status": "created", }) diff --git a/docs/gl_objects/mrs.rst b/docs/gl_objects/mrs.rst index f17ad26..9ec69e5 100644 --- a/docs/gl_objects/mrs.rst +++ b/docs/gl_objects/mrs.rst @@ -94,7 +94,7 @@ Get a single MR:: Create a MR:: mr = project.mergerequests.create({'source_branch': 'cool_feature', - 'target_branch': 'master', + 'target_branch': 'main', 'title': 'merge cool feature', 'labels': ['label1', 'label2']}) diff --git a/docs/gl_objects/pipelines_and_jobs.rst b/docs/gl_objects/pipelines_and_jobs.rst index 675ff4e..b4761b0 100644 --- a/docs/gl_objects/pipelines_and_jobs.rst +++ b/docs/gl_objects/pipelines_and_jobs.rst @@ -35,7 +35,7 @@ Get variables of a pipeline:: Create a pipeline for a particular reference with custom variables:: - pipeline = project.pipelines.create({'ref': 'master', 'variables': [{'key': 'MY_VARIABLE', 'value': 'hello'}]}) + pipeline = project.pipelines.create({'ref': 'main', 'variables': [{'key': 'MY_VARIABLE', 'value': 'hello'}]}) Retry the failed builds for a pipeline:: @@ -97,7 +97,7 @@ Full example with wait for finish:: return project.triggers.create({'description': trigger_decription}) trigger = get_or_create_trigger(project) - pipeline = project.trigger_pipeline('master', trigger.token, variables={"DEPLOY_ZONE": "us-west1"}) + pipeline = project.trigger_pipeline('main', trigger.token, variables={"DEPLOY_ZONE": "us-west1"}) while pipeline.finished_at is None: pipeline.refresh() time.sleep(1) @@ -108,7 +108,7 @@ objects to get the associated project:: gl = gitlab.Gitlab(URL) # no authentication project = gl.projects.get(project_id, lazy=True) # no API call - project.trigger_pipeline('master', trigger_token) + project.trigger_pipeline('main', trigger_token) Reference: https://docs.gitlab.com/ee/ci/triggers/#trigger-token @@ -146,7 +146,7 @@ Get a single schedule:: Create a new schedule:: sched = project.pipelineschedules.create({ - 'ref': 'master', + 'ref': 'main', 'description': 'Daily test', 'cron': '0 1 * * *'}) @@ -213,7 +213,7 @@ Examples Jobs are usually automatically triggered, but you can explicitly trigger a new job:: - project.trigger_build('master', trigger_token, + project.trigger_build('main', trigger_token, {'extra_var1': 'foo', 'extra_var2': 'bar'}) List jobs for the project:: @@ -247,7 +247,7 @@ Get the artifacts of a job:: Get the artifacts of a job by its name from the latest successful pipeline of a branch or tag: - project.artifacts(ref_name='master', job='build') + project.artifacts(ref_name='main', job='build') .. warning:: diff --git a/docs/gl_objects/projects.rst b/docs/gl_objects/projects.rst index fdf5ac5..0b251ea 100644 --- a/docs/gl_objects/projects.rst +++ b/docs/gl_objects/projects.rst @@ -158,7 +158,7 @@ Update a project submodule:: items = project.update_submodule( submodule="foo/bar", - branch="master", + branch="main", commit_sha="4c3674f66071e30b3311dac9b9ccc90502a72664", commit_message="Message", # optional ) @@ -199,7 +199,7 @@ Get a snapshot of the repository:: Compare two branches, tags or commits:: - result = project.repository_compare('master', 'branch1') + result = project.repository_compare('main', 'branch1') # get the commits for commit in result['commits']: @@ -340,7 +340,7 @@ Examples Get a file:: - f = project.files.get(file_path='README.rst', ref='master') + f = project.files.get(file_path='README.rst', ref='main') # get the base64 encoded content print(f.content) @@ -350,15 +350,15 @@ Get a file:: Get a raw file:: - raw_content = project.files.raw(file_path='README.rst', ref='master') + raw_content = project.files.raw(file_path='README.rst', ref='main') print(raw_content) with open('/tmp/raw-download.txt', 'wb') as f: - project.files.raw(file_path='README.rst', ref='master', streamed=True, action=f.write) + project.files.raw(file_path='README.rst', ref='main', streamed=True, action=f.write) Create a new file:: f = project.files.create({'file_path': 'testfile.txt', - 'branch': 'master', + 'branch': 'main', 'content': file_content, 'author_email': 'test@example.com', 'author_name': 'yourname', @@ -369,23 +369,23 @@ Update a file. The entire content must be uploaded, as plain text or as base64 encoded text:: f.content = 'new content' - f.save(branch='master', commit_message='Update testfile') + f.save(branch='main', commit_message='Update testfile') # or for binary data # Note: decode() is required with python 3 for data serialization. You can omit # it with python 2 f.content = base64.b64encode(open('image.png').read()).decode() - f.save(branch='master', commit_message='Update testfile', encoding='base64') + f.save(branch='main', commit_message='Update testfile', encoding='base64') Delete a file:: - f.delete(commit_message='Delete testfile', branch='master') + f.delete(commit_message='Delete testfile', branch='main') # or - project.files.delete(file_path='testfile.txt', commit_message='Delete testfile', branch='master') + project.files.delete(file_path='testfile.txt', commit_message='Delete testfile', branch='main') Get file blame:: - b = project.files.blame(file_path='README.rst', ref='master') + b = project.files.blame(file_path='README.rst', ref='main') Project tags ============ @@ -414,7 +414,7 @@ Get a tag:: Create a tag:: - tag = project.tags.create({'tag_name': '1.0', 'ref': 'master'}) + tag = project.tags.create({'tag_name': '1.0', 'ref': 'main'}) Delete a tag:: @@ -702,7 +702,7 @@ Get project push rules (returns None is there are no push rules):: Edit project push rules:: - pr.branch_name_regex = '^(master|develop|support-\d+|release-\d+\..+|hotfix-.+|feature-.+)$' + pr.branch_name_regex = '^(main|develop|support-\d+|release-\d+\..+|hotfix-.+|feature-.+)$' pr.save() Delete project push rules:: diff --git a/docs/gl_objects/protected_branches.rst b/docs/gl_objects/protected_branches.rst index 3498aa5..88e046c 100644 --- a/docs/gl_objects/protected_branches.rst +++ b/docs/gl_objects/protected_branches.rst @@ -25,7 +25,7 @@ Get the list of protected branches for a project:: Get a single protected branch:: - p_branch = project.protectedbranches.get('master') + p_branch = project.protectedbranches.get('main') Create a protected branch:: diff --git a/pyproject.toml b/pyproject.toml index a924199..ebf9935 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ module = [ ignore_errors = false [tool.semantic_release] +branch = "main" version_variable = "gitlab/__version__.py:__version__" commit_subject = "chore: release v{version}" commit_message = "" diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py index b20b66a..a814572 100644 --- a/tests/functional/api/test_merge_requests.py +++ b/tests/functional/api/test_merge_requests.py @@ -10,14 +10,14 @@ def test_merge_requests(project): project.files.create( { "file_path": "README.rst", - "branch": "master", + "branch": "main", "content": "Initial content", "commit_message": "Initial commit", } ) source_branch = "branch1" - project.branches.create({"branch": source_branch, "ref": "master"}) + project.branches.create({"branch": source_branch, "ref": "main"}) project.files.create( { @@ -28,7 +28,7 @@ def test_merge_requests(project): } ) project.mergerequests.create( - {"source_branch": "branch1", "target_branch": "master", "title": "MR readme2"} + {"source_branch": "branch1", "target_branch": "main", "title": "MR readme2"} ) diff --git a/tests/functional/api/test_projects.py b/tests/functional/api/test_projects.py index 88b274c..ba8e25b 100644 --- a/tests/functional/api/test_projects.py +++ b/tests/functional/api/test_projects.py @@ -240,7 +240,7 @@ def test_project_stars(project): def test_project_tags(project, project_file): - tag = project.tags.create({"tag_name": "v1.0", "ref": "master"}) + tag = project.tags.create({"tag_name": "v1.0", "ref": "main"}) assert len(project.tags.list()) == 1 tag.delete() diff --git a/tests/functional/api/test_repository.py b/tests/functional/api/test_repository.py index 7ba84ea..fe43862 100644 --- a/tests/functional/api/test_repository.py +++ b/tests/functional/api/test_repository.py @@ -10,32 +10,32 @@ def test_repository_files(project): project.files.create( { "file_path": "README", - "branch": "master", + "branch": "main", "content": "Initial content", "commit_message": "Initial commit", } ) - readme = project.files.get(file_path="README", ref="master") + readme = project.files.get(file_path="README", ref="main") readme.content = base64.b64encode(b"Improved README").decode() time.sleep(2) - readme.save(branch="master", commit_message="new commit") - readme.delete(commit_message="Removing README", branch="master") + readme.save(branch="main", commit_message="new commit") + readme.delete(commit_message="Removing README", branch="main") project.files.create( { "file_path": "README.rst", - "branch": "master", + "branch": "main", "content": "Initial content", "commit_message": "New commit", } ) - readme = project.files.get(file_path="README.rst", ref="master") + readme = project.files.get(file_path="README.rst", ref="main") # The first decode() is the ProjectFile method, the second one is the bytes # object method assert readme.decode().decode() == "Initial content" - blame = project.files.blame(file_path="README.rst", ref="master") + blame = project.files.blame(file_path="README.rst", ref="main") assert blame @@ -51,7 +51,7 @@ def test_repository_tree(project): archive = project.repository_archive() assert isinstance(archive, bytes) - archive2 = project.repository_archive("master") + archive2 = project.repository_archive("main") assert archive == archive2 snapshot = project.snapshot() @@ -60,7 +60,7 @@ def test_repository_tree(project): def test_create_commit(project): data = { - "branch": "master", + "branch": "main", "commit_message": "blah blah blah", "actions": [{"action": "create", "file_path": "blah", "content": "blah"}], } @@ -114,7 +114,7 @@ def test_commit_discussion(project): def test_revert_commit(project): commit = project.commits.list()[0] - revert_commit = commit.revert(branch="master") + revert_commit = commit.revert(branch="main") expected_message = 'Revert "{}"\n\nThis reverts commit {}'.format( commit.message, commit.id @@ -123,4 +123,4 @@ def test_revert_commit(project): with pytest.raises(gitlab.GitlabRevertError): # Two revert attempts should raise GitlabRevertError - commit.revert(branch="master") + commit.revert(branch="main") diff --git a/tests/functional/cli/test_cli_artifacts.py b/tests/functional/cli/test_cli_artifacts.py index aab0546..76eb9f2 100644 --- a/tests/functional/cli/test_cli_artifacts.py +++ b/tests/functional/cli/test_cli_artifacts.py @@ -14,7 +14,7 @@ content = textwrap.dedent( ) data = { "file_path": ".gitlab-ci.yml", - "branch": "master", + "branch": "main", "content": content, "commit_message": "Initial commit", } diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py index a63c1b1..91c0afa 100644 --- a/tests/functional/cli/test_cli_v4.py +++ b/tests/functional/cli/test_cli_v4.py @@ -125,7 +125,7 @@ def test_list_user_memberships(gitlab_cli, user): def test_project_create_file(gitlab_cli, project): file_path = "README" - branch = "master" + branch = "main" content = "CONTENT" commit_message = "Initial commit" @@ -197,7 +197,7 @@ def test_create_branch(gitlab_cli, project): "--branch", branch, "--ref", - "master", + "main", ] ret = gitlab_cli(cmd) @@ -215,7 +215,7 @@ def test_create_merge_request(gitlab_cli, project): "--source-branch", branch, "--target-branch", - "master", + "main", "--title", "Update README", ] @@ -260,7 +260,7 @@ def test_revert_commit(gitlab_cli, project): "--id", commit.id, "--branch", - "master", + "main", ] ret = gitlab_cli(cmd) diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py index 23aa583..b6fb9ed 100644 --- a/tests/functional/conftest.py +++ b/tests/functional/conftest.py @@ -305,7 +305,7 @@ def project_file(project): project_file = project.files.create( { "file_path": "README", - "branch": "master", + "branch": "main", "content": "Initial content", "commit_message": "Initial commit", } diff --git a/tests/unit/objects/test_badges.py b/tests/unit/objects/test_badges.py index e226684..d488627 100644 --- a/tests/unit/objects/test_badges.py +++ b/tests/unit/objects/test_badges.py @@ -10,12 +10,12 @@ import responses from gitlab.v4.objects import GroupBadge, ProjectBadge link_url = ( - "http://example.com/ci_status.svg?project=example-org/example-project&ref=master" + "http://example.com/ci_status.svg?project=example-org/example-project&ref=main" ) image_url = "https://example.io/my/badge" rendered_link_url = ( - "http://example.com/ci_status.svg?project=example-org/example-project&ref=master" + "http://example.com/ci_status.svg?project=example-org/example-project&ref=main" ) rendered_image_url = "https://example.io/my/badge" diff --git a/tests/unit/objects/test_bridges.py b/tests/unit/objects/test_bridges.py index 4d39186..5259b8c 100644 --- a/tests/unit/objects/test_bridges.py +++ b/tests/unit/objects/test_bridges.py @@ -28,14 +28,14 @@ def resp_list_bridges(): "name": "teaspoon", "pipeline": { "id": 6, - "ref": "master", + "ref": "main", "sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd", "status": "pending", "created_at": "2015-12-24T15:50:16.123Z", "updated_at": "2015-12-24T18:00:44.432Z", "web_url": "https://example.com/foo/bar/pipelines/6", }, - "ref": "master", + "ref": "main", "stage": "test", "status": "pending", "tag": False, @@ -58,7 +58,7 @@ def resp_list_bridges(): "downstream_pipeline": { "id": 5, "sha": "f62a4b2fb89754372a346f24659212eb8da13601", - "ref": "master", + "ref": "main", "status": "pending", "created_at": "2015-12-24T17:54:27.722Z", "updated_at": "2015-12-24T17:58:27.896Z", diff --git a/tests/unit/objects/test_commits.py b/tests/unit/objects/test_commits.py index 6b98117..2e709b3 100644 --- a/tests/unit/objects/test_commits.py +++ b/tests/unit/objects/test_commits.py @@ -86,7 +86,7 @@ def test_get_commit(project, resp_commit): def test_create_commit(project, resp_create_commit): data = { - "branch": "master", + "branch": "main", "commit_message": "Commit message", "actions": [ { @@ -103,7 +103,7 @@ def test_create_commit(project, resp_create_commit): def test_revert_commit(project, resp_commit): commit = project.commits.get("6b2257ea", lazy=True) - revert_commit = commit.revert(branch="master") + revert_commit = commit.revert(branch="main") assert revert_commit["short_id"] == "8b090c1b" assert revert_commit["title"] == 'Revert "Initial commit"' diff --git a/tests/unit/objects/test_deployments.py b/tests/unit/objects/test_deployments.py index 3cde8fe..92e33c2 100644 --- a/tests/unit/objects/test_deployments.py +++ b/tests/unit/objects/test_deployments.py @@ -7,7 +7,7 @@ import responses @pytest.fixture def resp_deployment(): - content = {"id": 42, "status": "success", "ref": "master"} + content = {"id": 42, "status": "success", "ref": "main"} with responses.RequestsMock() as rsps: rsps.add( @@ -36,14 +36,14 @@ def test_deployment(project, resp_deployment): { "environment": "Test", "sha": "1agf4gs", - "ref": "master", + "ref": "main", "tag": False, "status": "created", } ) assert deployment.id == 42 assert deployment.status == "success" - assert deployment.ref == "master" + assert deployment.ref == "main" deployment.status = "failed" deployment.save() diff --git a/tests/unit/objects/test_job_artifacts.py b/tests/unit/objects/test_job_artifacts.py index 7c5f1df..0d455fe 100644 --- a/tests/unit/objects/test_job_artifacts.py +++ b/tests/unit/objects/test_job_artifacts.py @@ -5,7 +5,7 @@ GitLab API: https://docs.gitlab.com/ee/api/job_artifacts.html import pytest import responses -ref_name = "master" +ref_name = "main" job = "build" diff --git a/tests/unit/objects/test_jobs.py b/tests/unit/objects/test_jobs.py index 104d59d..9454f36 100644 --- a/tests/unit/objects/test_jobs.py +++ b/tests/unit/objects/test_jobs.py @@ -26,7 +26,7 @@ job_content = { "id": 1, "project_id": 1, }, - "ref": "master", + "ref": "main", "artifacts": [], "runner": None, "stage": "test", @@ -79,18 +79,18 @@ def resp_retry_job(): def test_get_project_job(project, resp_get_job): job = project.jobs.get(1) assert isinstance(job, ProjectJob) - assert job.ref == "master" + assert job.ref == "main" def test_cancel_project_job(project, resp_cancel_job): job = project.jobs.get(1, lazy=True) output = job.cancel() - assert output["ref"] == "master" + assert output["ref"] == "main" def test_retry_project_job(project, resp_retry_job): job = project.jobs.get(1, lazy=True) output = job.retry() - assert output["ref"] == "master" + assert output["ref"] == "main" diff --git a/tests/unit/objects/test_merge_request_pipelines.py b/tests/unit/objects/test_merge_request_pipelines.py index 04b04a8..1d2fbf1 100644 --- a/tests/unit/objects/test_merge_request_pipelines.py +++ b/tests/unit/objects/test_merge_request_pipelines.py @@ -9,7 +9,7 @@ from gitlab.v4.objects import ProjectMergeRequestPipeline pipeline_content = { "id": 1, "sha": "959e04d7c7a30600c894bd3c0cd0e1ce7f42c11d", - "ref": "master", + "ref": "main", "status": "success", } diff --git a/tests/unit/objects/test_pipeline_schedules.py b/tests/unit/objects/test_pipeline_schedules.py index c5dcc76..f038756 100644 --- a/tests/unit/objects/test_pipeline_schedules.py +++ b/tests/unit/objects/test_pipeline_schedules.py @@ -10,7 +10,7 @@ def resp_project_pipeline_schedule(created_content): content = { "id": 14, "description": "Build packages", - "ref": "master", + "ref": "main", "cron": "0 1 * * 5", "cron_timezone": "UTC", "next_run_at": "2017-05-26T01:00:00.000Z", @@ -50,7 +50,7 @@ def test_project_pipeline_schedule_play(project, resp_project_pipeline_schedule) description = "Build packages" cronline = "0 1 * * 5" sched = project.pipelineschedules.create( - {"ref": "master", "description": description, "cron": cronline} + {"ref": "main", "description": description, "cron": cronline} ) assert sched is not None assert description == sched.description diff --git a/tests/unit/objects/test_pipelines.py b/tests/unit/objects/test_pipelines.py index c0b87f2..3412f6d 100644 --- a/tests/unit/objects/test_pipelines.py +++ b/tests/unit/objects/test_pipelines.py @@ -10,7 +10,7 @@ pipeline_content = { "id": 46, "project_id": 1, "status": "pending", - "ref": "master", + "ref": "main", "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", "before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", "tag": False, @@ -121,21 +121,21 @@ def resp_get_pipeline_test_report(): def test_get_project_pipeline(project, resp_get_pipeline): pipeline = project.pipelines.get(1) assert isinstance(pipeline, ProjectPipeline) - assert pipeline.ref == "master" + assert pipeline.ref == "main" def test_cancel_project_pipeline(project, resp_cancel_pipeline): pipeline = project.pipelines.get(1, lazy=True) output = pipeline.cancel() - assert output["ref"] == "master" + assert output["ref"] == "main" def test_retry_project_pipeline(project, resp_retry_pipeline): pipeline = project.pipelines.get(1, lazy=True) output = pipeline.retry() - assert output["ref"] == "master" + assert output["ref"] == "main" def test_get_project_pipeline_test_report(project, resp_get_pipeline_test_report): diff --git a/tests/unit/objects/test_project_merge_request_approvals.py b/tests/unit/objects/test_project_merge_request_approvals.py index 16d58bd..cad9149 100644 --- a/tests/unit/objects/test_project_merge_request_approvals.py +++ b/tests/unit/objects/test_project_merge_request_approvals.py @@ -46,7 +46,7 @@ def resp_snippet(): "closed_at": None, "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, diff --git a/tests/unit/objects/test_runners.py b/tests/unit/objects/test_runners.py index 686eec2..c54ecdf 100644 --- a/tests/unit/objects/test_runners.py +++ b/tests/unit/objects/test_runners.py @@ -51,7 +51,7 @@ runner_jobs = [ "status": "running", "stage": "test", "name": "test", - "ref": "master", + "ref": "main", "tag": False, "coverage": "99%", "created_at": "2017-11-16T08:50:29.000Z", diff --git a/tests/unit/objects/test_submodules.py b/tests/unit/objects/test_submodules.py index 69c1cd7..fc95aa3 100644 --- a/tests/unit/objects/test_submodules.py +++ b/tests/unit/objects/test_submodules.py @@ -37,7 +37,7 @@ def resp_update_submodule(): def test_update_submodule(project, resp_update_submodule): ret = project.update_submodule( submodule="foo/bar", - branch="master", + branch="main", commit_sha="4c3674f66071e30b3311dac9b9ccc90502a72664", commit_message="Message", ) |