Skip to content

Commit 780ddc1

Browse files
TCatshoekTCatshoek
committed
Merge remote-tracking branch 'upstream/main'
2 parents 5a97cdb + f9b7c7b commit 780ddc1

File tree

123 files changed

+2374
-697
lines changed

Some content is hidden

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

123 files changed

+2374
-697
lines changed

‎.commitlintrc.json‎

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

‎.dockerignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
.tox/
2+
.venv/
13
venv/
24
dist/
35
build/
46
*.egg-info
7+
.coverage
58
.github/
9+
coverage.xml

‎.github/workflows/lint.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,20 @@ env:
1919
PY_COLORS: 1
2020

2121
jobs:
22-
commitlint:
22+
lint:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v3
2626
with:
2727
fetch-depth: 0
28-
- uses: wagoid/commitlint-github-action@v4
29-
30-
linters:
31-
runs-on: ubuntu-latest
32-
steps:
33-
- uses: actions/checkout@v3
3428
- uses: actions/setup-python@v3
3529
- run: pip install --upgrade tox
30+
- name: Run commitizen (https://commitizen-tools.github.io/commitizen/)
31+
run: tox -e cz
3632
- name: Run black code formatter (https://black.readthedocs.io/en/stable/)
3733
run: tox -e black -- --check
3834
- name: Run flake8 (https://flake8.pycqa.org/en/latest/)
39-
run: tox -e pep8
35+
run: tox -e flake8
4036
- name: Run mypy static typing checker (http://mypy-lang.org/)
4137
run: tox -e mypy
4238
- name: Run isort import order checker (https://pycqa.github.io/isort/)

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fetch-depth: 0
1616
token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
1717
- name: Python Semantic Release
18-
uses: relekang/python-semantic-release@master
18+
uses: relekang/python-semantic-release@v7.28.1
1919
with:
2020
github_token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
2121
pypi_token: ${{ secrets.PYPI_TOKEN }}

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Run tests
5656
env:
5757
TOXENV: ${{ matrix.python.toxenv }}
58-
run: tox
58+
run: tox --skip-missing-interpreters false
5959

6060
functional:
6161
runs-on: ubuntu-20.04

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ docs/_build
1515
venv/
1616

1717
# Include tracked hidden files and directories in search and diff tools
18-
!.commitlintrc.json
1918
!.dockerignore
2019
!.env
2120
!.github/

‎.gitlab-ci.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,30 @@ image: python:3.10
22

33
stages:
44
- deploy
5-
- deploy-latest
5+
- promote
66

7-
deploy_image:
7+
deploy-images:
88
stage: deploy
99
image:
1010
name: gcr.io/kaniko-project/executor:debug
1111
entrypoint: [""]
1212
script:
1313
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
14-
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
15-
only:
16-
- tags
14+
- executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-alpine
15+
- 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
16+
rules:
17+
- if: $CI_COMMIT_TAG
1718

18-
deploy-latest:
19-
stage: deploy-latest
19+
tag-latest:
20+
stage: promote
2021
image:
2122
name: gcr.io/go-containerregistry/crane:debug
2223
entrypoint: [""]
2324
script:
24-
- mkdir /root/.docker && echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /root/.docker/config.json
25-
- /ko-app/crane cp $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG $CI_REGISTRY_IMAGE:latest
26-
only:
27-
- tags
25+
- crane auth login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
26+
- crane tag $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-alpine ${CI_COMMIT_TAG} # /python-gitlab:v1.2.3
27+
- crane tag $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-alpine latest # /python-gitlab:latest
28+
- crane tag $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-alpine alpine # /python-gitlab:alpine
29+
- crane tag $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-slim-bullseye slim-bullseye # /python-gitlab:slim-bullseye
30+
rules:
31+
- if: $CI_COMMIT_TAG

‎.pre-commit-config.yaml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ repos:
66
rev: 22.3.0
77
hooks:
88
- id: black
9-
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
10-
rev: v8.0.0
9+
- repo: https://github.com/commitizen-tools/commitizen
10+
rev: v2.27.1
1111
hooks:
12-
- id: commitlint
13-
additional_dependencies: ['@commitlint/config-conventional']
12+
- id: commitizen
1413
stages: [commit-msg]
1514
- repo: https://github.com/pycqa/flake8
1615
rev: 4.0.1
@@ -21,21 +20,21 @@ repos:
2120
hooks:
2221
- id: isort
2322
- repo: https://github.com/pycqa/pylint
24-
rev: v2.13.5
23+
rev: v2.13.9
2524
hooks:
2625
- id: pylint
2726
additional_dependencies:
2827
- argcomplete==2.0.0
29-
- pytest==7.1.1
30-
- requests==2.27.1
28+
- pytest==7.1.2
29+
- requests==2.28.0
3130
- requests-toolbelt==0.9.1
3231
files: 'gitlab/'
3332
- repo: https://github.com/pre-commit/mirrors-mypy
34-
rev: v0.930
33+
rev: v0.961
3534
hooks:
3635
- id: mypy
3736
args: []
3837
additional_dependencies:
39-
- types-PyYAML==6.0.5
40-
- types-requests==2.27.16
41-
- types-setuptools==57.4.12
38+
- types-PyYAML==6.0.8
39+
- types-requests==2.27.30
40+
- types-setuptools==57.4.17

‎.renovaterc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": [
33
"config:base",
4-
":enablePreCommit"
4+
":enablePreCommit",
5+
"schedule:weekly"
56
],
67
"pip_requirements": {
78
"fileMatch": ["^requirements(-[\\w]*)?\\.txt$"]

‎CHANGELOG.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,39 @@
22

33
<!--next-version-placeholder-->
44

5+
## v3.5.0 (2022-05-28)
6+
### Feature
7+
* **objects:** Support get project storage endpoint ([`8867ee5`](https://github.com/python-gitlab/python-gitlab/commit/8867ee59884ae81d6457ad6e561a0573017cf6b2))
8+
* Display human-readable attribute in `repr()` if present ([`6b47c26`](https://github.com/python-gitlab/python-gitlab/commit/6b47c26d053fe352d68eb22a1eaf4b9a3c1c93e7))
9+
* **ux:** Display project.name_with_namespace on project repr ([`e598762`](https://github.com/python-gitlab/python-gitlab/commit/e5987626ca1643521b16658555f088412be2a339))
10+
11+
### Fix
12+
* **cli:** Changed default `allow_abbrev` value to fix arguments collision problem ([#2013](https://github.com/python-gitlab/python-gitlab/issues/2013)) ([`d68cacf`](https://github.com/python-gitlab/python-gitlab/commit/d68cacfeda5599c62a593ecb9da2505c22326644))
13+
* Duplicate subparsers being added to argparse ([`f553fd3`](https://github.com/python-gitlab/python-gitlab/commit/f553fd3c79579ab596230edea5899dc5189b0ac6))
14+
15+
### Documentation
16+
* Update issue example and extend API usage docs ([`aad71d2`](https://github.com/python-gitlab/python-gitlab/commit/aad71d282d60dc328b364bcc951d0c9b44ab13fa))
17+
* **CONTRIBUTING.rst:** Fix link to conventional-changelog commit format documentation ([`2373a4f`](https://github.com/python-gitlab/python-gitlab/commit/2373a4f13ee4e5279a424416cdf46782a5627067))
18+
* Add missing Admin access const value ([`3e0d4d9`](https://github.com/python-gitlab/python-gitlab/commit/3e0d4d9006e2ca6effae2b01cef3926dd0850e52))
19+
* **merge_requests:** Add new possible merge request state and link to the upstream docs ([`e660fa8`](https://github.com/python-gitlab/python-gitlab/commit/e660fa8386ed7783da5c076bc0fef83e6a66f9a8))
20+
21+
## v3.4.0 (2022-04-28)
22+
### Feature
23+
* Emit a warning when using a `list()` method returns max ([`1339d64`](https://github.com/python-gitlab/python-gitlab/commit/1339d645ce58a2e1198b898b9549ba5917b1ff12))
24+
* **objects:** Support getting project/group deploy tokens by id ([`fcd37fe`](https://github.com/python-gitlab/python-gitlab/commit/fcd37feff132bd5b225cde9d5f9c88e62b3f1fd6))
25+
* **user:** Support getting user SSH key by id ([`6f93c05`](https://github.com/python-gitlab/python-gitlab/commit/6f93c0520f738950a7c67dbeca8d1ac8257e2661))
26+
* **api:** Re-add topic delete endpoint ([`d1d96bd`](https://github.com/python-gitlab/python-gitlab/commit/d1d96bda5f1c6991c8ea61dca8f261e5b74b5ab6))
27+
28+
### Fix
29+
* Add ChunkedEncodingError to list of retryable exceptions ([`7beb20f`](https://github.com/python-gitlab/python-gitlab/commit/7beb20ff7b7b85fb92fc6b647d9c1bdb7568f27c))
30+
* Avoid passing redundant arguments to API ([`3431887`](https://github.com/python-gitlab/python-gitlab/commit/34318871347b9c563d01a13796431c83b3b1d58c))
31+
* **cli:** Add missing filters for project commit list ([`149d244`](https://github.com/python-gitlab/python-gitlab/commit/149d2446fcc79b31d3acde6e6d51adaf37cbb5d3))
32+
* Add 52x range to retry transient failures and tests ([`c3ef1b5`](https://github.com/python-gitlab/python-gitlab/commit/c3ef1b5c1eaf1348a18d753dbf7bda3c129e3262))
33+
* Also retry HTTP-based transient errors ([`3b49e4d`](https://github.com/python-gitlab/python-gitlab/commit/3b49e4d61e6f360f1c787aa048edf584aec55278))
34+
35+
### Documentation
36+
* **api-docs:** Docs fix for application scopes ([`e1ad93d`](https://github.com/python-gitlab/python-gitlab/commit/e1ad93df90e80643866611fe52bd5c59428e7a88))
37+
538
## v3.3.0 (2022-03-28)
639
### Feature
740
* **object:** Add pipeline test report summary support ([`a97e0cf`](https://github.com/python-gitlab/python-gitlab/commit/a97e0cf81b5394b3a2b73d927b4efe675bc85208))

0 commit comments

Comments
 (0)