From f759666e045e7bb0a8b2ff3379b9d46c83c37c67 Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Sat, 10 Jun 2017 18:14:57 +0300
Subject: [PATCH] Tests: Use tox instead of tests/Makefile

[skip ci]
---
 Makefile       |  8 ++------
 docs/news.rst  |  2 ++
 tests/Makefile | 22 ----------------------
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 tests/Makefile

diff --git a/Makefile b/Makefile
index ee1c84e..9c4c8ea 100644
--- a/Makefile
+++ b/Makefile
@@ -4,23 +4,19 @@ all:
 	@echo "Nothing to be done for 'all'"
 
 .PHONY: release
-release: tests flake8 docs distr
+release: tests docs distr
 
 .PHONY: distr
 distr:
 	./mk-distr
 
-.PHONY: flake8
-flake8:
-	flake8
-
 .PHONY: docs
 docs:
 	cd docs && exec ./rebuild
 
 .PHONY: test
 test:
-	$(MAKE) -C tests
+	tox
 
 .PHONY: tests
 tests: test
diff --git a/docs/news.rst b/docs/news.rst
index 72203a6..79df298 100644
--- a/docs/news.rst
+++ b/docs/news.rst
@@ -4,6 +4,8 @@ News
 Version 0.2.2 (2017-06-??)
 --------------------------
 
+* Use tox instead of tests/Makefile.
+
 * Test at Travis and AppVeyor with Postgres.
 
 Version 0.2.1 (2017-05-01)
diff --git a/tests/Makefile b/tests/Makefile
deleted file mode 100644
index 444794b..0000000
--- a/tests/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-.PHONY: all
-all: nodb postgres sqlite clean
-
-.PHONY: nodb
-nodb:
-	PYTHONPATH=.. python -m  pytest
-
-.PHONY: postgres
-postgres:
-	createdb test
-	PYTHONPATH=.. python -m  pytest -D postgres:///test
-	dropdb test
-
-.PHONY: sqlite
-sqlite:
-	PYTHONPATH=.. python -m  pytest -D sqlite:///tmp/test.sqdb
-	rm -f /tmp/test.sqdb
-
-.PHONY: clean
-clean:
-	rm -f *.tmp
-- 
2.39.5