Skip to content

Commit d66990b

Browse files
authored
Merge branch 'master' into feature/new_distr
2 parents 484ac09 + aea4fd7 commit d66990b

File tree

12 files changed

+1088
-183
lines changed

12 files changed

+1088
-183
lines changed

.Jenkins/workflows/Jenkinsfile_EL9

Lines changed: 66 additions & 66 deletions
Large diffs are not rendered by default.

.flake8

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-FileCopyrightText: 2017 Fermi Research Alliance, LLC
2+
# SPDX-License-Identifier: Apache-2.0
3+
[flake8]
4+
max-line-length = 120
5+
# Do not test build folder
6+
extend-exclude = ./build
7+
# Errors and warnings to ignore
8+
extend-ignore =
9+
# line too long (90 > 79 characters)
10+
E501,
11+
# too many blank lines (2)
12+
E303,
13+
# expected 2 blank lines, found 1
14+
E302,
15+
# at least two spaces before inline comment
16+
E261,
17+
# block comment should start with '# '
18+
E265,
19+
# whitespace before ':'
20+
E203,
21+
# permit line breaks in binary operators
22+
W503,
23+
# permit line breaks in binary operators
24+
W504
25+
exclude: []
26+
count: True
27+
show-source: True
28+
statistics: True

.github/workflows/linters.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ on:
1515

1616
jobs:
1717
run_flake8:
18-
if: ${{ github.ref == 'refs/heads/1.7' }}
19-
name: Run pytest-flake8 against code tree
18+
name: Run flake8 against code tree
2019
runs-on: ubuntu-latest
2120
steps:
2221
- name: checkout code tree
@@ -65,7 +64,7 @@ jobs:
6564
env:
6665
PYTHONPATH: ${{ github.workspace }}/src
6766
run: |
68-
pytest -m flake8 --flake8 --log-level=error
67+
python3 -m flake8
6968
7069
run_pylint:
7170
name: Run pylint against code tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ venv.bak/
107107
# Decision Engine modules
108108
/modules/
109109

110+
# VSCode configuration directory
111+
.vscode/
112+
110113
.DS_Store
111114
*.swp
112115
*.swo

0 commit comments

Comments
 (0)