Sync with global requirements

And more importantly, get rid of d2to1 references.

Skipped test-requirements because of webtest and I need the d2to1 change
in.

Closes-Bug: 1233362
Change-Id: I570fed1de8b9fbef168cf1ecfc6f62ae842820e1
This commit is contained in:
Monty Taylor 2013-09-30 11:20:08 -04:00
parent aa7a110247
commit e614643b08
2 changed files with 13 additions and 13 deletions

View File

@ -1,20 +1,19 @@
# keystone dependencies
d2to1>=0.2.10,<0.3
pbr>=0.5,<0.6
pbr>=0.5.21,<1.0
pam>=0.1.4
WebOb>=1.0.8
eventlet
greenlet
WebOb>=1.2.3,<1.3
eventlet>=0.13.0
greenlet>=0.3.2
netaddr
PasteDeploy
paste
routes
sqlalchemy>=0.7.8,<=0.7.9
PasteDeploy>=1.5.0
Paste
Routes>=1.12.3
SQLAlchemy>=0.7.8,<=0.7.99
sqlalchemy-migrate>=0.7.2
passlib
lxml
lxml>=2.3
iso8601>=0.1.4
python-keystoneclient>=0.3.0
python-keystoneclient>=0.3.2
oslo.config>=1.2.0
Babel>=0.9.6
oauth2

View File

@ -14,8 +14,9 @@
# 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>=0.5,<0.6'],
d2to1=True)
setup_requires=['pbr'],
pbr=True)