From 0696510d2903f6b7947c01be0eb2b406afb92833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Albert?= Date: Thu, 27 Aug 2015 16:23:35 +0200 Subject: [PATCH] Preparing release 0.4.1 Change-Id: I549c749bcef38d997ec7a49da7478c90655066b4 --- requirements.txt | 12 ++++++------ setup.cfg | 4 ++-- setup.py | 9 ++++++++- test-requirements.txt | 12 ++++++------ 4 files changed, 22 insertions(+), 15 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 2354862..cb5b67b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.6,!=0.7,<1.0 +pbr!=0.7,<1.0,>=0.6 Babel>=1.3 -python-keystoneclient -stevedore -oslo.i18n -oslo.serialization -oslo.utils +python-keystoneclient<1.4.0,>=1.2.0 +stevedore<1.4.0,>=1.3.0 # Apache-2.0 +oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0 +oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0 +oslo.utils<1.5.0,>=1.4.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 0d61af8..1baa5a0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = python-cloudkittyclient -version = 0.1 -summary = Cloudkittyclient is the api client for the cloudkitty rating project. +version = 0.4.1 +summary = API client of cloudkitty, Rating as a Service project. description-file = README.rst author = OpenStack diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 70c2b3f..056c16c --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,6 +16,14 @@ # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + setuptools.setup( setup_requires=['pbr'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index d494076..630c3b9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,14 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.9.2,<0.10 +hacking<0.10,>=0.9.2 coverage>=3.6 discover -python-subunit -sphinx>=1.1.2 -oslosphinx -oslotest>=1.1.0.0a1 +python-subunit>=0.0.18 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx<2.6.0,>=2.5.0 # Apache-2.0 +oslotest<1.6.0,>=1.5.1 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.34 +testtools!=1.2.0,>=0.9.36