diff --git a/requirements.txt b/requirements.txt index 052cb7752..0d4d86c64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ cliff>=1.4 -d2to1>=0.2.10,<0.3 eventlet>=0.12.0 extras Flask==0.9 diff --git a/setup.py b/setup.py index 25702851c..15f4e9d54 100755 --- a/setup.py +++ b/setup.py @@ -1,21 +1,22 @@ #!/usr/bin/env python -# Copyright 2012 Managed I.T. +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # -# Author: Kiall Mac Innes +# 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. +# 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 setuptools.setup( - setup_requires=['d2to1', 'pbr'], - d2to1=True) + setup_requires=['pbr>=0.5.20'], + pbr=True)