Skip to content

Commit 909c348

Browse files
andreas-hafnerandreas-hafner
authored
Merge branch 'main' into dependabot/pip/pip-aed9f6bbcd
2 parents 8731276 + 0a4a74a commit 909c348

File tree

127 files changed

+9421
-9846
lines changed

Some content is hidden

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

127 files changed

+9421
-9846
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Require keyword arguments for register_custom_action
2+
d74545a309ed02fdc8d32157f8ccb9f7559cd185

‎.github/ISSUE_TEMPLATE/issue_template.md‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ 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.1.4
25+
- uses: actions/checkout@v4.2.2
2626
- name: Set up Python
27-
uses: actions/setup-python@v5.1.0
27+
uses: actions/setup-python@v5.3.0
2828
with:
2929
python-version: "3.12"
3030
- name: Install dependencies
@@ -34,17 +34,17 @@ jobs:
3434
TOXENV: docs
3535
run: tox
3636
- name: Archive generated docs
37-
uses: actions/upload-artifact@v4.3.3
37+
uses: actions/upload-artifact@v4.4.3
3838
with:
3939
name: html-docs
4040
path: build/sphinx/html/
4141

4242
twine-check:
43-
runs-on: ubuntu-22.04
43+
runs-on: ubuntu-24.04
4444
steps:
45-
- uses: actions/checkout@v4.1.4
45+
- uses: actions/checkout@v4.2.2
4646
- name: Set up Python
47-
uses: actions/setup-python@v5.1.0
47+
uses: actions/setup-python@v5.3.0
4848
with:
4949
python-version: "3.12"
5050
- name: Install dependencies

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
lint:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v4.1.4
25+
- uses: actions/checkout@v4.2.2
2626
with:
2727
fetch-depth: 0
28-
- uses: actions/setup-python@v5.1.0
28+
- uses: actions/setup-python@v5.3.0
2929
with:
3030
python-version: "3.12"
3131
- run: pip install --upgrade tox

‎.github/workflows/pre_commit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
pre_commit:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v4.1.4
33-
- uses: actions/setup-python@v5.1.0
32+
- uses: actions/checkout@v4.2.2
33+
- uses: actions/setup-python@v5.3.0
3434
with:
3535
python-version: "3.11"
3636
- name: install tox

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 4 deletions
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.1.4
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.7.1
24+
uses: python-semantic-release/python-semantic-release@v9.15.1
2525
with:
2626
github_token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
2727

@@ -32,8 +32,7 @@ jobs:
3232
if: steps.release.outputs.released == 'true'
3333

3434
- name: Publish package distributions to GitHub Releases
35-
# TODO: track tags after https://github.com/python-semantic-release/upload-to-gh-release/issues/2
36-
uses: python-semantic-release/upload-to-gh-release@0f96c02a48278aff14251e9f1a0d73122a8c638b
35+
uses: python-semantic-release/upload-to-gh-release@0a92b5d7ebfc15a84f9801ebd1bf706343d43711 # v9.8.9
3736
if: steps.release.outputs.released == 'true'
3837
with:
3938
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/rerun-test.yml‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/stale@v9.0.0
1919
with:
20-
any-of-labels: 'need info,Waiting for response'
20+
stale-issue-label: "stale"
21+
stale-pr-label: "stale"
22+
23+
any-of-labels: 'need info,Waiting for response,stale'
2124
stale-issue-message: >
2225
This issue was marked stale because it has been open 60 days with no
2326
activity. Please remove the stale label or comment on this issue. Otherwise,

‎.github/workflows/test.yml‎

Lines changed: 25 additions & 23 deletions
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.1.4
51+
- uses: actions/checkout@v4.2.2
5252
- name: Set up Python ${{ matrix.python.version }}
53-
uses: actions/setup-python@v5.1.0
53+
uses: actions/setup-python@v5.3.0
5454
with:
5555
python-version: ${{ matrix.python.version }}
5656
- name: Install dependencies
@@ -61,14 +61,14 @@ jobs:
6161
run: tox --skip-missing-interpreters false
6262

6363
functional:
64-
runs-on: ubuntu-22.04
64+
runs-on: ubuntu-24.04
6565
strategy:
6666
matrix:
6767
toxenv: [api_func_v4, cli_func_v4]
6868
steps:
69-
- uses: actions/checkout@v4.1.4
69+
- uses: actions/checkout@v4.2.2
7070
- name: Set up Python
71-
uses: actions/setup-python@v5.1.0
71+
uses: actions/setup-python@v5.3.0
7272
with:
7373
python-version: "3.12"
7474
- name: Install dependencies
@@ -78,18 +78,19 @@ jobs:
7878
TOXENV: ${{ matrix.toxenv }}
7979
run: tox -- --override-ini='log_cli=True'
8080
- name: Upload codecov coverage
81-
uses: codecov/codecov-action@v4.3.1
81+
uses: codecov/codecov-action@v5.1.1
8282
with:
8383
files: ./coverage.xml
8484
flags: ${{ matrix.toxenv }}
8585
fail_ci_if_error: false
86+
token: ${{ secrets.CODECOV_TOKEN }}
8687

