From 2c76fee688593edc8d0a02e43211bf60399b9330 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 15 Aug 2018 23:53:38 +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. Also drops unnecessary Django dependencies. There is no need to install Django explicitly as it is a horizon dependency. The lower bound of oslo.log is added to pass requirements-check job. The new lower bound is picked up from lower-constraints.txt. Change-Id: I32978c11b54ba22a64109cfee1167f473d353373 --- lower-constraints.txt | 6 ------ requirements.txt | 5 ++--- test-requirements.txt | 10 ---------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 5c61fb2..a731ec4 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -11,7 +11,6 @@ debtcollector==1.19.0 Django==1.11 django-appconf==1.0.2 django-compressor==2.0 -django-nose==1.4.4 docutils==0.14 extras==1.0.0 fixtures==3.0.0 @@ -28,11 +27,6 @@ MarkupSafe==1.0 mccabe==0.2.1 mock==2.0.0 netaddr==0.7.19 -nose==1.3.7 -nosehtmloutput==0.0.3 -nosexcover==1.0.10 -nose-exclude==0.5.0 -openstack.nose-plugin==0.7 oslo.config==5.2.0 oslo.i18n==3.20.0 oslo.log==3.36.0 diff --git a/requirements.txt b/requirements.txt index 8fcfc11..691795d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,9 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -Django<2.0,>=1.11 # BSD python-freezerclient>=1.3.0 # Apache-2.0 -oslo.log # Apache-2.0 +oslo.log>=3.36.0 # Apache-2.0 # OpenStack CI will install the following projects from git # if they are in the required-projects list for a job: -horizon>=13.0.0 # Apache-2.0 +horizon>=14.0.0.0b3 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6940b55..9af8954 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,13 +12,3 @@ testtools>=2.2.0 # MIT unittest2>=1.1.0 # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 -nose>=1.3.7 # LGPL -nosehtmloutput>=0.0.3 # Apache-2.0 -openstack.nose-plugin>=0.7 # Apache-2.0 -django-nose>=1.4.4 # BSD -nosexcover>=1.0.10 # BSD -nose-exclude>=0.5.0 # LGPL - -# Horizon requirements -Django<2.0,>=1.11 # BSD -django-compressor>=2.0 # MIT