From 066ed8212072657c77d5def26b9873a29260b025 Mon Sep 17 00:00:00 2001 From: TimurNurlygayanov Date: Wed, 30 Apr 2014 18:04:01 +0400 Subject: [PATCH] Fixed issues with tarballs Change-Id: I6a39d8849d4de9cbd90ab0e28506a84af673c2a8 --- requirements.txt | 8 ++++---- setup.cfg | 1 - setup.py | 31 +++++++++++++++++++------------ 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9ce8cf9e..cab3885b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pbr>=0.5.21,<1.0 -requests -python-keystoneclient>=0.3.2 -cliff>=1.5.2 +pbr>=0.6,!=0.7,<1.0 +requests>=1.1 +python-keystoneclient>=0.7.0 +cliff>=1.4.3 diff --git a/setup.cfg b/setup.cfg index b683672b..1ce31181 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = python-mistralclient -version = 0.01 summary = Mistral Client Library description-file = README.md #license = Apache Software License diff --git a/setup.py b/setup.py index dc838db5..10ec1210 100644 --- a/setup.py +++ b/setup.py @@ -1,23 +1,30 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # -# Copyright 2013 - Mirantis, Inc. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. # 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)