From a5edff2a50fdfe9939cacf5295cd0e253e700d60 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Sat, 18 Aug 2018 04:05:31 +0900 Subject: [PATCH] Drop nose dependencies Horizon test setting no longer depends on nose and related stuffs. This commit cleans up nose related dependencies. The change was made in horizon Rocky-3, so horizon 14.0.0.0b3 is required at least. Change-Id: I3b9a51d79de04279e1872cc41a2bb7c69a0f08f8 --- lower-constraints.txt | 3 --- requirements.txt | 2 +- test-requirements.txt | 2 -- tox.ini | 5 ----- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 1384d1a6..332ce2aa 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -16,7 +16,6 @@ Django==1.8 django-appconf==1.0.2 django-babel==0.5.1 django-compressor==2.0 -django-nose==1.4.4 django-pyscss==2.0.2 dogpile.cache==0.6.2 eventlet==0.18.2 @@ -47,8 +46,6 @@ msgpack-python==0.4.0 munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -nose==1.3.7 -nose-exclude==0.3.0 openstacksdk==0.11.2 os-client-config==1.28.0 os-service-types==1.2.0 diff --git a/requirements.txt b/requirements.txt index 4a772874..0495f9ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -horizon>=13.0.0 # Apache-2.0 +horizon>=14.0.0.0b3 # Apache-2.0 Babel!=2.4.0,>=2.3.4 # BSD openstacksdk>=0.11.2 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 80e6cee5..19427511 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,8 +4,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -django-nose>=1.4.4 # BSD -nose-exclude>=0.3.0 # LGPL selenium>=2.50.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index b719df64..8dbc8855 100644 --- a/tox.ini +++ b/tox.ini @@ -8,11 +8,6 @@ usedevelop = True install_command = pip install {opts} {packages} setenv = VIRTUAL_ENV={envdir} - NOSE_WITH_OPENSTACK=1 - NOSE_OPENSTACK_COLOR=1 - NOSE_OPENSTACK_RED=0.05 - NOSE_OPENSTACK_YELLOW=0.025 - NOSE_OPENSTACK_SHOW_ELAPSED=1 CLIENT_NAME=octavia-dashboard DJANGO_SETTINGS_MODULE=octavia_dashboard.tests.settings deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}