openstack
/
murano-dashboard
Code Issues Proposed changes

Update requirements to match havana's ones. 

Update repo ith openstack/requirements/update.py.

Remove django-pipeline requirement because it was used by djblets
setup.py.

Change-Id: I1f9c2452aa88e87a2c1a9cc3af8275b90efbaa4f
This commit is contained in:
Timur Sufiev 2013-10-28 15:29:26 +04:00
parent b0335c23df
commit af75196e3c
3 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
requirements.txt
View File

@ -1,14 +1,12 @@
d2to1>=0.2.10,<0.3
pbr>=0.5,<1.0
anyjson
pbr>=0.5.21,<1.0
anyjson>=0.3.3
bunch
iso8601>=0.1.4
six
iso8601>=0.1.8
six>=1.4.1
PyYAML
django-pipeline
django-floppyforms==1.1
ordereddict
yaql==0.2
python-muranoclient>=0.2
https://github.com/EkaterinaFedorova/python-metadataclient/releases/download/v0.1-alpha/python-metadataclient-0.1.a8.g1cdbe49.tar.gz#egg=python-metadataclient-0.1.a8.g1cdbe49
murano-metadataclient==0.4.a13.gd65dfd2

43
setup.py
View File

@ -1,31 +1,22 @@
#!/usr/bin/env python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2012 Nebula, Inc.
#
# 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.
# 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
setuptools.setup(
setup_requires=[
'd2to1>=0.2.10,<0.3',
'pbr>=0.5,<0.6'
],
d2to1=True,
)
setup_requires=['pbr'],
pbr=True)

13
test-requirements.txt
View File

@ -1,16 +1,15 @@
distribute>=0.6.24
# Testing Requirements
coverage
coverage>=3.6
django-nose
mox
mox>=0.5.3
nose
nose-exclude
nosexcover
openstack.nose_plugin
nosehtmloutput
openstack.nose_plugin>=0.7
nosehtmloutput>=0.0.3
pep8>=1.3
pylint
pylint==0.25.2
selenium
# Docs Requirements
@ -18,4 +17,4 @@ sphinx>=1.1.2
docutils==0.9.1
# for bug 1091333, remove after sphinx >1.1.3 is released.
# docutils installs Django 1.5.2 and it's unappropriated
Django>=1.4.2,<1.5
Django>=1.4,<1.6