summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Walker (Daviey) <email@daviey.com>2016-01-22 15:39:23 +0000
committerDave Walker (Daviey) <email@daviey.com>2016-01-24 15:10:03 +0000
commite4bc109543b81f2b5095c7fb1de4c26293772407 (patch)
treefc86ac62ba3a013795678811d6742c695f443e85
parente09a946ccfaf80a9bc4bbbbf327169c09974117c (diff)
downloadceilometer-e4bc109543b81f2b5095c7fb1de4c26293772407.tar.gz
Bump Kilo next version to 2015.1.4 & fix pip
This bumps stable/kilo to next version but also squashes in backport of commit:5f1f33cbc9f943f03c6557691508ef05886fcffd which is needed to unblock CI as pip>=8 is wedged at current. pip has its own download cache by default We no longer need tox to tell us to use one. Note that this is a mandatory fix for use with pip>=8. Change-Id: I1a1d3e6737276240761eb6d5f6e0b4b57b9f1965
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini1
2 files changed, 1 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index 4d99762b..8cc6b324 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = ceilometer
-version = 2015.1.3
+version = 2015.1.4
summary = OpenStack Telemetry
description-file =
README.rst
diff --git a/tox.ini b/tox.ini
index 53792685..cff02d06 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ setenv = VIRTUAL_ENV={envdir}
EVENTLET_NO_GREENDNS=yes
commands =
bash -x {toxinidir}/setup-test-env-mongodb.sh python setup.py testr --slowest --testr-args="{posargs}"
-downloadcache = {toxworkdir}/_download
whitelist_externals = bash
[testenv:py-mysql]