From 6e612260b7e3e7f94031e5d848a6c284cb6d462f Mon Sep 17 00:00:00 2001 From: Naohiro Tamura Date: Thu, 13 Nov 2014 22:38:33 +0900 Subject: [PATCH] dev-quickstart.rst update to add required packages * added unspecifed required package "python-tox" for Ubuntu/Debian, and removed "py26" from "tox.ini" so that "tox" command doesn't invoke the tests in Python 2.6 environment. Change-Id: I57df22a54fc08f2bb53a17d13b70706952815871 Closes-Bug: #1392304 --- doc/source/dev/dev-quickstart.rst | 6 +++--- tox.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst index 166b8fef1d..1301b819d7 100644 --- a/doc/source/dev/dev-quickstart.rst +++ b/doc/source/dev/dev-quickstart.rst @@ -15,7 +15,7 @@ an OpenStack project. Install prerequisites:: # Ubuntu/Debian: - sudo apt-get install python-dev libssl-dev python-pip libmysqlclient-dev libxml2-dev libxslt-dev libpq-dev git git-review libffi-dev gettext + sudo apt-get install python-dev libssl-dev python-pip libmysqlclient-dev libxml2-dev libxslt-dev libpq-dev git git-review libffi-dev gettext python-tox # Fedora/RHEL: sudo yum install python-devel openssl-devel python-pip mysql-devel libxml2-devel libxslt-devel postgresql-devel git git-review libffi-devel gettext @@ -56,8 +56,8 @@ All unit tests should be run using tox. To run Ironic's entire test suite:: To run a specific test, use a positional argument for the unit tests:: - # run a specific test for both Python 2.6 and 2.7 - tox -epy26,py27 -- test_conductor + # run a specific test for Python 2.7 + tox -epy27 -- test_conductor You may pass options to the test programs using positional arguments:: diff --git a/tox.ini b/tox.ini index 888b4582f4..23ae521085 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py26,py27,pep8 +envlist = py27,pep8 [testenv] usedevelop = True