Commit a7c468ce authored by Yuanle Song's avatar Yuanle Song
Browse files

v1.6.2 fix "make test" when wheelhouse dir exists; 

- pep8 ignore W503 instead of W504.
parent 8d06c91c

project.clj

+1 −1
Original line number Diff line number Diff line 
(defproject python/lein-template "1.6.1"

(defproject python/lein-template "1.6.2"

  :description "lein template for a python project"

  :url "https://gitlab.emacsos.com/sylecn/python-project-template"

  :license {:name "Apache License 2.0"

src/leiningen/new/python/Makefile

+6 −7
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ PYTHONPATH := . 
VENV := .venv

PYTEST := env PYTHONPATH=$(PYTHONPATH) PYTEST=1 $(VENV)/bin/py.test

PYLINT := env PYTHONPATH=$(PYTHONPATH) $(VENV)/bin/pylint --disable=I0011 --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}"

PEP8 := env PYTHONPATH=$(PYTHONPATH) $(VENV)/bin/pycodestyle --repeat --ignore=E202,E501,E402,W504

PEP8 := env PYTHONPATH=$(PYTHONPATH) $(VENV)/bin/pycodestyle --repeat --ignore=E202,E501,E402,W503

PYTHON := env PYTHONPATH=$(PYTHONPATH) $(VENV)/bin/python

PIP := $(VENV)/bin/pip
@@ -11,7 +11,7 @@ DEFAULT_PYTHON ?= $(shell ./utils/choose_default_python.sh) 
VIRTUALENV := $(wildcard ./utils/virtualenv-*/virtualenv.py)



REQUIREMENTS := -r requirements.txt

DEV_REQUIREMENTS := -r requirements-dev.txt

REQUIREMENTS_DEV := -r requirements-dev.txt



VERSION := $(shell grep '__version__' {{python-pkg-name}}/__init__.py |cut -d'"' -f 2)

# docker hub user name or private registry URL with username.
@@ -53,14 +53,15 @@ requirements: 
	else \

		$(PIP) install -q $(REQUIREMENTS); \

	fi

requirements-dev:

	$(PIP) install -q $(REQUIREMENTS_DEV)

logdir:

	@if [ ! -d /var/log/{{name}} ]; then \

		sudo mkdir /var/log/{{name}}; \

		sudo chown -R ${USER} /var/log/{{name}}; \

	fi

bootstrap: venv requirements

bootstrap-dev: REQUIREMENTS += $(DEV_REQUIREMENTS)

bootstrap-dev: venv requirements

bootstrap-dev: venv requirements requirements-dev

install: bootstrap

	$(PIP) install -q --no-index .

uninstall: bootstrap
@@ -102,9 +103,7 @@ deploy: 
	sed "s/IMAGE_TAG/$(VERSION)/" app.yaml > $(VERSION).yaml

	kubectl --certificate-authority=/etc/kubernetes/pki/ca.crt -s $(KUBECTL_API) --token=$(KUBECTL_TOKEN) apply -f $(VERSION).yaml



install-dev-no-wheel:

	$(PIP) install -q -i https://pypi.tuna.tsinghua.edu.cn/simple $(DEV_REQUIREMENTS)

test-prod: install-dev-no-wheel test

test-prod: requirements-dev test



clean:

	find . -name "__pycache__" -type d -exec rm -rf {} \; || true