Rework optional-requirements

As discussed at weekly meeting, we should use optional-requirements only
for small number of cases.

This patch:
 - moves most of packages from optional-requirements to requirements
 - make groups of packages in requirements.txt
 - sorts Openstack related group of package
 - describes purpose of optional-requirements

Change-Id: I24fff516588d064069bf4226adeb0ae209c16d42
This commit is contained in:
Andrey Kurilin 2016-09-13 18:27:18 +03:00
parent e69687bfce
commit 6c3809aa48
2 changed files with 38 additions and 24 deletions

View File

@ -1,8 +1,12 @@
python-mistralclient>=2.0.0
# Purpose of optional-requirements is simple - list requirements which cannot
# be placed in main requirements.txt .
#
# Reasons:
# - package doesn't support the same Python versions as Rally package
# supports (see classifiers from setup.cfg)
# - package doesn't have releases
# If these rules do not relate to your package, feel free to propose it as main
# requirement to Rally (requirements.txt file).
# [do-not-touch] our plugins support only one version of fuelclient
python-fuelclient==6.1.0 # Apache Software License
python-muranoclient>=0.8.2 # Apache License, Version 2.0
python-cueclient>=1.0.0 # Apache License, Version 2.0
python-senlinclient>=0.3.0 # Apache Software License
python-magnumclient>=2.0.0 # Apache Software License
gnocchiclient>=2.2.0 # Apache Software License

View File

@ -1,8 +1,9 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# Rally core dependencies
alembic>=0.8.4 # MIT
boto>=2.32.1 # MIT
decorator>=3.4.0 # new BSD License
Jinja2>=2.8 # BSD
jsonschema>=2.0.0,!=2.5.0,<3.0.0 # MIT
@ -17,25 +18,34 @@ paramiko>=2.0 # LGPL
pbr>=1.6 # Apache Software License
PrettyTable>=0.7,<0.8 # BSD
PyYAML>=3.1.0 # MIT
python-designateclient>=1.5.0 # Apache License, Version 2.0
python-glanceclient>=2.3.0,!=2.4.0 # Apache License, Version 2.0
python-keystoneclient>=2.0.0,!=2.1.0 # Apache Software License
keystoneauth1>=2.10.0 # Apache Software License
python-novaclient>=2.29.0,!=2.33.0 # Apache License, Version 2.0
python-neutronclient>=5.1.0 # Apache Software License
python-cinderclient>=1.6.0,!=1.7.0,!=1.7.1 # Apache Software License
python-manilaclient>=1.10.0 # Apache Software License
python-monascaclient>=1.1.0 # Apache Software License
python-heatclient>=1.4.0 # Apache Software License
python-ceilometerclient>=2.5.0 # Apache Software License
python-ironicclient>=1.6.0 # Apache Software License
python-saharaclient>=0.18.0 # Apache License, Version 2.0
python-troveclient>=2.2.0 # Apache Software License
python-zaqarclient>=1.0.0 # Apache Software License
python-swiftclient>=2.2.0 # Apache Software License
python-watcherclient>=0.23.0 # Apache Software License
python-subunit>=0.0.18
requests>=2.10.0 # Apache License, Version 2.0
SQLAlchemy>=1.0.10,<1.1.0 # MIT
sphinx>=1.2.1,!=1.3b1,<1.3 # BSD
six>=1.9.0 # MIT
# OpenStack related
boto>=2.32.1 # MIT
gnocchiclient>=2.2.0 # Apache Software License
keystoneauth1>=2.10.0 # Apache Software License
python-ceilometerclient>=2.5.0 # Apache Software License
python-cinderclient>=1.6.0,!=1.7.0,!=1.7.1 # Apache Software License
python-cueclient>=1.0.0 # Apache License, Version 2.0
python-designateclient>=1.5.0 # Apache License, Version 2.0
python-glanceclient>=2.3.0,!=2.4.0 # Apache License, Version 2.0
python-heatclient>=1.4.0 # Apache Software License
python-ironicclient>=1.6.0 # Apache Software License
python-keystoneclient>=2.0.0,!=2.1.0 # Apache Software License
python-magnumclient>=2.0.0 # Apache Software License
python-manilaclient>=1.10.0 # Apache Software License
python-mistralclient>=2.0.0
python-monascaclient>=1.1.0 # Apache Software License
python-muranoclient>=0.8.2 # Apache License, Version 2.0
python-neutronclient>=5.1.0 # Apache Software License
python-novaclient>=2.29.0,!=2.33.0 # Apache License, Version 2.0
python-saharaclient>=0.18.0 # Apache License, Version 2.0
python-senlinclient>=0.3.0 # Apache Software License
python-swiftclient>=2.2.0 # Apache Software License
python-troveclient>=2.2.0 # Apache Software License
python-watcherclient>=0.23.0 # Apache Software License
python-zaqarclient>=1.0.0 # Apache Software License