Browse code
Stop installing nose and pylint from distros
The distro packages of nose and pylint depend on python-setuptools
on some platforms, and on some of those platforms (at least CentOS
6.x) you can't resolve dependencies on python-setuptools properly if
you've forcibly removed it already (as we do on our CI workers). It
appears that any current upstream use of these tools in relation to
DevStack-based testing is now relying on tox and pip to obtain them
instead.
Conflicts:
files/debs/swift
files/rpms-suse/general
files/rpms/general
files/rpms/horizon
Change-Id: Ibd16ac550c90364115caf57fae4f5f4cb5d5f238
(cherry picked from commit 091b42b7da7650d528bb5f88ec411a04af3da828)
Jeremy Stanley authored on 2015/05/09 02:43:08Showing 11 changed files
- README.md
- files/apts/general
- files/apts/horizon
- files/apts/swift
- files/rpms-suse/general
- files/rpms-suse/horizon
- files/rpms-suse/swift
- files/rpms/general
- files/rpms/horizon
- files/rpms/swift
- tools/fixup_stuff.sh
| ... | ... |
@@ -265,7 +265,7 @@ you'll need the following settings in your `localrc` section: |
| 265 | 265 |
If tempest has been successfully configured, a basic set of smoke tests can be run as follows: |
| 266 | 266 |
|
| 267 | 267 |
$ cd /opt/stack/tempest |
| 268 |
- $ nosetests tempest/scenario/test_network_basic_ops.py |
|
| 268 |
+ $ tox -efull tempest.scenario.test_network_basic_ops |
|
| 269 | 269 |
|
| 270 | 270 |
# DevStack on Xenserver |
| 271 | 271 |
|
| ... | ... |
@@ -2,7 +2,6 @@ Django |
| 2 | 2 |
gcc |
| 3 | 3 |
httpd # NOPRIME |
| 4 | 4 |
mod_wsgi # NOPRIME |
| 5 |
-pylint |
|
| 6 | 5 |
python-anyjson |
| 7 | 6 |
python-BeautifulSoup |
| 8 | 7 |
python-boto |
| ... | ... |
@@ -14,7 +13,6 @@ python-httplib2 |
| 14 | 14 |
python-kombu |
| 15 | 15 |
python-migrate |
| 16 | 16 |
python-mox |
| 17 |
-python-nose |
|
| 18 | 17 |
python-paste #dist:f19,f20 |
| 19 | 18 |
python-paste-deploy #dist:f19,f20 |
| 20 | 19 |
python-routes |
| ... | ... |
@@ -18,7 +18,6 @@ |
| 18 | 18 |
# - (re)start messagebus daemon |
| 19 | 19 |
# - remove distro packages python-crypto and python-lxml |
| 20 | 20 |
# - pre-install hgtools to work around a bug in RHEL6 distribute |
| 21 |
-# - install nose 1.1 from EPEL |
|
| 22 | 21 |
|
| 23 | 22 |
set -o errexit |
| 24 | 23 |
set -o xtrace |
| ... | ... |
@@ -161,12 +160,4 @@ if [[ $DISTRO =~ (rhel6) ]]; then |
| 161 | 161 |
# Note we do this before the track-depends in ``stack.sh``. |
| 162 | 162 |
pip_install hgtools |
| 163 | 163 |
|
| 164 |
- |
|
| 165 |
- # RHEL6's version of ``python-nose`` is incompatible with Tempest. |
|
| 166 |
- # Install nose 1.1 (Tempest-compatible) from EPEL |
|
| 167 |
- install_package python-nose1.1 |
|
| 168 |
- # Add a symlink for the new nosetests to allow tox for Tempest to |
|
| 169 |
- # work unmolested. |
|
| 170 |
- sudo ln -sf /usr/bin/nosetests1.1 /usr/local/bin/nosetests |
|
| 171 |
- |
|
| 172 | 164 |
fi |