File tree Expand file tree Collapse file tree 5 files changed +740
-58
lines changed Expand file tree Collapse file tree 5 files changed +740
-58
lines changed Original file line number Diff line number Diff line change 1
1
# This is a dev file for testing the changes to this repo
2
2
docker build . -t satel/python-base:latest
3
3
cd tests/
4
- docker build . -t docker-python-base
4
+ docker build . --build-arg DEVFLAG=--dev - t docker-python-base
5
5
6
6
case $1 in
7
7
run)
Original file line number Diff line number Diff line change @@ -15,12 +15,12 @@ checkuser() {
15
15
16
16
17
17
reportvalidation () {
18
- if [ -z " $1 " ]
18
+ if [ " $1 " -eq 0 ]
19
19
then
20
20
echo " OK"
21
21
else
22
22
echo -e " \e[1m\e[91mFAILED\e[21m\e[39m"
23
- echo " $1 "
23
+ echo " $2 "
24
24
fi
25
25
}
26
26
@@ -39,15 +39,18 @@ python -m pytest -vv --durations=3 --cov ./ --cov-report term-missing $PYTEST_RE
39
39
40
40
echo -ne " $SECTION_PREFIX CHECK DOCKER USER IS PYTHON: "
41
41
USEROUT=` checkuser`
42
- reportvalidation " $USEROUT " ; STATUS2=$?
42
+ STATUS2=$?
43
+ reportvalidation " $STATUS2 " " $USEROUT "
43
44
44
45
echo -ne " $SECTION_PREFIX CHECK TYPING: "
45
46
MYPYOUT=` mypy --cache-dir /home/python --no-error-summary . $MYPY_REPORTS `
46
- reportvalidation " $MYPYOUT " ; STATUS3=$?
47
+ STATUS3=$?
48
+ reportvalidation " $STATUS3 " " $MYPYOUT "
47
49
48
50
echo -ne " $SECTION_PREFIX CHECK LINTING: "
49
51
FLAKE8OUT=` flake8`
50
- reportvalidation " $FLAKE8OUT " ; STATUS4=$?
52
+ STATUS4=$?
53
+ reportvalidation " $STATUS4 " " $FLAKE8OUT "
51
54
52
55
echo -ne " $SECTION_PREFIX CHECK FORMATTING: "
53
56
BLACKOUT=` black --skip-string-normalization --line-length 99 ./ --check 2>&1 ` ; STATUS5=$?
59
62
echo " $BLACKOUT "
60
63
fi
61
64
62
- echo
63
-
64
65
echo -ne " $SECTION_PREFIX CHECK DOCSTRINGS: "
65
66
INTERROGATEOUT=` interrogate`
66
- reportvalidation " $INTERROGATEOUT " ; STATUS5=$?
67
+ STATUS5=$?
68
+ reportvalidation " $STATUS5 " " $INTERROGATEOUT "
67
69
68
70
if [[ $1 == " reports" ]]
69
71
then
72
74
echo
73
75
fi
74
76
75
- TOTAL=$(( STATUS1 + STATUS2 + STATUS3 + STATUS4 + STATUS5 + STATUS 6 ))
77
+ TOTAL=$(( STATUS1 + STATUS2 + STATUS3 + STATUS4 + STATUS5 ))
76
78
exit $TOTAL
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ ARG IMAGE_VERSION=satel/python-base:latest
4
4
FROM python:3.10.5-slim AS requirements-stage
5
5
6
6
RUN pip install poetry
7
- COPY ./pyproject.toml ./poetry.lock* ./
7
+ COPY ./pyproject.toml ./poetry.lock ./
8
8
9
9
# Generate the requirement file
10
10
ARG DEVFLAG
You can’t perform that action at this time.
0 commit comments