Skip to content

Commit 05557f2

Browse files
authored
Merge branch 'main' into patch-1
2 parents 3910048 + ac7e329 commit 05557f2

File tree

190 files changed

+5557
-2730
lines changed

Some content is hidden

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

190 files changed

+5557
-2730
lines changed

.commitlintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"extends": ["@commitlint/config-conventional"]
2+
"extends": ["@commitlint/config-conventional"],
3+
"rules": {
4+
"footer-max-line-length": [2, "always", 200]
5+
}
36
}

.github/workflows/docs.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
name: Docs
22

3+
# If a pull-request is pushed then cancel all previously running jobs related
4+
# to that pull-request
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
7+
cancel-in-progress: true
8+
39
on:
410
push:
511
branches:
6-
- master
12+
- main
713
pull_request:
814
branches:
15+
- main
916
- master
1017

1118
env:
@@ -19,7 +26,7 @@ jobs:
1926
- name: Set up Python
2027
uses: actions/setup-python@v2
2128
with:
22-
python-version: 3.9
29+
python-version: "3.10"
2330
- name: Install dependencies
2431
run: pip install tox
2532
- name: Build docs
@@ -34,7 +41,7 @@ jobs:
3441
- name: Set up Python
3542
uses: actions/setup-python@v2
3643
with:
37-
python-version: 3.9
44+
python-version: "3.10"
3845
- name: Install dependencies
3946
run: pip install tox twine wheel
4047
- name: Check twine readme rendering

.github/workflows/lint.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
name: Lint
22

3+
# If a pull-request is pushed then cancel all previously running jobs related
4+
# to that pull-request
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
7+
cancel-in-progress: true
8+
39
on:
410
push:
511
branches:
6-
- master
12+
- main
713
pull_request:
814
branches:
15+
- main
916
- master
1017