8788
coverage:
88-
runs-on: ubuntu-22.04
89+
runs-on: ubuntu-24.04
8990
steps:
90-
- uses: actions/checkout@v4.1.4
91+
- uses: actions/checkout@v4.2.2
9192
- name: Set up Python ${{ matrix.python-version }}
92-
uses: actions/setup-python@v5.1.0
93+
uses: actions/setup-python@v5.3.0
9394
with:
9495
python-version: "3.12"
9596
- name: Install dependencies
@@ -100,26 +101,27 @@ jobs:
100101
TOXENV: cover
101102
run: tox
102103
- name: Upload codecov coverage
103-
uses: codecov/codecov-action@v4.3.1
104+
uses: codecov/codecov-action@v5.1.1
104105
with:
105106
files: ./coverage.xml
106107
flags: unit
107108
fail_ci_if_error: false
109+
token: ${{ secrets.CODECOV_TOKEN }}
108110

109111
dist:
110112
runs-on: ubuntu-latest
111113
name: Python wheel
112114
steps:
113-
- uses: actions/checkout@v4.1.4
114-
- uses: actions/setup-python@v5.1.0
115+
- uses: actions/checkout@v4.2.2
116+
- uses: actions/setup-python@v5.3.0
115117
with:
116118
python-version: "3.12"
117119
- name: Install dependencies
118120
run: |
119121
pip install -r requirements-test.txt
120122
- name: Build package
121123
run: python -m build -o dist/
122-
- uses: actions/upload-artifact@v4.3.3
124+
- uses: actions/upload-artifact@v4.4.3
123125
with:
124126
name: dist
125127
path: dist
@@ -128,12 +130,12 @@ jobs:
128130
runs-on: ubuntu-latest
129131
needs: [dist]
130132
steps:
131-
- uses: actions/checkout@v4.1.4
133+
- uses: actions/checkout@v4.2.2
132134
- name: Set up Python
133-
uses: actions/setup-python@v5.1.0
135+
uses: actions/setup-python@v5.3.0
134136
with:
135137
python-version: '3.12'
136-
- uses: actions/download-artifact@v4.1.7
138+
- uses: actions/download-artifact@v4.1.8
137139
with:
138140
name: dist
139141
path: dist

‎.gitlab-ci.yml‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,44 @@
1-
image: python:3.12
1+
image: python:3.13
22

33
stages:
4+
- build
45
- deploy
56
- promote
67

7-
deploy-images:
8-
stage: deploy
8+
build-images:
9+
stage: build
910
image:
1011
name: gcr.io/kaniko-project/executor:debug
1112
entrypoint: [""]
1213
script:
13-
- executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-alpine
14-
- executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-slim-bullseye --build-arg PYTHON_FLAVOR=slim-bullseye
14+
- executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE/$OS_ARCH:$CI_COMMIT_TAG-alpine
15+
- executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE/$OS_ARCH:$CI_COMMIT_TAG-slim-bullseye --build-arg PYTHON_FLAVOR=slim-bullseye
16+
rules:
17+
- if: $CI_COMMIT_TAG
18+
tags:
19+
- $RUNNER_TAG
20+
parallel:
21+
matrix:
22+
# See tags in https://docs.gitlab.com/ee/ci/runners/hosted_runners/linux.html
23+
- RUNNER_TAG: saas-linux-medium-amd64
24+
OS_ARCH: linux/amd64
25+
- RUNNER_TAG: saas-linux-medium-arm64
26+
OS_ARCH: linux/arm64
27+
28+
deploy-images:
29+
stage: deploy
30+
image:
31+
name: mplatform/manifest-tool:alpine-v2.0.4@sha256:38b399ff66f9df247af59facceb7b60e2cd01c2d649aae318da7587efb4bbf87
32+
entrypoint: [""]
33+
script:
34+
- manifest-tool --username $CI_REGISTRY_USER --password $CI_REGISTRY_PASSWORD push from-args
35+
--platforms linux/amd64,linux/arm64
36+
--template $CI_REGISTRY_IMAGE/OS/ARCH:$CI_COMMIT_TAG-alpine
37+
--target $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-alpine
38+
- manifest-tool --username $CI_REGISTRY_USER --password $CI_REGISTRY_PASSWORD push from-args
39+
--platforms linux/amd64,linux/arm64
40+
--template $CI_REGISTRY_IMAGE/OS/ARCH:$CI_COMMIT_TAG-slim-bullseye
41+
--target $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-slim-bullseye
1542
rules:
1643
- if: $CI_COMMIT_TAG
1744

0 commit comments

Comments
 (0)