summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--requirements.txt3
-rw-r--r--setup.cfg7
-rw-r--r--tox.ini8
3 files changed, 7 insertions, 11 deletions
diff --git a/requirements.txt b/requirements.txt
index 9459372d..5aaedb24 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -34,3 +34,6 @@ stevedore>=1.9.0 # Apache-2.0
tenacity>=3.2.1 # Apache-2.0
tooz[zake]>=1.47.0 # Apache-2.0
os-xenapi>=0.1.1 # Apache-2.0
+oslo.cache>=1.5.0 # Apache-2.0
+gnocchiclient>=7.0.0 # Apache-2.0
+python-zaqarclient>=1.0.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 7e8415f8..aa55eafa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,13 +30,6 @@ packages =
data_files =
etc/ceilometer = etc/ceilometer/*
-[extras]
-gnocchi =
- oslo.cache>=1.5.0 # Apache-2.0
- gnocchiclient>=7.0.0 # Apache-2.0
-zaqar =
- python-zaqarclient>=1.0.0 # Apache-2.0
-
[entry_points]
ceilometer.notification.pipeline =
meter = ceilometer.pipeline.sample:SamplePipelineManager
diff --git a/tox.ini b/tox.ini
index e68321d1..71485301 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,10 +4,10 @@ skipsdist = True
envlist = py27,pep8
[testenv]
-deps = .[gnocchi,zaqar]
- -r{toxinidir}/test-requirements.txt
-# NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt
-install_command = pip install -U {opts} {packages}
+deps = -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
+ -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+install_command = pip install {opts} {packages}
usedevelop = True
setenv = VIRTUAL_ENV={envdir}
CEILOMETER_TEST_BACKEND={env:CEILOMETER_TEST_BACKEND:none}