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