Skip to content

Commit 2e989ca

Browse files
committed
Merge dev into feature/code-quality-phase1 - Resolved conflict in lint.yml
2 parents d3e155a + 0740d55 commit 2e989ca

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

.github/workflows/lint.yml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
cp pyproject.toml .github/linters
4848
4949
- name: Pylint
50-
uses: super-linter/super-linter/slim@v7.2.1
50+
uses: super-linter/super-linter/slim@v7.3.0
5151
if: always()
5252
env:
5353
# run linter on everything to catch preexisting problems
@@ -81,3 +81,38 @@ jobs:
8181

8282
- name: Run ruff format check
8383
run: ruff format --check .
84+
85+
black:
86+
name: Lint Code Base (black)
87+
runs-on: ubuntu-latest
88+
89+
steps:
90+
- name: Checkout Code
91+
uses: actions/checkout@v4
92+
with:
93+
# super-linter needs the full git history to get the
94+
# list of files that changed across commits
95+
fetch-depth: 0
96+
97+
- name: Set up Python 3.8
98+
uses: actions/setup-python@v5
99+
with:
100+
python-version: 3.8
101+
102+
- name: Install dependencies
103+
run: |
104+
mkdir -p .github/linters
105+
cp pyproject.toml .github/linters
106+
107+
- name: Black
108+
uses: super-linter/super-linter/[email protected]
109+
if: always()
110+
env:
111+
# run linter on everything to catch preexisting problems
112+
VALIDATE_ALL_CODEBASE: true
113+
DEFAULT_BRANCH: master
114+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115+
# Run only black
116+
VALIDATE_PYTHON_BLACK: true
117+
PYTHON_BLACK_CONFIG_FILE: pyproject.toml
118+
FILTER_REGEX_EXCLUDE: .*tests/.*.(json|zip|sol)

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
path: dist/
4646

4747
- name: publish
48-
uses: pypa/[email protected].3
48+
uses: pypa/[email protected].4
4949

5050
- name: sign
5151
uses: sigstore/[email protected]

0 commit comments

Comments
 (0)