summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-05-07 17:58:50 +0000
committerGerrit Code Review <review@openstack.org>2014-05-07 17:58:50 +0000
commitff1f0fd66e4f14116c7fc7ed54872f4aae577dbf (patch)
treeb7b575c46a73a2f8e42d8548faabbd4daf53b3d4
parent53b42310fd0cf7e1819e6317f382968693935e40 (diff)
parentd5fb7a83ba8f91c7fc7e903e1b1640067f751100 (diff)
downloadstevedore-ff1f0fd66e4f14116c7fc7ed54872f4aae577dbf.tar.gz
Merge "Updated from global requirements"
-rw-r--r--setup.py20
1 files changed, 18 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index a487b83..7363757 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,30 @@
#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# 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
+#
+# 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 # flake8: noqa
+ import multiprocessing # noqa
except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr>=0.5.21,<1.0'],
+ setup_requires=['pbr'],
pbr=True)