Skip to content

Commit d13b0ff

Browse files
xakepnzxakepnz
authored
Merge branch 'main' into feat/group-protected-branches
2 parents 24a382e + 20f83e3 commit d13b0ff

File tree

251 files changed

+10300
-13230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+10300
-13230
lines changed

‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Require keyword arguments for register_custom_action
22
d74545a309ed02fdc8d32157f8ccb9f7559cd185
3+
# chore: reformat code with `skip_magic_trailing_comma = true`
4+
a54c422f96637dd13b45db9b55aa332af18e0429

‎.github/ISSUE_TEMPLATE/issue_template.md

-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,4 @@ assignees: ''
1919
## Specifications
2020

2121
- python-gitlab version:
22-
- API version you are using (v3/v4):
2322
- Gitlab server version (or gitlab.com):

‎.github/workflows/docs.yml

+8-13
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,28 @@ env:
2020

2121
jobs:
2222
sphinx:
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2424
steps:
25-
- uses: actions/checkout@v4.2.0
25+
- uses: actions/checkout@v4.2.2
2626
- name: Set up Python
27-
uses: actions/setup-python@v5.2.0
27+
uses: actions/setup-python@v5.5.0
2828
with:
29-
python-version: "3.12"
29+
python-version: "3.13"
3030
- name: Install dependencies
3131
run: pip install tox
3232
- name: Build docs
3333
env:
3434
TOXENV: docs
3535
run: tox
36-
- name: Archive generated docs
37-
uses: actions/upload-artifact@v4.4.0
38-
with:
39-
name: html-docs
40-
path: build/sphinx/html/
4136

4237
twine-check:
43-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
4439
steps:
45-
- uses: actions/checkout@v4.2.0
40+
- uses: actions/checkout@v4.2.2
4641
- name: Set up Python
47-
uses: actions/setup-python@v5.2.0
42+
uses: actions/setup-python@v5.5.0
4843
with:
49-
python-version: "3.12"
44+
python-version: "3.13"
5045
- name: Install dependencies
5146
run: pip install tox twine wheel
5247
- name: Check twine readme rendering

