summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimur Sufiev <tsufiev@mirantis.com>2013-10-01 15:48:03 +0400
committerTimur Sufiev <tsufiev@mirantis.com>2013-10-01 15:48:03 +0400
commitf3e360352341aacf6eec78907dd3ccfe242b6b6a (patch)
tree9e8abba2fa7761256c9959fe3fe2944422577c4d
parent4fa0c25dfd474a9455e61f8bc946afe841032d5a (diff)
Fix setup.py to not use 2to1.0.2.120.2.11release-0.2
Change-Id: I02a6527bfe2a5850233550ef92e7d95293748c4d Fixes: bug/MRN-1110.
Notes
Notes (review): Verified+2: Jenkins Approved+1: Timur Nurlygayanov <tnurlygayanov@mirantis.com> Code-Review+2: Timur Nurlygayanov <tnurlygayanov@mirantis.com> Submitted-by: Jenkins Submitted-at: Tue, 01 Oct 2013 12:52:09 +0000 Reviewed-on: https://review.openstack.org/49141 Project: stackforge/python-muranoclient Branch: refs/heads/release-0.2
-rw-r--r--setup.py32
1 files changed, 15 insertions, 17 deletions
diff --git a/setup.py b/setup.py
index d71b798..70c2b3f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,22 @@
1# Copyright (c) 2013 Mirantis, Inc. 1#!/usr/bin/env python
2# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
2# 3#
3# Licensed under the Apache License, Version 2.0 (the "License"); you may 4# Licensed under the Apache License, Version 2.0 (the "License");
4# not use this file except in compliance with the License. You may obtain 5# you may not use this file except in compliance with the License.
5# a copy of the License at 6# You may obtain a copy of the License at
6# 7#
7# http://www.apache.org/licenses/LICENSE-2.0 8# http://www.apache.org/licenses/LICENSE-2.0
8# 9#
9# Unless required by applicable law or agreed to in writing, software 10# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 11# distributed under the License is distributed on an "AS IS" BASIS,
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
12# License for the specific language governing permissions and limitations 13# implied.
13# under the License. 14# See the License for the specific language governing permissions and
15# limitations under the License.
14 16
17# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
15import setuptools 18import setuptools
16import multiprocessing
17 19
18setuptools.setup( 20setuptools.setup(
19 setup_requires=[ 21 setup_requires=['pbr'],
20 'd2to1>=0.2.10,<0.3', 22 pbr=True)
21 'pbr>=0.5,<0.6'
22 ],
23 d2to1=True,
24)