Commit 89a51c47 authored by Yuanle Song's avatar Yuanle Song
Browse files

v1.5.1 minor update on Makefile 

- use wildcard instead of shell ls
- use id -u without user name. defaults to current user.
parent 0957a1f2

project.clj

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

(defproject python/lein-template "1.5.1"

  :description "lein template for a python project"

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

  :license {:name "Eclipse Public License"

src/leiningen/new/python/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ PYTHON := env PYTHONPATH=$(PYTHONPATH) $(VENV)/bin/python 
PIP := $(VENV)/bin/pip



DEFAULT_PYTHON := $(shell ./utils/choose_default_python.sh)

VIRTUALENV := $(shell ls ./utils/virtualenv-*/virtualenv.py)

VIRTUALENV := $(wildcard ./utils/virtualenv-*/virtualenv.py)



REQUIREMENTS := -r requirements.txt

DEV_REQUIREMENTS := -r requirements-dev.txt
@@ -83,7 +83,7 @@ just-test: 
# image and push image on host.

ci-build:

	docker login -u $(DOCKER_USER) -p $(DOCKER_PASSWORD) $(BUILD_DOCKER_IMAGE)

	docker run --rm --name {{ name }}-test -v "$(CURDIR)":/app -u $(shell id -u go):$(shell id -g go) $(BUILD_DOCKER_IMAGE) make test deb -C /app

	docker run --rm --name {{ name }}-test -v "$(CURDIR)":/app -u $(shell id -u):$(shell id -g) $(BUILD_DOCKER_IMAGE) make test deb -C /app

	docker build -t $(DOCKER_IMAGE_PREFIX)/{{ name }}:$(VERSION) .

	docker push $(DOCKER_IMAGE_PREFIX)/{{ name }}:$(VERSION)

deploy: