Skip to content

Commit 2718e6b

Browse files
committed
fix: arglist items now applied to proper tools
1 parent 3af2287 commit 2718e6b

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

entrypoint.sh

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
# Parameters
44
#
55
# $1 - python-root-list
6-
# $2 - use-pylint
7-
# $3 - use-pycodestyle
8-
# $4 - use-flake8
9-
# $5 - use-black
10-
# $6 - use-mypy
11-
# $7 - use-isort
12-
# $8 - use-docformatter
13-
# $9 - use-pydocstyle
14-
# $10 - extra-pylint-options
15-
# $11 - extra-pycodestyle-options
16-
# ${12} - extra-flake8-options
17-
# ${13} - extra-black-options
18-
# ${14} - extra-mypy-options
19-
# ${15} - extra-isort-options
20-
# ${16} - extra-docformatter-options
21-
# ${17} - extra-pydocstyle-options
6+
# $2 - use-black
7+
# $3 - use-isort
8+
# $4 - use-docformatter
9+
# $5 - use-pycodestyle
10+
# $6 - use-pydocstyle
11+
# $7 - use-mypy
12+
# $8 - use-pylint
13+
# $9 - use-flake8
14+
# $10 - extra-black-options
15+
# $11 - extra-isort-options
16+
# ${12} - extra-docformatter-options
17+
# ${13} - extra-pycodestyle-options
18+
# ${14} - extra-pydocstyle-options
19+
# ${15} - extra-mypy-options
20+
# ${16} - extra-pylint-options
21+
# ${17} - extra-flake8-options
2222

2323
# Run the autoformatters first.
24-
if [ "$5" = true ] ; then
24+
if [ "$2" = true ] ; then
2525

26-
echo Running: black --check ${13} $1
26+
echo Running: black --check ${10} $1
2727

28-
black --check ${13} $1
28+
black --check ${10} $1
2929
exit_code=$?
3030

3131
if [ "$exit_code" = "0" ]; then
@@ -37,11 +37,11 @@ if [ "$5" = true ] ; then
3737

3838
fi
3939

40-
if [ "$7" = true ] ; then
40+
if [ "$3" = true ] ; then
4141

42-
echo Running: isort ${15} $1 -c --diff
42+
echo Running: isort ${11} $1 -c --diff
4343

44-
isort ${15} $1 -c --diff
44+
isort ${11} $1 -c --diff
4545
exit_code=$?
4646

4747
if [ "$exit_code" = "0" ]; then
@@ -53,11 +53,11 @@ if [ "$7" = true ] ; then
5353

5454
fi
5555

56-
if [ "$8" = true ] ; then
56+
if [ "$4" = true ] ; then
5757

58-
echo Running: docformatter -c --recursive ${16} $1
58+
echo Running: docformatter -c --recursive ${12} $1
5959

60-
docformatter -c --recursive ${16} $1
60+
docformatter -c --recursive ${12} $1
6161
exit_code=$?
6262

6363
if [ "$exit_code" = "0" ]; then
@@ -71,11 +71,11 @@ if [ "$8" = true ] ; then
7171
fi
7272

7373
# Then check the autoformatter results.
74-
if [ "$3" = true ] ; then
74+
if [ "$5" = true ] ; then
7575

76-
echo Running: pycodestyle ${11} $1
76+
echo Running: pycodestyle ${13} $1
7777

78-
pycodestyle ${11} $1
78+
pycodestyle ${13} $1
7979
exit_code=$?
8080

8181
if [ "$exit_code" = "0" ]; then
@@ -87,11 +87,11 @@ if [ "$3" = true ] ; then
8787

8888
fi
8989

90-
if [ "$9" = true ] ; then
90+
if [ "$6" = true ] ; then
9191

92-
echo Running: pydocstyle ${17} $1
92+
echo Running: pydocstyle ${14} $1
9393

94-
pydocstyle ${17} $1
94+
pydocstyle ${14} $1
9595
exit_code=$?
9696

9797
if [ "$exit_code" = 0 ]; then
@@ -103,11 +103,11 @@ if [ "$9" = true ] ; then
103103
fi
104104

105105
# Next type check everything.
106-
if [ "$6" = true ] ; then
106+
if [ "$7" = true ] ; then
107107

108-
echo Running: mypy ${14} $1
108+
echo Running: mypy ${15} $1
109109

110-
mypy ${14} $1
110+
mypy ${15} $1
111111
exit_code=$?
112112

113113
if [ "$exit_code" = "0" ]; then
@@ -120,11 +120,11 @@ if [ "$6" = true ] ; then
120120
fi
121121

122122
# Finally, lint the code.
123-
if [ "$2" = true ] ; then
123+
if [ "$8" = true ] ; then
124124

125-
echo Running: pylint ${10} $1
125+
echo Running: pylint ${16} $1
126126

127-
pylint ${10} $1
127+
pylint ${16} $1
128128
exit_code=$?
129129

130130
if [ "$exit_code" = "0" ]; then
@@ -136,11 +136,11 @@ if [ "$2" = true ] ; then
136136

137137
fi
138138

139-
if [ "$4" = true ] ; then
139+
if [ "$9" = true ] ; then
140140

141-
echo Running: flake8 ${12} $1
141+
echo Running: flake8 ${17} $1
142142

143-
flake8 ${12} $1
143+
flake8 ${17} $1
144144
exit_code=$?
145145

146146
if [ "$exit_code" = "0" ]; then

0 commit comments

Comments
 (0)