vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update yapf

Browse source
This commit is contained in:
Antoine Legrand 2017-04-06 14:41:25 +02:00
parent e6eea3a3a5
commit 7b164fa5ae
2 changed files with 56 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Makefile
View file

@ -4,6 +4,12 @@ SHA := $(shell git rev-parse --short HEAD )
REPO := quay.io/quay/quay
TAG := $(REPO):$(SHA)
MODIFIED_FILES_COUNT = $(shell git diff --name-only origin/master | grep -E .+\.py$ | wc -l)
MODIFIED_FILES = $(shell git diff --name-only origin/master | grep -E .+\.py$ | paste -sd ' ')
show-modified:
echo $(MODIFIED_FILES)
.PHONY: all unit test pkgs build run clean
all: clean pkgs test build
@ -92,3 +98,22 @@ clean:
rm -rf build
rm -rf conf/stack
rm -rf screenshots
yapf-all:
yapf -r . -p -i -e './data/model/*.py' -e './data/oci_model/*.py' -e './data/migrations/versions/*.py'
yapf-diff:
if [ $(MODIFIED_FILES_COUNT) -ne 0 ]; then yapf -d -p $(MODIFIED_FILES) ; fi
yapf:
ifneq (0,$(shell git diff-index HEAD | wc -l))
echo "Failed, git dirty" && false
else ifneq (0,$(shell yapf -d -p $(MODIFIED_FILES) | wc -l))
yapf -i -p $(MODIFIED_FILES)
git commit -a -m "code-stye Yapf: $(MODIFIED_FILES_COUNT) files updated" -m "$(MODIFIED_FILES)"
endif
yapf-test:
if [ `yapf -d -p $(MODIFIED_FILES) | wc -l` -gt 0 ] ; then false ; else true ;fi