diff --git a/Makefile b/Makefile deleted file mode 100644 index bbd279183..000000000 --- a/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2013 splinter authors. All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -all: test - -clean: - @find . -name "*.pyc" -delete - -doc_dependencies: - @pip install -r requirements/doc.txt - -dependencies: - @pip install -r requirements/test.txt - -doc: doc_dependencies - @cd docs && make clean && make html - -which = 'tests' - -test: dependencies clean - @echo "Running all tests..." - tox -- $(which) - -coverage: dependencies clean - @echo "Running all tests with coverage..." - @coverage run run_tests.py -w $(which) && coverage report - -install-remote: - @wget http://goo.gl/PJUZfa -O selenium-server.jar - @java -jar selenium-server.jar > /dev/null 2>&1 & - @sleep 1 diff --git a/docs/contribute/contribute.rst b/docs/contribute/contribute.rst index 924fece31..7dfc5ad44 100644 --- a/docs/contribute/contribute.rst +++ b/docs/contribute/contribute.rst @@ -23,9 +23,9 @@ Before opening a new Pull Request, please ensure the linter and at least platfor Requirements ============ -Tests should be run using `tox `_ +Development environments are managed using `tox `_ -Install tox from the command line: +Generally, tox should be installed with pip: .. highlight:: bash @@ -33,6 +33,7 @@ Install tox from the command line: pip install tox +See tox's documentation if you need to use another method. Linter ====== @@ -99,14 +100,14 @@ We use the `Read the Docs Sphinx Theme