Skip to content

Commit 6afa90c

Browse files
actions-useractions-user
committed
style: beautify 0256916 
1 parent 0256916 commit 6afa90c

File tree

3 files changed

+44
-25
lines changed

3 files changed

+44
-25
lines changed

‎semantic_release/hvcs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,9 @@ def domain() -> str:
354354
:return: The Gitlab instance domain
355355
"""
356356
# Use Gitlab-CI environment vars if available
357-
if 'CI_SERVER_URL' in os.environ:
358-
url = urlsplit(os.environ['CI_SERVER_URL'])
359-
return f"{url.netloc}{url.path}".rstrip('/')
357+
if "CI_SERVER_URL" in os.environ:
358+
url = urlsplit(os.environ["CI_SERVER_URL"])
359+
return f"{url.netloc}{url.path}".rstrip("/")
360360

361361
domain = config.get("hvcs_domain", os.environ.get("CI_SERVER_HOST", None))
362362
return domain if domain else "gitlab.com"
@@ -368,8 +368,8 @@ def api_url() -> str:
368368
:return: The Gitlab instance API url
369369
"""
370370
# Use Gitlab-CI environment vars if available
371-
if 'CI_SERVER_URL' in os.environ:
372-
return os.environ['CI_SERVER_URL']
371+
if "CI_SERVER_URL" in os.environ:
372+
return os.environ["CI_SERVER_URL"]
373373

374374
return f"https://{Gitlab.domain()}"
375375

‎semantic_release/vcs_helpers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ def get_repository_owner_and_name() -> Tuple[str, str]:
108108
:return: A tuple of the owner and name.
109109
"""
110110
# Gitlab-CI context
111-
if 'CI_PROJECT_NAMESPACE' in os.environ and 'CI_PROJECT_NAME' in os.environ:
112-
return os.environ['CI_PROJECT_NAMESPACE'], os.environ['CI_PROJECT_NAME']
111+
if "CI_PROJECT_NAMESPACE" in os.environ and "CI_PROJECT_NAME" in os.environ:
112+
return os.environ["CI_PROJECT_NAMESPACE"], os.environ["CI_PROJECT_NAME"]
113113

114114
# Github actions context
115-
if 'GITHUB_REPOSITORY' in os.environ:
116-
owner, name = os.environ['GITHUB_REPOSITORY'].rsplit('/', 1)
115+
if "GITHUB_REPOSITORY" in os.environ:
116+
owner, name = os.environ["GITHUB_REPOSITORY"].rsplit("/", 1)
117117
return owner, name
118118

119119
# Local context

‎tests/test_vcs_helpers.py

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import os
12
from datetime import date
23

3-
import os
44
import git
55
import pytest
66
from git import GitCommandError, Repo, TagObject
@@ -136,10 +136,11 @@ def test_push_new_version_with_custom_branch(mock_git):
136136
@mock.patch.dict(
137137
os.environ,
138138
{
139-
k: v for k, v in os.environ.items()
140-
if k not in ['GITHUB_REPOSITORY', 'CI_PROJECT_NAMESPACE', 'CI_PROJECT_NAME']
139+
k: v
140+
for k, v in os.environ.items()
141+
if k not in ["GITHUB_REPOSITORY", "CI_PROJECT_NAMESPACE", "CI_PROJECT_NAME"]
141142
},
142-
clear=True
143+
clear=True,
143144
)
144145
@pytest.mark.parametrize(
145146
"origin_url,expected_result",
@@ -210,17 +211,26 @@ class FakeRemote:
210211
os.environ,
211212
{
212213
**os.environ,
213-
'GITHUB_REPOSITORY': 'group/subgroup/project',
214+
"GITHUB_REPOSITORY": "group/subgroup/project",
214215
},
215-
clear=True
216+
clear=True,
216217
)
217218
@pytest.mark.parametrize(
218219
"origin_url,expected_result",
219220
[
220221
("https://github.com/group/project.git", ("group/subgroup", "project")),
221-
("https://github.com/group/subgroup/project.git", ("group/subgroup", "project")),
222-
("https://github.com/group/sub.group/project.git", ("group/subgroup", "project")),
223-
("https://github.com/group/subgroup/pro.ject.git", ("group/subgroup", "project")),
222+
(
223+
"https://github.com/group/subgroup/project.git",
224+
("group/subgroup", "project"),
225+
),
226+
(
227+
"https://github.com/group/sub.group/project.git",
228+
("group/subgroup", "project"),
229+
),
230+
(
231+
"https://github.com/group/subgroup/pro.ject.git",
232+
("group/subgroup", "project"),
233+
),
224234
],
225235
)
226236
def test_get_repository_owner_and_name_github(mocker, origin_url, expected_result):
@@ -239,18 +249,27 @@ class FakeRemote:
239249
os.environ,
240250
{
241251
**os.environ,
242-
'CI_PROJECT_NAMESPACE': 'group/subgroup',
243-
'CI_PROJECT_NAME': 'project',
252+
"CI_PROJECT_NAMESPACE": "group/subgroup",
253+
"CI_PROJECT_NAME": "project",
244254
},
245-
clear=True
255+
clear=True,
246256
)
247257
@pytest.mark.parametrize(
248258
"origin_url,expected_result",
249259
[
250-
("https://gitlab.example.com/group/subgroup/project.git", ("group/subgroup", "project")),
251-
("https://gitlab.example.com/group/subgroup/project", ("group/subgroup", "project")),
252-
("https://gitlab.example.com/group/project", ("group/subgroup", "project")),
253-
("https://gitlab-ci-token:MySuperToken@gitlab.example.com/group/subgroup/project.git", ("group/subgroup", "project")),
260+
(
261+
"https://gitlab.example.com/group/subgroup/project.git",
262+
("group/subgroup", "project"),
263+
),
264+
(
265+
"https://gitlab.example.com/group/subgroup/project",
266+
("group/subgroup", "project"),
267+
),
268+
("https://gitlab.example.com/group/project", ("group/subgroup", "project")),
269+
(
270+
"https://gitlab-ci-token:MySuperToken@gitlab.example.com/group/subgroup/project.git",
271+
("group/subgroup", "project"),
272+
),
254273
],
255274
)
256275
def test_get_repository_owner_and_name_gitlab(mocker, origin_url, expected_result):

0 commit comments

Comments
 (0)