Merge lp:~coreygoldberg/autopilot/no-more-tox into lp:~autopilot/autopilot/temp-dev

[Corey Goldberg]

remove tox for running tests across multiple python versions

remove tox.ini and update docs since we are now only supporting python 3.4

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/56/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/428/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/98/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/74/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/74/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/74/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/485
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/827
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6632
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7535

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/114/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'docs/faq/contribute.rst'
--- docs/faq/contribute.rst	2013-12-10 06:23:20 +0000
+++ docs/faq/contribute.rst	2014-05-21 14:34:23 +0000
@@ -97,25 +97,4 @@
 Q. Which version of Python can Autopilot use?
 =============================================
 
-Autopilot supports both Python 2.7 and Python 3.3 from a single code base.
-
-Q. How do I run tests with `tox`?
-=================================
-
-You can use `tox <http://tox.testrun.org>` to test against multiple Python versions.  See `tox.ini` in the Autopilot's root directory for details.
-
-Install `tox`::
-
-    $ sudo apt-get install python-tox
-
-To run all tests against all supported Python versions:
-
-        $ tox
-
-To run specific tests using `tox`::
-
-    $ tox -- <test path>
-
-Example::
-
-    $ tox -- autopilot.tests.unit
+Autopilot supports Python 3.4.

=== removed file 'tox.ini'
--- tox.ini	2013-11-28 01:12:52 +0000
+++ tox.ini	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions.
-#
-# To use it, install the `tox` python package:
-# "sudo pip install tox" or "sudo apt-get install python-tox"
-# then run "tox" from this directory.
-
-
-[tox]
-envlist = flake8, py27, py33
-
-[flake8]
-exclude = .tox, debian, lttng_module
-
-[testenv]
-sitepackages = True
-commands =
-    autopilot run {posargs:autopilot.tests}
-
-[testenv:flake8]
-deps =
-    flake8
-commands =
-    flake8 autopilot