Commit 31e0c516 authored by Yuanle Song's avatar Yuanle Song
Browse files

v1.13.1 fix "make wheel" in Makefile; 

make wheel should use && to connect commands so that "ready" file is not
created when some command failed.

- use PYPI_MIRROR in make wheel and make dist.
parent 411573a3

project.clj

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

(defproject python/lein-template "1.13.1"

  :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

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ dist: bootstrap 
	$(PYTHON) setup.py -q sdist

	$(PYTHON) setup.py -q bdist_wheel --universal

upload: dist

	test -e $(VENV)/bin/twine || $(PIP) install -q twine

	test -e $(VENV)/bin/twine || $(PIP) install -q -i $(PYPI_MIRROR) twine

	$(VENV)/bin/twine check dist/*.whl

	$(VENV)/bin/twine check dist/*.tar.gz

	@if ! [ -n "$(TWINE_USERNAME)" -o -e ~/.pypirc ]; then \
@@ -92,10 +92,10 @@ pipfreeze: 
	$(PIP) freeze

wheel: $(REQUIREMENTS)

	if [ ! -f "$(WHEELHOUSE)/ready" ]; then \

		test -d "$(VENV)/bin" || $(DEFAULT_PYTHON) $(VIRTUALENV) --no-download -q "$(VENV)"; \

		@echo "building wheelhouse in dir $(WHEELHOUSE)..."; \

		$(PIP) install wheel; \

		$(PIP) wheel -w $(WHEELHOUSE) -r $(REQUIREMENTS); \

		test -d "$(VENV)/bin" || $(DEFAULT_PYTHON) $(VIRTUALENV) --no-download -q "$(VENV)" && \

		echo "building wheelhouse in dir $(WHEELHOUSE)..." && \

		$(PIP) install wheel && \

		$(PIP) wheel -w $(WHEELHOUSE) -i $(PYPI_MIRROR) -r $(REQUIREMENTS) && \

		touch "$(WHEELHOUSE)/ready"; \

	fi

check: just-test