‎.github/workflows/lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
lint:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v4.2.0
25+
- uses: actions/checkout@v4.2.2
2626
with:
2727
fetch-depth: 0
28-
- uses: actions/setup-python@v5.2.0
28+
- uses: actions/setup-python@v5.5.0
2929
with:
30-
python-version: "3.12"
30+
python-version: "3.13"
3131
- run: pip install --upgrade tox
3232
- name: Run commitizen (https://commitizen-tools.github.io/commitizen/)
3333
run: tox -e cz

‎.github/workflows/pre_commit.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
pre_commit:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v4.2.0
33-
- uses: actions/setup-python@v5.2.0
32+
- uses: actions/checkout@v4.2.2
33+
- uses: actions/setup-python@v5.5.0
3434
with:
35-
python-version: "3.11"
35+
python-version: "3.13"
3636
- name: install tox
3737
run: pip install tox==3.26.0
3838
- name: pre-commit

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
id-token: write
1515
environment: pypi.org
1616
steps:
17-
- uses: actions/checkout@v4.2.0
17+
- uses: actions/checkout@v4.2.2
1818
with:
1919
fetch-depth: 0
2020
token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
2121

2222
- name: Python Semantic Release
2323
id: release
24-
uses: python-semantic-release/python-semantic-release@v9.9.0
24+
uses: python-semantic-release/python-semantic-release@v9.21.0
2525
with:
2626
github_token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
2727

‎.github/workflows/rerun-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
rerun_pr_tests:
99
name: rerun_pr_tests
1010
if: ${{ github.event.issue.pull_request }}
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: estroz/rerun-actions@main
1414
with:

‎.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
stale:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/stale@v9.0.0
18+
- uses: actions/stale@v9.1.0
1919
with:
2020
stale-issue-label: "stale"
2121
stale-pr-label: "stale"

‎.github/workflows/test.yml

+28-27
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
matrix:
2727
os: [ubuntu-latest]
2828
python:
29-
- version: "3.8"
30-
toxenv: py38,smoke
3129
- version: "3.9"
3230
toxenv: py39,smoke
3331
- version: "3.10"
@@ -36,21 +34,23 @@ jobs:
3634
toxenv: py311,smoke
3735
- version: "3.12"
3836
toxenv: py312,smoke
39-
- version: '3.13.0-alpha - 3.13' # SemVer's version range syntax
37+
- version: "3.13"
4038
toxenv: py313,smoke
39+
- version: "3.14.0-alpha - 3.14" # SemVer's version range syntax
40+
toxenv: py314,smoke
4141
include:
4242
- os: macos-latest
4343
python:
44-
version: "3.12"
45-
toxenv: py312,smoke
44+
version: "3.13"
45+
toxenv: py313,smoke
4646
- os: windows-latest
4747
python:
48-
version: "3.12"
49-
toxenv: py312,smoke
48+
version: "3.13"
49+
toxenv: py313,smoke
5050
steps:
51-
- uses: actions/checkout@v4.2.0
51+
- uses: actions/checkout@v4.2.2
5252
- name: Set up Python ${{ matrix.python.version }}
53-
uses: actions/setup-python@v5.2.0
53+
uses: actions/setup-python@v5.5.0
5454
with:
5555
python-version: ${{ matrix.python.version }}
5656
- name: Install dependencies
@@ -61,38 +61,39 @@ jobs:
6161
run: tox --skip-missing-interpreters false
6262

6363
functional:
64-
runs-on: ubuntu-22.04
64+
timeout-minutes: 30
65+
runs-on: ubuntu-24.04
6566
strategy:
6667
matrix:
6768
toxenv: [api_func_v4, cli_func_v4]
6869
steps:
69-
- uses: actions/checkout@v4.2.0
70+
- uses: actions/checkout@v4.2.2
7071
- name: Set up Python
71-
uses: actions/setup-python@v5.2.0
72+
uses: actions/setup-python@v5.5.0
7273
with:
73-
python-version: "3.12"
74+
python-version: "3.13"
7475
- name: Install dependencies
7576
run: pip install tox
7677
- name: Run tests
7778
env:
7879
TOXENV: ${{ matrix.toxenv }}
7980
run: tox -- --override-ini='log_cli=True'
8081
- name: Upload codecov coverage
81-
uses: codecov/codecov-action@v4.5.0
82+
uses: codecov/codecov-action@v5.4.0
8283
with:
8384
files: ./coverage.xml
8485
flags: ${{ matrix.toxenv }}
8586
fail_ci_if_error: false
8687
token: ${{ secrets.CODECOV_TOKEN }}
8788

8889
coverage:
89-
runs-on: ubuntu-22.04
90+
runs-on: ubuntu-24.04
9091
steps:
91-
- uses: actions/checkout@v4.2.0
92+
- uses: actions/checkout@v4.2.2
9293
- name: Set up Python ${{ matrix.python-version }}
93-
uses: actions/setup-python@v5.2.0
94+
uses: actions/setup-python@v5.5.0
9495
with:
95-
python-version: "3.12"
96+
python-version: "3.13"
9697
- name: Install dependencies
9798
run: pip install tox
9899
- name: Run tests
@@ -101,7 +102,7 @@ jobs:
101102
TOXENV: cover
102103
run: tox
103104
- name: Upload codecov coverage
104-
uses: codecov/codecov-action@v4.5.0
105+
uses: codecov/codecov-action@v5.4.0
105106
with:
106107
files: ./coverage.xml
107108
flags: unit
@@ -112,16 +113,16 @@ jobs:
112113
runs-on: ubuntu-latest
113114
name: Python wheel
114115
steps:
115-
- uses: actions/checkout@v4.2.0
116-
- uses: actions/setup-python@v5.2.0
116+
- uses: actions/checkout@v4.2.2
117+
- uses: actions/setup-python@v5.5.0
117118
with:
118-
python-version: "3.12"
119+
python-version: "3.13"
119120
- name: Install dependencies
120121
run: |
121122
pip install -r requirements-test.txt
122123
- name: Build package
123124
run: python -m build -o dist/
124-
- uses: actions/upload-artifact@v4.4.0
125+
- uses: actions/upload-artifact@v4.6.2
125126
with:
126127
name: dist
127128
path: dist
@@ -130,12 +131,12 @@ jobs:
130131
runs-on: ubuntu-latest
131132
needs: [dist]
132133
steps:
133-
- uses: actions/checkout@v4.2.0
134+
- uses: actions/checkout@v4.2.2
134135
- name: Set up Python
135-
uses: actions/setup-python@v5.2.0
136+
uses: actions/setup-python@v5.5.0
136137
with:
137-
python-version: '3.12'
138-
- uses: actions/download-artifact@v4.1.8
138+
python-version: '3.13'
139+
- uses: actions/download-artifact@v4.2.1
139140
with:
140141
name: dist
141142
path: dist

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: python:3.12
1+
image: python:3.13
22

33
stages:
44
- build

‎.pre-commit-config.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ default_language_version:
33

44
repos:
55
- repo: https://github.com/psf/black
6-
rev: 24.8.0
6+
rev: 25.1.0
77
hooks:
88
- id: black
99
- repo: https://github.com/commitizen-tools/commitizen
10-
rev: v3.29.1
10+
rev: v4.5.0
1111
hooks:
1212
- id: commitizen
1313
stages: [commit-msg]
1414
- repo: https://github.com/pycqa/flake8
15-
rev: 7.1.1
15+
rev: 7.2.0
1616
hooks:
1717
- id: flake8
1818
- repo: https://github.com/pycqa/isort
19-
rev: 5.13.2
19+
rev: 6.0.1
2020
hooks:
2121
- id: isort
2222
- repo: https://github.com/pycqa/pylint
23-
rev: v3.3.1
23+
rev: v3.3.6
2424
hooks:
2525
- id: pylint
2626
additional_dependencies:
@@ -32,7 +32,7 @@ repos:
3232
- requests-toolbelt==1.0.0
3333
files: 'gitlab/'
3434
- repo: https://github.com/pre-commit/mirrors-mypy
35-
rev: v1.11.2
35+
rev: v1.15.0
3636
hooks:
3737
- id: mypy
3838
args: []
@@ -51,6 +51,6 @@ repos:
5151
- id: rst-directive-colons
5252
- id: rst-inline-touching-normal
5353
- repo: https://github.com/maxbrunet/pre-commit-renovate
54-
rev: 38.103.1
54+
rev: 39.227.2
5555
hooks:
5656
- id: renovate-config-validator

‎.renovaterc.json

+11
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@
2323
"depNameTemplate": "gitlab/gitlab-ee",
2424
"datasourceTemplate": "docker",
2525
"versioningTemplate": "loose"
26+
},
27+
{
28+
"fileMatch": [
29+
"(^|/)tests\\/functional\\/fixtures\\/\\.env$"
30+
],
31+
"matchStrings": [
32+
"GITLAB_RUNNER_TAG=(?<currentValue>.*?)\n"
33+
],
34+
"depNameTemplate": "gitlab/gitlab-runner",
35+
"datasourceTemplate": "docker",
36+
"versioningTemplate": "loose"
2637
}
2738
],
2839
"packageRules": [

0 commit comments

Comments
 (0)