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 091b42b7da)
This commit is contained in:
Jeremy Stanley 2015-05-08 17:43:08 +00:00
parent 1f1a48ff2f
commit e842c13fa5
11 changed files with 1 additions and 22 deletions

View File

@ -265,7 +265,7 @@ you'll need the following settings in your `localrc` section:
If tempest has been successfully configured, a basic set of smoke tests can be run as follows:
$ cd /opt/stack/tempest
$ nosetests tempest/scenario/test_network_basic_ops.py
$ tox -efull tempest.scenario.test_network_basic_ops
# DevStack on Xenserver

View File

@ -1,5 +1,4 @@
bridge-utils
pylint
python-setuptools
screen
unzip

View File

@ -10,9 +10,7 @@ python-xattr
python-sqlalchemy
python-webob
python-kombu
pylint
python-eventlet
python-nose
python-sphinx
python-mox
python-kombu

View File

@ -7,7 +7,6 @@ python-coverage
python-eventlet
python-greenlet
python-netifaces
python-nose
python-pastedeploy
python-simplejson
python-webob

View File

@ -12,7 +12,6 @@ openssh
openssl
psmisc
python-cmd2 # dist:opensuse-12.3
python-pylint
python-setuptools # instead of python-distribute; dist:sle11sp2
screen
tar

View File

@ -14,7 +14,5 @@ python-dateutil
python-eventlet
python-kombu
python-mox
python-nose
python-pylint
python-sqlalchemy-migrate
python-xattr

View File

@ -9,7 +9,6 @@ python-devel
python-eventlet
python-greenlet
python-netifaces
python-nose
python-simplejson
python-xattr
sqlite3

View File

@ -10,7 +10,6 @@ openssl-devel # to rebuild pyOpenSSL if needed
libxml2-devel # dist:rhel6 [2]
libxslt-devel # dist:rhel6 [2]
psmisc
pylint
python-setuptools
python-prettytable # dist:rhel6 [1]
python-virtualenv

View File

@ -2,7 +2,6 @@ Django
gcc
httpd # NOPRIME
mod_wsgi # NOPRIME
pylint
python-anyjson
python-BeautifulSoup
python-boto
@ -14,7 +13,6 @@ python-httplib2
python-kombu
python-migrate
python-mox
python-nose
python-paste #dist:f19,f20
python-paste-deploy #dist:f19,f20
python-routes

View File

@ -7,7 +7,6 @@ python-coverage
python-eventlet
python-greenlet
python-netifaces
python-nose
python-paste-deploy # dist:f19,f20,rhel7
python-simplejson
python-webob

View File

@ -18,7 +18,6 @@
# - (re)start messagebus daemon
# - remove distro packages python-crypto and python-lxml
# - pre-install hgtools to work around a bug in RHEL6 distribute
# - install nose 1.1 from EPEL
set -o errexit
set -o xtrace
@ -161,12 +160,4 @@ if [[ $DISTRO =~ (rhel6) ]]; then
# Note we do this before the track-depends in ``stack.sh``.
pip_install hgtools
# RHEL6's version of ``python-nose`` is incompatible with Tempest.
# Install nose 1.1 (Tempest-compatible) from EPEL
install_package python-nose1.1
# Add a symlink for the new nosetests to allow tox for Tempest to
# work unmolested.
sudo ln -sf /usr/bin/nosetests1.1 /usr/local/bin/nosetests
fi