[Fix] Duplicate site_definition.yaml
- site_definition.yaml was collected twice. - Update Makefile with format target and ignore pep8 rule that conflicts w/ YAPF formatting Change-Id: I2bc6d40e9e9085558315224df7d9127a8945ee1c
This commit is contained in:
parent
b94f22064a
commit
b5aed4df77
8
Makefile
8
Makefile
|
@ -42,6 +42,10 @@ run_pegleg: build_pegleg
|
||||||
.PHONY: lint
|
.PHONY: lint
|
||||||
lint: py_lint
|
lint: py_lint
|
||||||
|
|
||||||
|
# Perform auto formatting
|
||||||
|
.PHONY: format
|
||||||
|
format: py_format
|
||||||
|
|
||||||
.PHONY: build_pegleg
|
.PHONY: build_pegleg
|
||||||
build_pegleg:
|
build_pegleg:
|
||||||
ifeq ($(USE_PROXY), true)
|
ifeq ($(USE_PROXY), true)
|
||||||
|
@ -60,3 +64,7 @@ clean:
|
||||||
.PHONY: py_lint
|
.PHONY: py_lint
|
||||||
py_lint:
|
py_lint:
|
||||||
cd src/bin/pegleg;tox -e lint
|
cd src/bin/pegleg;tox -e lint
|
||||||
|
|
||||||
|
.PHONY: py_format
|
||||||
|
py_format:
|
||||||
|
cd src/bin/pegleg;tox -e fmt
|
||||||
|
|
|
@ -64,7 +64,6 @@ def site_files(site_name):
|
||||||
params = load_as_params(site_name)
|
params = load_as_params(site_name)
|
||||||
for filename in files.search(files.directories_for(**params)):
|
for filename in files.search(files.directories_for(**params)):
|
||||||
yield filename
|
yield filename
|
||||||
yield path(site_name)
|
|
||||||
|
|
||||||
|
|
||||||
def site_files_by_repo(site_name):
|
def site_files_by_repo(site_name):
|
||||||
|
@ -74,5 +73,3 @@ def site_files_by_repo(site_name):
|
||||||
for repo, dl in dir_map.items():
|
for repo, dl in dir_map.items():
|
||||||
for filename in files.search(dl):
|
for filename in files.search(dl):
|
||||||
yield (repo, filename)
|
yield (repo, filename)
|
||||||
if repo == config.get_primary_repo():
|
|
||||||
yield (repo, path(site_name))
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ commands=
|
||||||
[testenv:fmt]
|
[testenv:fmt]
|
||||||
deps = yapf==0.20.0
|
deps = yapf==0.20.0
|
||||||
commands =
|
commands =
|
||||||
yapf -ir {toxinidir}/pegleg
|
yapf --style=pep8 -ir {toxinidir}/pegleg
|
||||||
|
|
||||||
[testenv:lint]
|
[testenv:lint]
|
||||||
deps =
|
deps =
|
||||||
|
@ -23,4 +23,4 @@ commands =
|
||||||
flake8 {toxinidir}/pegleg
|
flake8 {toxinidir}/pegleg
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
ignore = E251
|
ignore = E251,W503
|
||||||
|
|
Loading…
Reference in New Issue