From e842c13fa509f67abb9b364438ff255ad4b721ed Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 8 May 2015 17:43:08 +0000 Subject: [PATCH] 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) --- README.md | 2 +- files/apts/general | 1 - files/apts/horizon | 2 -- files/apts/swift | 1 - files/rpms-suse/general | 1 - files/rpms-suse/horizon | 2 -- files/rpms-suse/swift | 1 - files/rpms/general | 1 - files/rpms/horizon | 2 -- files/rpms/swift | 1 - tools/fixup_stuff.sh | 9 --------- 11 files changed, 1 insertion(+), 22 deletions(-) diff --git a/README.md b/README.md index 89e3855d38..c4926ac8fd 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/files/apts/general b/files/apts/general index 85a6711330..2c0d5c09b6 100644 --- a/files/apts/general +++ b/files/apts/general @@ -1,5 +1,4 @@ bridge-utils -pylint python-setuptools screen unzip diff --git a/files/apts/horizon b/files/apts/horizon index df248915f3..eb6651d433 100644 --- a/files/apts/horizon +++ b/files/apts/horizon @@ -10,9 +10,7 @@ python-xattr python-sqlalchemy python-webob python-kombu -pylint python-eventlet -python-nose python-sphinx python-mox python-kombu diff --git a/files/apts/swift b/files/apts/swift index 0c27b5b982..122494c05b 100644 --- a/files/apts/swift +++ b/files/apts/swift @@ -7,7 +7,6 @@ python-coverage python-eventlet python-greenlet python-netifaces -python-nose python-pastedeploy python-simplejson python-webob diff --git a/files/rpms-suse/general b/files/rpms-suse/general index a716c9dc3c..e21c8f7ed7 100644 --- a/files/rpms-suse/general +++ b/files/rpms-suse/general @@ -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 diff --git a/files/rpms-suse/horizon b/files/rpms-suse/horizon index d3bde2690c..74764f3356 100644 --- a/files/rpms-suse/horizon +++ b/files/rpms-suse/horizon @@ -14,7 +14,5 @@ python-dateutil python-eventlet python-kombu python-mox -python-nose -python-pylint python-sqlalchemy-migrate python-xattr diff --git a/files/rpms-suse/swift b/files/rpms-suse/swift index f3c95aad98..b32316fb55 100644 --- a/files/rpms-suse/swift +++ b/files/rpms-suse/swift @@ -9,7 +9,6 @@ python-devel python-eventlet python-greenlet python-netifaces -python-nose python-simplejson python-xattr sqlite3 diff --git a/files/rpms/general b/files/rpms/general index ca33a99623..b39d25bf56 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -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 diff --git a/files/rpms/horizon b/files/rpms/horizon index 38d349d7a3..7678716d43 100644 --- a/files/rpms/horizon +++ b/files/rpms/horizon @@ -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 diff --git a/files/rpms/swift b/files/rpms/swift index ec53424ada..2f17186191 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -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 diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 8defc06a3b..15ed6e7a62 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -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