From 89a51c47a9a3ac1d3d5b65adacb97a01e2ed26c5 Mon Sep 17 00:00:00 2001 From: Yuanle Song Date: Thu, 28 Feb 2019 00:53:08 +0800 Subject: [PATCH] v1.5.1 minor update on Makefile - use wildcard instead of shell ls - use id -u without user name. defaults to current user. --- project.clj | 2 +- src/leiningen/new/python/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 1315f5e..067daa1 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(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" diff --git a/src/leiningen/new/python/Makefile b/src/leiningen/new/python/Makefile index e2f267d..36414f8 100644 --- a/src/leiningen/new/python/Makefile +++ b/src/leiningen/new/python/Makefile @@ -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: -- GitLab