Skip to content

Commit e0e9d5d

Browse files
authored
Merge pull request #105 from MC-kit/devel
Devel
2 parents b25c9de + baa1853 commit e0e9d5d

38 files changed

+1281
-994
lines changed

.flake8

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
# select=ANN,B,B9,BLK,C,D,DAR,E,F,I,S,W
2+
# select=ANN,B,B9,BLK,C,D,DAR,E,F,TC,I,S,W
33
select=ANN,B,B9,BLK,C,D,DAR,E,F,TC,S,W
44
max-complexity=10
55
max-line-length=88
@@ -8,6 +8,8 @@ ignore=
88
ANN101
99
# ANN102 Missing type annotation for cls in classmethod
1010
ANN102
11+
# C812 Missing trailing comma: black compatibility
12+
C812
1113
# Missing docstring in __init__
1214
D107
1315
# E203: Whitespace before ‘:'
@@ -18,17 +20,22 @@ ignore=
1820
W503
1921
exclude=
2022
.git
21-
noxfile.py
2223
__pycache__
2324
src/mapstp/cli/runner.py
2425
docs/source/conf.py
2526
adhoc
2627
wrk
2728
build
2829
dist
29-
tools
30+
tools/install-poetry.py
31+
*.pyc
32+
*.egg-info
33+
.cache
34+
.eggs
3035
per-file-ignores =
3136
noxfile.py:ANN,DAR101
37+
tools/clear-prev-dist-info.py:S404,S603,S607
38+
tools/install_flake8_deps.py:S404,S603,S607,B950
3239
config.py:ANN001,ANN201
3340
src/tests/*:S101,ANN,DAR100,D100,D103,DAR101,DAR103
3441
ignore-decorators=click,pytest

.github/constraints.txt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
pip==22.2.2
2+
nox==2022.8.7
3+
poetry==1.2.0
4+
virtualenv==20.16.4

.github/release-drafter.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name-template: 'v$RESOLVED_VERSION 🌈'
1+
name-template: 'v$RESOLVED_VERSION 🎨'
22
tag-template: 'v$RESOLVED_VERSION'
33
categories:
44
- title: ':boom: Breaking Changes'
@@ -59,9 +59,10 @@ version-resolver:
5959
- 'patch'
6060
default: patch
6161
template: |
62-
## Whats Changed
62+
## What's Changed
6363
6464
$CHANGES
6565
6666
## Contributors
67+
6768
$CONTRIBUTORS

.github/workflows/clean-workflow-logs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# repo: ${{ github.event.repository.name }}
2323
# days_old: ${{ github.event.inputs.days_old }}
2424
- name: Clean workflow runs
25-
uses: dmvict/clean-workflow-runs@v1.0.0
25+
uses: dmvict/clean-workflow-runs@v1.2.0
2626
with:
2727
token: ${{ secrets.MCKIT_GITHUB_TOKEN }}
2828
save_period: 30

.github/workflows/combine-prs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
# Steps represent a sequence of tasks that will be executed as part of the job
3636
steps:
37-
- uses: actions/github-script@v3
37+
- uses: actions/github-script@v6
3838
id: fetch-branch-names
3939
name: Fetch branch names
4040
with:
@@ -100,7 +100,7 @@ jobs:
100100
console.log('Combined: ' + combined);
101101
return combined
102102
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
103-
- uses: actions/checkout@v2.3.3
103+
- uses: actions/checkout@v3.0.2
104104
with:
105105
fetch-depth: 0
106106
# Creates a branch with other PR branches merged together
@@ -126,7 +126,7 @@ jobs:
126126
git pull origin $sourcebranches --no-edit
127127
git push origin $COMBINE_BRANCH_NAME
128128
# Creates a PR with the new combined branch
129-
- uses: actions/github-script@v3
129+
- uses: actions/github-script@v6
130130
name: Create Combined Pull Request
131131
env:
132132
PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }}

.github/workflows/constraints.txt

-5
This file was deleted.

.github/workflows/coverage.yml

-22
This file was deleted.

.github/workflows/labeler.yml

+18-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
1-
name: Labeler
1+
name: Create Repository Labels
22

33
on:
44
push:
55
branches:
66
- main
77
- master
88
- devel
9+
paths:
10+
- .github/labels.yml
11+
- .github/workflows/labeler.yml
12+
pull_request:
13+
branches:
14+
- master
15+
paths:
16+
- .github/labels.yaml
17+
- .github/workflows/labeler.yml
18+
schedule:
19+
- cron: "0 0 * * TUE"
920

1021
jobs:
11-
labeler:
22+
labels:
23+
name: Sycnchronize repository labels
1224
runs-on: ubuntu-latest
1325
steps:
1426
- name: Check out the repository
15-
uses: actions/checkout@v3
27+
uses: actions/checkout@v3.0.2
1628

17-
- name: Run Labeler
29+
- name: Sync GitHub Issue Labels
1830
uses: crazy-max/[email protected]
1931
with:
32+
github-token: ${{ secrets.MCKIT_GITHUB_TOKEN }}
2033
skip-delete: true
34+
dry-run: ${{ github.ref != 'refs/heads/master' }}

.github/workflows/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
draft_release:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: release-drafter/[email protected].0
10+
- uses: release-drafter/[email protected].1
1111
env:
1212
GITHUB_TOKEN: ${{ secrets.MCKIT_GITHUB_TOKEN }}

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323

2424
- name: Upgrade pip
2525
run: |
26-
pip install --constraint=.github/workflows/constraints.txt pip
26+
pip install --constraint=.github/constraints.txt pip
2727
pip --version
2828
2929
- name: Install Poetry
3030
run: |
31-
pip install --constraint=.github/workflows/constraints.txt poetry
31+
pip install --constraint=.github/constraints.txt poetry
3232
poetry --version
3333
3434
- name: Check if there is a parent commit
@@ -70,7 +70,7 @@ jobs:
7070
repository_url: https://test.pypi.org/legacy/
7171

7272
- name: Publish the release notes
73-
uses: release-drafter/[email protected].0
73+
uses: release-drafter/[email protected].1
7474
with:
7575
publish: ${{ steps.check-version.outputs.tag != '' }}
7676
tag: ${{ steps.check-version.outputs.tag }}

.github/workflows/release.yml.bak

-71
This file was deleted.

.github/workflows/test-pypi.yml

+12-13
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ defaults:
55
shell: bash
66

77
on:
8-
push:
9-
branches:
10-
- master
8+
workflow_dispatch:
9+
# push:
10+
# branches:
11+
# - master
1112
jobs:
1213
lint:
1314
name: "Code quality check"
1415
runs-on: ubuntu-latest
1516
if: |
16-
!startsWith(github.event.head_commit.message, 'bump:') &&
1717
!contains(github.event.head_commit.message, '[skip_ci]')
1818
steps:
1919
- name: Checkout repository
@@ -28,25 +28,24 @@ jobs:
2828
run: |
2929
set -e
3030
python -m ensurepip
31-
python -m pip install --constraint=.github/workflows/constraints.txt pip
31+
python -m pip install --constraint=.github/constraints.txt pip
3232
- name: Install nox
33-
run: pip install --constraint=.github/workflows/constraints.txt nox nox-poetry
33+
run: pip install --constraint=.github/constraints.txt nox nox-poetry
3434
- name: Install poetry
35-
run: pip install --constraint=.github/workflows/constraints.txt poetry
35+
run: pip install --constraint=.github/constraints.txt poetry
3636
- name: Run nox tests
37-
run: nox --python 3.9
37+
run: nox --python 3.10
3838
build_wheels:
3939
name: "Python ${{ matrix.python-version }} on ${{ matrix.os }}"
4040
needs: lint
4141
runs-on: "${{ matrix.os }}"
4242
if: |
43-
!startsWith(github.event.head_commit.message, 'bump:') &&
4443
!contains(github.event.head_commit.message, '[skip_ci]')
4544
strategy:
4645
fail-fast: false
4746
matrix:
4847
os: [ubuntu-latest] # , macos-latest, windows-latest]
49-
python-version: ['3.9']
48+
python-version: ['3.10']
5049
steps:
5150
- uses: actions/checkout@v3
5251
- uses: actions/setup-python@v4
@@ -57,8 +56,8 @@ jobs:
5756
run: |
5857
set -e
5958
python -m ensurepip
60-
python -m pip install --constraint=.github/workflows/constraints.txt pip
61-
pip install --constraint=.github/workflows/constraints.txt poetry
59+
python -m pip install --constraint=.github/constraints.txt pip
60+
pip install --constraint=.github/constraints.txt poetry
6261
- run: |
6362
set -e
6463
poetry version patch
@@ -71,7 +70,7 @@ jobs:
7170
run: poetry build -f wheel
7271
- name: Build sdist
7372
run: poetry build -s sdist
74-
if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9'
73+
if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
7574
- name: GitHub Release wheels (deploy)
7675
if: (github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags'))
7776
uses: softprops/action-gh-release@v1

0 commit comments

Comments
 (0)