Skip to content

Commit 146bd13

Browse files
authored
Merge branch 'python-gitlab:master' into master
2 parents 861ea6f + 34fc210 commit 146bd13

File tree

12 files changed

+44
-13
lines changed

12 files changed

+44
-13
lines changed

.mypy.ini

Lines changed: 0 additions & 9 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ repos:
2121
hooks:
2222
- id: isort
2323
- repo: https://github.com/pre-commit/mirrors-mypy
24-
rev: v0.812
24+
rev: v0.910
2525
hooks:
2626
- id: mypy
27+
additional_dependencies:
28+
- types-PyYAML==5.4.6
29+
- types-requests==2.25.6

.renovaterc.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,22 @@
1212
"depNameTemplate": "gitlab/gitlab-ce",
1313
"datasourceTemplate": "docker",
1414
"versioningTemplate": "loose"
15+
},
16+
{
17+
"fileMatch": ["^.pre-commit-config.yaml$"],
18+
"matchStrings": ["- (?<depName>.*?)==(?<currentValue>.*?)\n"],
19+
"datasourceTemplate": "pypi",
20+
"versioningTemplate": "pep440"
1521
}
1622
],
1723
"packageRules": [
1824
{
1925
"packagePatterns": ["^gitlab\/gitlab-.+$"],
2026
"automerge": true
27+
},
28+
{
29+
"matchPackagePrefixes": ["types-"],
30+
"groupName": "typing dependencies"
2131
}
2232
]
2333
}

docs/__init__.py

Whitespace-only changes.

docs/gl_objects/mrs.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ Reference
3030
Examples
3131
--------
3232

33-
List the merge requests available on the GitLab server::
33+
List the merge requests created by the user of the token on the GitLab server::
3434

3535
mrs = gl.mergerequests.list()
3636

37+
List the merge requests available on the GitLab server::
38+
39+
mrs = gl.mergerequests.list(scope="all")
40+
3741
List the merge requests for a group::
3842

3943
group = gl.groups.get('mygroup')

pyproject.toml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,29 @@ profile = "black"
33
multi_line_output = 3
44
order_by_type = false
55

6+
[tool.mypy]
7+
disallow_incomplete_defs = true
8+
disallow_untyped_defs = true
9+
files = "."
10+
11+
[[tool.mypy.overrides]] # Overrides for currently untyped modules
12+
module = [
13+
"docs.*",
14+
"docs.ext.*",
15+
"gitlab.v4.objects.*",
16+
"setup",
17+
"tests.functional.*",
18+
"tests.functional.api.*",
19+
"tests.unit.*"
20+
]
21+
ignore_errors = true
22+
23+
[[tool.mypy.overrides]] # Overrides to negate above patterns
24+
module = [
25+
"gitlab.v4.objects.projects"
26+
]
27+
ignore_errors = false
28+
629
[tool.semantic_release]
730
version_variable = "gitlab/__version__.py:__version__"
831
commit_subject = "chore: release v{version}"

requirements-lint.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ black==20.8b1
22
flake8==3.9.2
33
isort==5.9.3
44
mypy==0.910
5-
types-PyYAML==5.4.3
6-
types-requests==2.25.2
5+
types-PyYAML==5.4.6
6+
types-requests==2.25.6

tests/__init__.py

Whitespace-only changes.

tests/functional/__init__.py

Whitespace-only changes.

tests/functional/api/__init__.py

Whitespace-only changes.

tests/functional/cli/__init__.py

Whitespace-only changes.

tests/unit/mixins/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)