launchpad-reviewers team mailing list archive

["Thiago F. Pappacena" <pappacena@xxxxxxxxx>]

Thiago F. Pappacena has proposed merging ~pappacena/turnip:remove-py2-env into turnip:master.

Commit message:
Removing python2 env and test execution

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/turnip/+git/turnip/+merge/401567
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/turnip:remove-py2-env into turnip:master.

diff --git a/Makefile b/Makefile
index 26bf506..cb4204c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 ENV := $(CURDIR)/env
-PY2_ENV := $(CURDIR)/py2env
 PIP_CACHE = $(CURDIR)/pip-cache
 
 PYTHON := $(ENV)/bin/python
@@ -78,20 +77,12 @@ bootstrap-test:
 	-sudo rabbitmqctl add_vhost turnip-test-vhost
 	-sudo rabbitmqctl set_permissions -p "turnip-test-vhost" "guest" ".*" ".*" ".*"
 
-run-test: $(ENV) bootstrap-test
+test: $(ENV) bootstrap-test
 	$(PYTHON) -m unittest discover $(ARGS) turnip
 
-test: test-python3 test-python2
-
-test-python3:
-	$(MAKE) run-test VENV_ARGS="-p python3"
-
-test-python2:
-	$(MAKE) run-test VENV_ARGS="-p python2" ENV="$(PY2_ENV)"
-
 clean:
 	find turnip -name '*.py[co]' -exec rm '{}' \;
-	rm -rf $(ENV) $(PY2_ENV) $(PIP_CACHE)
+	rm -rf $(ENV) $(PIP_CACHE)
 	rm -f turnip/version_info.py
 
 dist: