Commit 5c6c0948 authored by Yuanle Song's avatar Yuanle Song
Browse files

"make test" now test against both py2 and py3.

parent 6d1b0d0d

Makefile

+10 −3
Original line number Diff line number Diff line 
DEMO_PROJECT_NAME := foo-bar



default:

test:

test: py2

install:

	lein install

py3: install

	rm -rf $(DEMO_PROJECT_NAME)

	lein new python $(DEMO_PROJECT_NAME)

	cd $(DEMO_PROJECT_NAME) && make test

	cd $(DEMO_PROJECT_NAME) && make test DEFAULT_PYTHON=python3

	rm -rf $(DEMO_PROJECT_NAME)

.PHONY: default test
 
py2: py3

	rm -rf $(DEMO_PROJECT_NAME)

	lein new python $(DEMO_PROJECT_NAME)

	cd $(DEMO_PROJECT_NAME) && make test DEFAULT_PYTHON=python2

	rm -rf $(DEMO_PROJECT_NAME)

.PHONY: default test install py3 py2

src/leiningen/new/python/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ PEP8 := env PYTHONPATH=$(PYTHONPATH) $(VENV)/bin/pycodestyle --repeat --ignore=E 
PYTHON := env PYTHONPATH=$(PYTHONPATH) $(VENV)/bin/python

PIP := $(VENV)/bin/pip



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

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

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



REQUIREMENTS := -r requirements.txt