turnip

Merge ~pappacena/turnip:py3-as-default into turnip:master

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

Commit message

Making python3 the default interpreter

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 5698ab9..07be1e4 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -7,6 +7,7 @@ download-cache
6 eggs
7 env
8 py3env
9+py2env
10 pip-cache
11 *.egg*
12 *.egg-info
13diff --git a/Makefile b/Makefile
14index 0b9d1b1..e0362ee 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -2,7 +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+PY2_ENV := $(CURDIR)/py2env
23 PIP_CACHE = $(CURDIR)/pip-cache
24
25 PYTHON := $(ENV)/bin/python
26@@ -11,6 +11,7 @@ FLAKE8 := $(ENV)/bin/flake8
27 CELERY := $(ENV)/bin/celery
28 PIP := $(ENV)/bin/pip
29 VIRTUALENV := virtualenv
30+VENV_ARGS := -p python3
31
32 DEPENDENCIES_URL := https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
33 PIP_SOURCE_DIR := dependencies
34@@ -73,17 +74,17 @@ bootstrap-test:
35 run-test: $(ENV) bootstrap-test
36 $(PYTHON) -m unittest discover $(ARGS) turnip
37
38-test: test-python2 test-python3
39-
40-test-python2:
41- $(MAKE) run-test VENV_ARGS="-p python2"
42+test: test-python3 test-python2
43
44 test-python3:
45- $(MAKE) run-test VENV_ARGS="-p python3" ENV="$(PY3_ENV)"
46+ $(MAKE) run-test VENV_ARGS="-p python3"
47+
48+test-python2:
49+ $(MAKE) run-test VENV_ARGS="-p python2" ENV="$(PY2_ENV)"
50
51 clean:
52 find turnip -name '*.py[co]' -exec rm '{}' \;
53- rm -rf $(ENV) $(PY3_ENV) $(PIP_CACHE)
54+ rm -rf $(ENV) $(PY2_ENV) $(PIP_CACHE)
55 rm -f turnip/version_info.py
56
57 dist:

Subscribers

People subscribed via source and target branches