turnip

Merge ~pappacena/turnip:make-target-py3-check into turnip:master

  1. Git
  2. lp:~pappacena/turnip
  3. make-target-py3-check
  4. Merge into master
Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: ed898b054b4cf8cb081ec9a17582cc15b872f590
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/turnip:make-target-py3-check
Merge into: turnip:master
Diff against target: 52 lines (+9/-1)
2 files modified
.gitignore (+1/-0)
Makefile (+8/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+383759@code.launchpad.net

Commit message

Adding Makefile rule to run `make check-python-compat` and run tests on both python 2 and python 3 envs.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Needs Information
~pappacena/turnip:make-target-py3-check updated
1a866e1... by Thiago F. Pappacena

Keeping python2 and python3 envs simultaneously

Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

cjwatson, pushed the changes to keep both venvs at the same time. Let me know if you would like to review that.

~pappacena/turnip:make-target-py3-check updated
75589bf... by Thiago F. Pappacena

Merge branch 'master' into make-target-py3-check

Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Colin Watson (cjwatson) :
~pappacena/turnip:make-target-py3-check updated
ed898b0... by Thiago F. Pappacena

Preventing environment variables from overriding some Makefile vars

Revision history for this message
Thiago F. Pappacena (pappacena) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index fb9d39c..5698ab9 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -6,6 +6,7 @@ dist
6 download-cache
7 eggs
8 env
9+py3env
10 pip-cache
11 *.egg*
12 *.egg-info
13diff --git a/Makefile b/Makefile
14index c514366..9e6bb12 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -2,6 +2,7 @@
18 # GNU Affero General Public License version 3 (see the file LICENSE).
19
20 ENV := $(CURDIR)/env
21+PY3_ENV := $(CURDIR)/py3env
22 PIP_CACHE = $(CURDIR)/pip-cache
23
24 PYTHON := $(ENV)/bin/python
25@@ -11,6 +12,7 @@ PIP := $(ENV)/bin/pip
26 VIRTUALENV := virtualenv
27
28 DEPENDENCIES_URL := https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
29+PIP_SOURCE_DIR := dependencies
30
31 PIP_ARGS ?= --quiet
32 ifneq ($(PIP_SOURCE_DIR),)
33@@ -59,7 +61,7 @@ test: $(ENV)
34
35 clean:
36 find turnip -name '*.py[co]' -exec rm '{}' \;
37- rm -rf $(ENV) $(PIP_CACHE)
38+ rm -rf $(ENV) $(PY3_ENV) $(PIP_CACHE)
39 rm -f turnip/version_info.py
40
41 dist:
42@@ -80,6 +82,11 @@ pip-check: $(ENV)
43
44 check: pip-check test lint
45
46+check-python3:
47+ $(MAKE) check VENV_ARGS="-p python3" ENV="$(PY3_ENV)"
48+
49+check-python-compat: check check-python3
50+
51 run-api: $(ENV)
52 $(PSERVE) api.ini --reload
53

Subscribers

People subscribed via source and target branches