1118
env:
@@ -34,3 +41,5 @@ jobs:
3441
run: tox -e mypy
3542
- name: Run isort import order checker (https://pycqa.github.io/isort/)
3643
run: tox -e isort -- --check
44+
- name: Run pylint Python code static checker (https://www.pylint.org/)
45+
run: tox -e pylint

.github/workflows/lock.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'Lock Closed Issues'
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * 1 '
6+
workflow_dispatch: # For manual cleanup
7+
8+
permissions:
9+
issues: write
10+
11+
concurrency:
12+
group: lock
13+
14+
jobs:
15+
action:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: dessant/lock-threads@v3
19+
with:
20+
process-only: 'issues'

.github/workflows/pre_commit.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: pre_commit
2+
3+
# If a pull-request is pushed then cancel all previously running jobs related
4+
# to that pull-request
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
7+
cancel-in-progress: true
8+
9+
on:
10+
push:
11+
branches:
12+
- main
13+
paths:
14+
.github/workflows/pre_commit.yml
15+
.pre-commit-config.yaml
16+
pull_request:
17+
branches:
18+
- main
19+
- master
20+
paths:
21+
- .github/workflows/pre_commit.yml
22+
- .pre-commit-config.yaml
23+
24+
env:
25+
PY_COLORS: 1
26+
27+
jobs:
28+
29+
pre_commit:
30+
runs-on: ubuntu-latest
31+
steps:
32+
- uses: actions/checkout@v2
33+
- uses: actions/setup-python@v2
34+
- run: pip install --upgrade -r requirements.txt -r requirements-lint.txt pre-commit
35+
- name: Run pre-commit install
36+
run: pre-commit install
37+
- name: pre-commit run all-files
38+
run: pre-commit run --all-files

.github/workflows/test.yml

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,60 @@
11
name: Test
22

3+
# If a pull-request is pushed then cancel all previously running jobs related
4+
# to that pull-request
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
7+
cancel-in-progress: true
8+
39
on:
410
push:
511
branches:
6-
- master
12+
- main
713
pull_request:
814
branches:
15+
- main
916
- master
1017

1118
env:
1219
PY_COLORS: 1
1320

1421
jobs:
1522
unit:
16-
runs-on: ubuntu-20.04
23+
runs-on: ${{ matrix.os }}
1724
strategy:
1825
matrix:
19-
include:
20-
- python-version: 3.6
21-
toxenv: py36
22-
- python-version: 3.7
26+
os: [ubuntu-latest]
27+
python:
28+
- version: "3.7"
2329
toxenv: py37
24-
- python-version: 3.8
30+
- version: "3.8"
2531
toxenv: py38
26-
- python-version: 3.9
32+
- version: "3.9"
2733
toxenv: py39
34+
- version: "3.10"
35+
toxenv: py310,smoke
36+
- version: '3.11.0-alpha - 3.11' # SemVer's version range syntax
37+
toxenv: py311,smoke
38+
include:
39+
- os: macos-latest
40+
python:
41+
version: "3.10"
42+
toxenv: py310,smoke
43+
- os: windows-latest
44+
python:
45+
version: "3.10"
46+
toxenv: py310,smoke
2847
steps:
2948
- uses: actions/checkout@v2
30-
- name: Set up Python ${{ matrix.python-version }}
49+
- name: Set up Python ${{ matrix.python.version }}
3150
uses: actions/setup-python@v2
3251
with:
33-
python-version: ${{ matrix.python-version }}
52+
python-version: ${{ matrix.python.version }}
3453
- name: Install dependencies
35-
run: pip install tox pytest-github-actions-annotate-failures
54+
run: pip3 install tox pytest-github-actions-annotate-failures
3655
- name: Run tests
3756
env:
38-
TOXENV: ${{ matrix.toxenv }}
57+
TOXENV: ${{ matrix.python.toxenv }}
3958
run: tox
4059

4160
functional:
@@ -48,15 +67,15 @@ jobs:
4867
- name: Set up Python
4968
uses: actions/setup-python@v2
5069
with:
51-
python-version: 3.9
70+
python-version: "3.10"
5271
- name: Install dependencies
5372
run: pip install tox pytest-github-actions-annotate-failures
5473
- name: Run tests
5574
env:
5675
TOXENV: ${{ matrix.toxenv }}
5776
run: tox
5877
- name: Upload codecov coverage
59-
uses: codecov/codecov-action@v1
78+
uses: codecov/codecov-action@v2
6079
with:
6180
files: ./coverage.xml
6281
flags: ${{ matrix.toxenv }}
@@ -69,7 +88,7 @@ jobs:
6988
- name: Set up Python ${{ matrix.python-version }}
7089
uses: actions/setup-python@v2
7190
with:
72-
python-version: 3.9
91+
python-version: "3.10"
7392
- name: Install dependencies
7493
run: pip install tox pytest-github-actions-annotate-failures
7594
- name: Run tests
@@ -78,7 +97,7 @@ jobs:
7897
TOXENV: cover
7998
run: tox
8099
- name: Upload codecov coverage
81-
uses: codecov/codecov-action@v1
100+
uses: codecov/codecov-action@v2
82101
with:
83102
files: ./coverage.xml
84103
flags: unit

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: python:3.9
1+
image: python:3.10
22

33
stages:
44
- deploy

.mypy.ini

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

.pre-commit-config.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,22 @@ repos:
2020
rev: 5.9.3
2121
hooks:
2222
- id: isort
23+
- repo: https://github.com/pycqa/pylint
24+
rev: v2.12.2
25+
hooks:
26+
- id: pylint
27+
additional_dependencies:
28+
- argcomplete==1.12.3
29+
- pytest==6.2.5
30+
- requests==2.26.0
31+
- requests-toolbelt==0.9.1
32+
files: 'gitlab/'
2333
- repo: https://github.com/pre-commit/mirrors-mypy
24-
rev: v0.812
34+
rev: v0.910
2535
hooks:
2636
- id: mypy
37+
args: []
38+
additional_dependencies:
39+
- types-PyYAML==6.0.1
40+
- types-requests==2.26.2
41+
- types-setuptools==57.4.4

.renovaterc.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,33 @@
77
},
88
"regexManagers": [
99
{
10-
"fileMatch": ["^tests/functional/fixtures/.env$"],
10+
"fileMatch": ["^tests\\/functional\\/fixtures\\/.env$"],
1111
"matchStrings": ["GITLAB_TAG=(?<currentValue>.*?)\n"],
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
21-
}
27+
},
28+
{
29+
"matchPackagePrefixes": ["types-"],
30+
"groupName": "typing dependencies"
31+
},
32+
{
33+
"matchPackagePatterns": ["(^|/)black$"],
34+
"versioning": "pep440",
35+
"ignoreUnstable": false,
36+
"groupName": "black"
37+
}
2238
]
2339
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy