From 09695532764d523c1b102ff9512ed9682e845c04 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Sun, 13 May 2018 21:54:21 -0400 Subject: [PATCH] Require the (soon-to-be) Rocky version of Horizon ... or at least the first published tarball which will lead to Rocky. On the other side this means forcing the usage of mox as long as there are tests that depends on it (the switch was already flipped in Horizon, so it needs to be enabled here). This allows us to depend on newer Horizon features, including changes to the test suite that are useful for the mox removal effort. Also remove mox since there are no unit tests that need it. Change-Id: Ia8e0d5512f11e3d191ca2f6259075e35490290c2 Signed-off-by: Charles Short --- lower-constraints.txt | 2 +- manila_ui/dashboards/identity/projects/workflows.py | 1 + requirements.txt | 2 +- test-requirements.txt | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index b0435a3e..94a1052b 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -29,7 +29,7 @@ fixtures==3.0.0 flake8==2.5.5 futurist==1.6.0 hacking==0.12.0 -horizon==13.0.0 +horizon==14.0.0.0b1 idna==2.6 imagesize==1.0.0 iso8601==0.1.11 diff --git a/manila_ui/dashboards/identity/projects/workflows.py b/manila_ui/dashboards/identity/projects/workflows.py index 82450026..a8b60030 100644 --- a/manila_ui/dashboards/identity/projects/workflows.py +++ b/manila_ui/dashboards/identity/projects/workflows.py @@ -23,6 +23,7 @@ from manila_ui.api import manila as api_manila class ShareQuotaAction(project_workflows.CommonQuotaAction): + use_mox = False shares = forms.IntegerField(min_value=-1, label=_("Shares")) share_gigabytes = forms.IntegerField( min_value=-1, label=_("Share gigabytes")) diff --git a/requirements.txt b/requirements.txt index d2d57118..31ef5a90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,4 @@ python-keystoneclient>=3.8.0 # Apache-2.0 python-manilaclient>=1.16.0 # Apache-2.0 six>=1.10.0 # MIT -horizon>=13.0.0 # Apache-2.0 +horizon>=14.0.0.0b1 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 22989603..60a93870 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,6 @@ coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT django-nose>=1.4.4 # BSD mock>=2.0.0 # BSD -mox3>=0.20.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD openstackdocstheme>=1.18.1 # Apache-2.0