diff options
| author | gord chung <gord@live.ca> | 2017-11-13 13:48:31 -0500 |
|---|---|---|
| committer | gord chung <gord@live.ca> | 2017-11-14 08:42:02 -0500 |
| commit | 8a39efdfd96f1dfd9eb86b8aa380d5dc5ed50a35 (patch) | |
| tree | 6e486a6ed8a3fcaed0cde894ee47a71a69d10638 | |
| parent | 600bd6ae8a928559d26fbe167b80bd738852cb83 (diff) | |
| download | ceilometer-8a39efdfd96f1dfd9eb86b8aa380d5dc5ed50a35.tar.gz | |
telemetry doesn't follow requirements
we're blocked by requirements even though we don't follow it. this
patch uncaps numpy since pandas is not capped.
cap oslotest as 3.0.0 removes MockPatch functionality
Change-Id: I2b79e372975e228cf7fe19f8ed5f473f2e4ebb6c
| -rw-r--r-- | devstack/plugin.sh | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index de0571c4..62a87b21 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -199,7 +199,13 @@ function ceilometer_create_accounts { function install_gnocchi { echo_summary "Installing Gnocchi" - pip_install "gnocchi[file,${DATABASE_TYPE},keystone]>=3.1,<4.0" + if python3_enabled; then + PY_VERS=${PYTHON3_VERSION} + else + PY_VERS=${PYTHON2_VERSION} + fi + # workaround for upper-constraints. pandas is uncapped but and numpy is. + sudo -H python${PY_VERS} -m pip install -U "gnocchi[file,${DATABASE_TYPE},keystone]>=3.1,<4.0" recreate_database gnocchi sudo install -d -o $STACK_USER -m 755 $GNOCCHI_CONF_DIR diff --git a/test-requirements.txt b/test-requirements.txt index 68ba3d15..3cd7c3db 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ oslo.cache>=1.5.0 # Apache-2.0 openstackdocstheme>=1.0.3 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 reno>=1.6.2 # Apache2 -oslotest>=1.10.0 # Apache-2.0 +oslotest>=1.10.0,<3.0.0 # Apache-2.0 oslo.vmware>=1.16.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD pyOpenSSL>=0.14 # Apache-2.0 |