Merge ~vultaire/charm-prometheus-blackbox-exporter:makefile-20.08 into charm-prometheus-blackbox-exporter:master
- Git
- lp:~vultaire/charm-prometheus-blackbox-exporter
- makefile-20.08
- Merge into master
Proposed by
Paul Goins
Status: | Merged |
---|---|
Merged at revision: | c541de54c0543f7614ff067ba0a39cfadf6fc729 |
Proposed branch: | ~vultaire/charm-prometheus-blackbox-exporter:makefile-20.08 |
Merge into: | charm-prometheus-blackbox-exporter:master |
Diff against target: |
388 lines (+153/-99) 5 files modified
.gitignore (+26/-9) Makefile (+57/-25) dev/null (+0/-65) src/tests/unit/requirements.txt (+1/-0) src/tox.ini (+69/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xav Paice (community) | Approve | ||
Review via email:
|
Commit message
Updated Makefile/
Description of the change
Note: this charm lacked any unit tests, so while I fixed things so the unit tests would pass if there were any to test, the "make unittests" target _does_ fail since there are no tests (and thus no coverage data).
I could add a dummy test if strongly desired, but I feel like that could unintentionally "cover up" that this charm has no unit tests. At the very least I want to call this out so we can decide what to do here.
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Paul Goins (vultaire) wrote : | # |
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Paul Goins (vultaire) wrote : | # |
Re-pushed... Fixed "make lint" to _not_ run black (as that would kind of defeat the point of having a separate black commit)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/.gitignore b/.gitignore | |||
2 | index 2dc89c9..6f1f367 100644 | |||
3 | --- a/.gitignore | |||
4 | +++ b/.gitignore | |||
5 | @@ -1,24 +1,41 @@ | |||
6 | 1 | # Juju files | ||
7 | 2 | .unit-state.db | ||
8 | 3 | .go-cookies | ||
9 | 4 | |||
10 | 5 | layers/* | ||
11 | 6 | interfaces/* | ||
12 | 7 | |||
13 | 1 | # Byte-compiled / optimized / DLL files | 8 | # Byte-compiled / optimized / DLL files |
14 | 2 | __pycache__/ | 9 | __pycache__/ |
15 | 3 | *.py[cod] | 10 | *.py[cod] |
16 | 4 | *$py.class | 11 | *$py.class |
17 | 5 | 12 | ||
21 | 6 | # Log files | 13 | # Tests files and dir |
22 | 7 | *.log | 14 | .pytest_cache/ |
20 | 8 | .tox/ | ||
23 | 9 | .coverage | 15 | .coverage |
24 | 16 | .tox | ||
25 | 17 | report/ | ||
26 | 18 | htmlcov/ | ||
27 | 10 | 19 | ||
30 | 11 | # vi | 20 | # Log files |
31 | 12 | .*.swp | 21 | *.log |
32 | 13 | 22 | ||
33 | 14 | # pycharm | 23 | # pycharm |
34 | 15 | .idea/ | 24 | .idea/ |
35 | 16 | 25 | ||
36 | 26 | # vi | ||
37 | 27 | .*.swp | ||
38 | 28 | |||
39 | 17 | # version data | 29 | # version data |
40 | 18 | repo-info | 30 | repo-info |
41 | 31 | version | ||
42 | 32 | |||
43 | 33 | # Python builds | ||
44 | 34 | deb_dist/ | ||
45 | 35 | dist/ | ||
46 | 19 | 36 | ||
49 | 20 | # reports | 37 | # Snaps |
50 | 21 | report/* | 38 | *.snap |
51 | 22 | 39 | ||
52 | 23 | # layers | ||
53 | 24 | layers/* | ||
54 | 25 | \ No newline at end of file | 40 | \ No newline at end of file |
55 | 41 | # Builds | ||
56 | 42 | .build/ | ||
57 | 26 | \ No newline at end of file | 43 | \ No newline at end of file |
58 | diff --git a/Makefile b/Makefile | |||
59 | index 949713b..647cacd 100644 | |||
60 | --- a/Makefile | |||
61 | +++ b/Makefile | |||
62 | @@ -1,48 +1,80 @@ | |||
63 | 1 | PYTHON := /usr/bin/python3 | ||
64 | 2 | |||
65 | 3 | PROJECTPATH=$(dir $(realpath $(MAKEFILE_LIST))) | ||
66 | 1 | ifndef CHARM_BUILD_DIR | 4 | ifndef CHARM_BUILD_DIR |
68 | 2 | CHARM_BUILD_DIR=/tmp/builds | 5 | CHARM_BUILD_DIR=${PROJECTPATH}.build |
69 | 6 | endif | ||
70 | 7 | ifndef CHARM_LAYERS_DIR | ||
71 | 8 | CHARM_LAYERS_DIR=${PROJECTPATH}/layers | ||
72 | 9 | endif | ||
73 | 10 | ifndef CHARM_INTERFACES_DIR | ||
74 | 11 | CHARM_INTERFACES_DIR=${PROJECTPATH}/interfaces | ||
75 | 3 | endif | 12 | endif |
76 | 13 | METADATA_FILE="src/metadata.yaml" | ||
77 | 14 | CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | grep -E "^name:" | awk '{print $$2}') | ||
78 | 4 | 15 | ||
79 | 5 | help: | 16 | help: |
80 | 6 | @echo "This project supports the following targets" | 17 | @echo "This project supports the following targets" |
81 | 7 | @echo "" | 18 | @echo "" |
82 | 8 | @echo " make help - show this text" | 19 | @echo " make help - show this text" |
83 | 20 | @echo " make clean - remove unneeded files" | ||
84 | 9 | @echo " make submodules - make sure that the submodules are up-to-date" | 21 | @echo " make submodules - make sure that the submodules are up-to-date" |
87 | 10 | @echo " make lint - run flake8" | 22 | @echo " make submodules-update - update submodules to latest changes on remote branch" |
88 | 11 | @echo " make test - run the functional tests and lint" | 23 | @echo " make build - build the charm" |
89 | 24 | @echo " make release - run clean, submodules, and build targets" | ||
90 | 25 | @echo " make lint - run flake8 and black --check" | ||
91 | 26 | @echo " make black - run black and reformat files" | ||
92 | 27 | @echo " make proof - run charm proof" | ||
93 | 28 | @echo " make unittests - run the tests defined in the unittest subdirectory" | ||
94 | 12 | @echo " make functional - run the tests defined in the functional subdirectory" | 29 | @echo " make functional - run the tests defined in the functional subdirectory" |
97 | 13 | @echo " make release - build the charm" | 30 | @echo " make test - run lint, proof, unittests and functional targets" |
96 | 14 | @echo " make clean - remove unneeded files" | ||
98 | 15 | @echo "" | 31 | @echo "" |
99 | 16 | 32 | ||
100 | 33 | clean: | ||
101 | 34 | @echo "Cleaning files" | ||
102 | 35 | @git clean -ffXd -e '!.idea' | ||
103 | 36 | @echo "Cleaning existing build" | ||
104 | 37 | @rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME} | ||
105 | 38 | |||
106 | 17 | submodules: | 39 | submodules: |
107 | 18 | @echo "Cloning submodules" | 40 | @echo "Cloning submodules" |
108 | 19 | @git submodule update --init --recursive | 41 | @git submodule update --init --recursive |
109 | 20 | 42 | ||
110 | 43 | submodules-update: | ||
111 | 44 | @echo "Pulling latest updates for submodules" | ||
112 | 45 | @git submodule update --init --recursive --remote --merge | ||
113 | 46 | |||
114 | 47 | build: | ||
115 | 48 | @echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}" | ||
116 | 49 | @-git rev-parse --abbrev-ref HEAD > ./src/repo-info | ||
117 | 50 | @CHARM_LAYERS_DIR=${CHARM_LAYERS_DIR} CHARM_INTERFACES_DIR=${CHARM_INTERFACES_DIR} \ | ||
118 | 51 | TERM=linux CHARM_BUILD_DIR=${CHARM_BUILD_DIR} charm build src/ | ||
119 | 52 | |||
120 | 53 | release: clean build | ||
121 | 54 | @echo "Charm is built at ${CHARM_BUILD_DIR}/${CHARM_NAME}" | ||
122 | 55 | |||
123 | 21 | lint: | 56 | lint: |
127 | 22 | @mkdir -p report/lint/ | 57 | @echo "Running lint checks" |
128 | 23 | @echo "Running flake8" | 58 | @cd src && tox -e lint |
126 | 24 | @tox -e lint | ||
129 | 25 | 59 | ||
131 | 26 | test: lint functional | 60 | black: |
132 | 61 | @echo "Reformat files with black" | ||
133 | 62 | @cd src && tox -e black | ||
134 | 27 | 63 | ||
138 | 28 | functional: build | 64 | proof: |
139 | 29 | @echo Executing with: CHARM_BUILD_DIR=$(CHARM_BUILD_DIR) tox -e func | 65 | @echo "Running charm proof" |
140 | 30 | @CHARM_BUILD_DIR=$(CHARM_BUILD_DIR) tox -e func | 66 | @charm proof src |
141 | 31 | 67 | ||
147 | 32 | build: | 68 | unittests: |
148 | 33 | @echo "Building charm to base directory $(CHARM_BUILD_DIR)" | 69 | @echo "Running unit tests" |
149 | 34 | @-git describe --tags > ./repo-info | 70 | @cd src && tox -e unit |
145 | 35 | @CHARM_LAYERS_DIR=./layers CHARM_INTERFACES_DIR=./interfaces TERM=linux \ | ||
146 | 36 | CHARM_BUILD_DIR=$(CHARM_BUILD_DIR) charm build . --force | ||
150 | 37 | 71 | ||
153 | 38 | release: clean build | 72 | functional: build |
154 | 39 | @echo "Charm is built at $(CHARM_BUILD_DIR)/prometheus-blackbox-exporter" | 73 | @echo "Executing functional tests in ${CHARM_BUILD_DIR}" |
155 | 74 | @cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} tox -e func | ||
156 | 40 | 75 | ||
162 | 41 | clean: | 76 | test: lint proof unittests functional |
163 | 42 | @echo "Cleaning files" | 77 | @echo "Tests completed for charm ${CHARM_NAME}." |
159 | 43 | @if [ -d .tox ] ; then rm -r .tox ; fi | ||
160 | 44 | @if [ -d .pytest_cache ] ; then rm -r .pytest_cache ; fi | ||
161 | 45 | @find . -iname __pycache__ -exec rm -r {} + | ||
164 | 46 | 78 | ||
165 | 47 | # The targets below don't depend on a file | 79 | # The targets below don't depend on a file |
167 | 48 | .PHONY: lint test functional build release clean help submodules | 80 | .PHONY: help submodules submodules-update clean build release lint black proof unittests functional test |
168 | diff --git a/README.md b/src/README.md | |||
169 | 49 | similarity index 100% | 81 | similarity index 100% |
170 | 50 | rename from README.md | 82 | rename from README.md |
171 | 51 | rename to src/README.md | 83 | rename to src/README.md |
172 | diff --git a/config.yaml b/src/config.yaml | |||
173 | 52 | similarity index 100% | 84 | similarity index 100% |
174 | 53 | rename from config.yaml | 85 | rename from config.yaml |
175 | 54 | rename to src/config.yaml | 86 | rename to src/config.yaml |
176 | diff --git a/copyright b/src/copyright | |||
177 | 55 | similarity index 100% | 87 | similarity index 100% |
178 | 56 | rename from copyright | 88 | rename from copyright |
179 | 57 | rename to src/copyright | 89 | rename to src/copyright |
180 | diff --git a/icon.svg b/src/icon.svg | |||
181 | 58 | similarity index 100% | 90 | similarity index 100% |
182 | 59 | rename from icon.svg | 91 | rename from icon.svg |
183 | 60 | rename to src/icon.svg | 92 | rename to src/icon.svg |
184 | diff --git a/layer.yaml b/src/layer.yaml | |||
185 | 61 | similarity index 100% | 93 | similarity index 100% |
186 | 62 | rename from layer.yaml | 94 | rename from layer.yaml |
187 | 63 | rename to src/layer.yaml | 95 | rename to src/layer.yaml |
188 | diff --git a/metadata.yaml b/src/metadata.yaml | |||
189 | 64 | similarity index 100% | 96 | similarity index 100% |
190 | 65 | rename from metadata.yaml | 97 | rename from metadata.yaml |
191 | 66 | rename to src/metadata.yaml | 98 | rename to src/metadata.yaml |
192 | diff --git a/reactive/prometheus_blackbox_exporter.py b/src/reactive/prometheus_blackbox_exporter.py | |||
193 | 67 | similarity index 100% | 99 | similarity index 100% |
194 | 68 | rename from reactive/prometheus_blackbox_exporter.py | 100 | rename from reactive/prometheus_blackbox_exporter.py |
195 | 69 | rename to src/reactive/prometheus_blackbox_exporter.py | 101 | rename to src/reactive/prometheus_blackbox_exporter.py |
196 | diff --git a/requirements.txt b/src/requirements.txt | |||
197 | 70 | similarity index 100% | 102 | similarity index 100% |
198 | 71 | rename from requirements.txt | 103 | rename from requirements.txt |
199 | 72 | rename to src/requirements.txt | 104 | rename to src/requirements.txt |
200 | diff --git a/templates/blackbox.yaml.j2 b/src/templates/blackbox.yaml.j2 | |||
201 | 73 | similarity index 100% | 105 | similarity index 100% |
202 | 74 | rename from templates/blackbox.yaml.j2 | 106 | rename from templates/blackbox.yaml.j2 |
203 | 75 | rename to src/templates/blackbox.yaml.j2 | 107 | rename to src/templates/blackbox.yaml.j2 |
204 | diff --git a/tests/functional/requirements.txt b/src/tests/functional/requirements.txt | |||
205 | 76 | similarity index 100% | 108 | similarity index 100% |
206 | 77 | rename from tests/functional/requirements.txt | 109 | rename from tests/functional/requirements.txt |
207 | 78 | rename to src/tests/functional/requirements.txt | 110 | rename to src/tests/functional/requirements.txt |
208 | diff --git a/tests/functional/tests/__init__.py b/src/tests/functional/tests/__init__.py | |||
209 | 79 | similarity index 100% | 111 | similarity index 100% |
210 | 80 | rename from tests/functional/tests/__init__.py | 112 | rename from tests/functional/tests/__init__.py |
211 | 81 | rename to src/tests/functional/tests/__init__.py | 113 | rename to src/tests/functional/tests/__init__.py |
212 | diff --git a/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml | |||
213 | 82 | similarity index 100% | 114 | similarity index 100% |
214 | 83 | rename from tests/functional/tests/bundles/bionic.yaml | 115 | rename from tests/functional/tests/bundles/bionic.yaml |
215 | 84 | rename to src/tests/functional/tests/bundles/bionic.yaml | 116 | rename to src/tests/functional/tests/bundles/bionic.yaml |
216 | diff --git a/tests/functional/tests/bundles/focal.yaml b/src/tests/functional/tests/bundles/focal.yaml | |||
217 | 85 | similarity index 100% | 117 | similarity index 100% |
218 | 86 | rename from tests/functional/tests/bundles/focal.yaml | 118 | rename from tests/functional/tests/bundles/focal.yaml |
219 | 87 | rename to src/tests/functional/tests/bundles/focal.yaml | 119 | rename to src/tests/functional/tests/bundles/focal.yaml |
220 | diff --git a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 | |||
221 | 88 | similarity index 100% | 120 | similarity index 100% |
222 | 89 | rename from tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 | 121 | rename from tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 |
223 | 90 | rename to src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 | 122 | rename to src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 |
224 | diff --git a/tests/functional/tests/bundles/xenial.yaml b/src/tests/functional/tests/bundles/xenial.yaml | |||
225 | 91 | similarity index 100% | 123 | similarity index 100% |
226 | 92 | rename from tests/functional/tests/bundles/xenial.yaml | 124 | rename from tests/functional/tests/bundles/xenial.yaml |
227 | 93 | rename to src/tests/functional/tests/bundles/xenial.yaml | 125 | rename to src/tests/functional/tests/bundles/xenial.yaml |
228 | diff --git a/tests/functional/tests/test_prometheus_blackbox_exporter.py b/src/tests/functional/tests/test_prometheus_blackbox_exporter.py | |||
229 | 94 | similarity index 100% | 126 | similarity index 100% |
230 | 95 | rename from tests/functional/tests/test_prometheus_blackbox_exporter.py | 127 | rename from tests/functional/tests/test_prometheus_blackbox_exporter.py |
231 | 96 | rename to src/tests/functional/tests/test_prometheus_blackbox_exporter.py | 128 | rename to src/tests/functional/tests/test_prometheus_blackbox_exporter.py |
232 | diff --git a/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml | |||
233 | 97 | similarity index 100% | 129 | similarity index 100% |
234 | 98 | rename from tests/functional/tests/tests.yaml | 130 | rename from tests/functional/tests/tests.yaml |
235 | 99 | rename to src/tests/functional/tests/tests.yaml | 131 | rename to src/tests/functional/tests/tests.yaml |
236 | diff --git a/src/tests/unit/requirements.txt b/src/tests/unit/requirements.txt | |||
237 | 100 | new file mode 100644 | 132 | new file mode 100644 |
238 | index 0000000..4ebc8ae | |||
239 | --- /dev/null | |||
240 | +++ b/src/tests/unit/requirements.txt | |||
241 | @@ -0,0 +1 @@ | |||
242 | 1 | coverage | ||
243 | diff --git a/src/tox.ini b/src/tox.ini | |||
244 | 0 | new file mode 100644 | 2 | new file mode 100644 |
245 | index 0000000..9cd7d44 | |||
246 | --- /dev/null | |||
247 | +++ b/src/tox.ini | |||
248 | @@ -0,0 +1,69 @@ | |||
249 | 1 | [tox] | ||
250 | 2 | skipsdist=True | ||
251 | 3 | skip_missing_interpreters = True | ||
252 | 4 | envlist = lint, unit, func | ||
253 | 5 | |||
254 | 6 | [testenv] | ||
255 | 7 | basepython = python3 | ||
256 | 8 | setenv = | ||
257 | 9 | PYTHONPATH = {toxinidir}:{toxinidir}/lib/:{toxinidir}/hooks/ | ||
258 | 10 | passenv = | ||
259 | 11 | HOME | ||
260 | 12 | PATH | ||
261 | 13 | CHARM_BUILD_DIR | ||
262 | 14 | PYTEST_KEEP_MODEL | ||
263 | 15 | PYTEST_CLOUD_NAME | ||
264 | 16 | PYTEST_CLOUD_REGION | ||
265 | 17 | PYTEST_MODEL | ||
266 | 18 | MODEL_SETTINGS | ||
267 | 19 | HTTP_PROXY | ||
268 | 20 | HTTPS_PROXY | ||
269 | 21 | NO_PROXY | ||
270 | 22 | SNAP_HTTP_PROXY | ||
271 | 23 | SNAP_HTTPS_PROXY | ||
272 | 24 | |||
273 | 25 | [testenv:lint] | ||
274 | 26 | commands = | ||
275 | 27 | flake8 | ||
276 | 28 | #TODO black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" . | ||
277 | 29 | deps = | ||
278 | 30 | black | ||
279 | 31 | flake8 | ||
280 | 32 | flake8-docstrings | ||
281 | 33 | flake8-import-order | ||
282 | 34 | pep8-naming | ||
283 | 35 | flake8-colors | ||
284 | 36 | |||
285 | 37 | [flake8] | ||
286 | 38 | exclude = | ||
287 | 39 | .git, | ||
288 | 40 | __pycache__, | ||
289 | 41 | .tox, | ||
290 | 42 | charmhelpers, | ||
291 | 43 | mod, | ||
292 | 44 | .build | ||
293 | 45 | |||
294 | 46 | #max-line-length = 88 | ||
295 | 47 | max-complexity = 10 | ||
296 | 48 | |||
297 | 49 | # From previous tox.ini | ||
298 | 50 | max-line-length = 120 | ||
299 | 51 | import-order-style = google | ||
300 | 52 | |||
301 | 53 | [testenv:black] | ||
302 | 54 | commands = | ||
303 | 55 | black --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" . | ||
304 | 56 | deps = | ||
305 | 57 | black | ||
306 | 58 | |||
307 | 59 | [testenv:unit] | ||
308 | 60 | commands = | ||
309 | 61 | coverage run -m unittest discover -s {toxinidir}/tests/unit -v | ||
310 | 62 | coverage report --omit tests/*,mod/*,.tox/* | ||
311 | 63 | coverage html --omit tests/*,mod/*,.tox/* | ||
312 | 64 | deps = -r{toxinidir}/tests/unit/requirements.txt | ||
313 | 65 | |||
314 | 66 | [testenv:func] | ||
315 | 67 | changedir = {toxinidir}/tests/functional | ||
316 | 68 | commands = functest-run-suite {posargs} | ||
317 | 69 | deps = -r{toxinidir}/tests/functional/requirements.txt | ||
318 | diff --git a/tox.ini b/tox.ini | |||
319 | 0 | deleted file mode 100644 | 70 | deleted file mode 100644 |
320 | index 1859695..0000000 | |||
321 | --- a/tox.ini | |||
322 | +++ /dev/null | |||
323 | @@ -1,65 +0,0 @@ | |||
324 | 1 | [tox] | ||
325 | 2 | skipsdist=True | ||
326 | 3 | envlist = unit, functional | ||
327 | 4 | skip_missing_interpreters = True | ||
328 | 5 | |||
329 | 6 | [testenv] | ||
330 | 7 | basepython = python3 | ||
331 | 8 | setenv = | ||
332 | 9 | PYTHONPATH = . | ||
333 | 10 | passenv = | ||
334 | 11 | HOME | ||
335 | 12 | CHARM_BUILD_DIR | ||
336 | 13 | MODEL_SETTINGS | ||
337 | 14 | |||
338 | 15 | [testenv:unit] | ||
339 | 16 | commands = pytest -v \ | ||
340 | 17 | --ignore {toxinidir}/tests/ \ | ||
341 | 18 | --ignore {toxinidir}/interfaces \ | ||
342 | 19 | --ignore {toxinidir}/layers \ | ||
343 | 20 | --cov=lib \ | ||
344 | 21 | --cov=actions \ | ||
345 | 22 | --cov-report=term \ | ||
346 | 23 | --cov-report=annotate:report/unit/coverage-annotated \ | ||
347 | 24 | --cov-report=html:report/unit/coverage-html \ | ||
348 | 25 | --html=report/unit/tests/index.html \ | ||
349 | 26 | --junitxml=report/unit/junit.xml | ||
350 | 27 | deps = -r{toxinidir}/tests/unit_tests/requirements.txt | ||
351 | 28 | -r{toxinidir}/tests/requirements.txt | ||
352 | 29 | setenv = PYTHONPATH={toxinidir}/lib | ||
353 | 30 | |||
354 | 31 | [testenv:func] | ||
355 | 32 | changedir = {toxinidir}/tests/functional | ||
356 | 33 | commands = functest-run-suite --keep-model | ||
357 | 34 | deps = -r{toxinidir}/tests/functional/requirements.txt | ||
358 | 35 | |||
359 | 36 | [testenv:lint] | ||
360 | 37 | commands = flake8 --tee | ||
361 | 38 | deps = | ||
362 | 39 | flake8 | ||
363 | 40 | flake8-colors | ||
364 | 41 | flake8-docstrings | ||
365 | 42 | flake8-import-order | ||
366 | 43 | pep8-naming | ||
367 | 44 | |||
368 | 45 | [flake8] | ||
369 | 46 | exclude = | ||
370 | 47 | .git, | ||
371 | 48 | __pycache__, | ||
372 | 49 | .tox, | ||
373 | 50 | layers, | ||
374 | 51 | interfaces, | ||
375 | 52 | max-line-length = 120 | ||
376 | 53 | max-complexity = 10 | ||
377 | 54 | import-order-style = google | ||
378 | 55 | |||
379 | 56 | [isort] | ||
380 | 57 | order_by_type = true | ||
381 | 58 | from_first = true | ||
382 | 59 | line_length = 120 | ||
383 | 60 | |||
384 | 61 | [pytest] | ||
385 | 62 | markers = | ||
386 | 63 | deploy: mark deployment tests to allow running w/o redeploy | ||
387 | 64 | filterwarnings = | ||
388 | 65 | ignore::DeprecationWarning |
Also note that the 'Fixed "make lint"' commit is a combination of tox.ini tweaks and running black, and nothing more.