Tests: Use tox instead of tests/Makefile

[skip ci]

diff --git a/Makefile b/Makefile
index ee1c84e537608dd840457c0617969d1b8b294d19..9c4c8eacb19295cd09eab71f3ce08675deb6eb5d 100644 (file)
--- 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 72203a61c7885c23b5e3cda590692e3b786414e1..79df2982c9ae1164629472f200903cd36192ea6f 100644 (file)
--- 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 (file)
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