diff --git a/.zuul.yaml b/.zuul.yaml index 205a6bb..392a822 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -31,6 +31,7 @@ - openstack/python-vitrageclient - openstack/python-watcherclient - openstack/python-zaqarclient + - openstack/python-zunclient - openstack/requirements - project-template: diff --git a/README.rst b/README.rst index 7587384..86e2634 100644 --- a/README.rst +++ b/README.rst @@ -11,11 +11,14 @@ OpenStackClient :alt: Downloads OpenStackClient (aka OSC) is a command-line client for OpenStack that brings -the command set for Compute, Identity, Image, Object Store and Block Storage -APIs together in a single shell with a uniform command structure. +the command set for Compute, Identity, Image, Network, Object Store and Block +Storage APIs together in a single shell with a uniform command structure. -The primary goal is to provide a unified shell command structure and a common -language to describe operations in OpenStack. +The ``openstackclient`` package is a metapackage that installs +``python-openstackclient`` and a number of optional plugins all at the same +time to simplify the installation of OSC. The major version of +``openstackclient`` will always correspond to the major version of +``python-openstackclient`` that will be installed. * `PyPi`_ - package installation * `Online Documentation`_ @@ -33,7 +36,7 @@ language to describe operations in OpenStack. .. _Online Documentation: http://docs.openstack.org/developer/python-openstackclient/ .. _Launchpad project: https://launchpad.net/python-openstackclient .. _Blueprints: https://blueprints.launchpad.net/python-openstackclient -.. _Bugs: https://bugs.launchpad.net/python-openstackclient +.. _Bugs: https://storyboard.openstack.org/#!/project/975 .. _Source: https://opendev.org/openstack/openstackclient .. _Developer: http://docs.openstack.org/project-team-guide/project-setup/python.html .. _Contributing: http://docs.openstack.org/infra/manual/developers.html diff --git a/doc/requirements.txt b/doc/requirements.txt index 29c60f2..78ca02f 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,6 +3,6 @@ # process, which may cause wedges in the gate later. # this is required for the docs -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD -openstackdocstheme>=1.22.0 # Apache-2.0 +sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD +openstackdocstheme>=1.23.2 # Apache-2.0 diff --git a/doc/source/index.rst b/doc/source/index.rst index a94f71c..13648a4 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -3,9 +3,15 @@ OpenStackClient =============== OpenStackClient (aka OSC) is a command-line client for OpenStack that -brings the command set for Compute, Identity, Image, Object Storage and -Block Storage APIs together in a single shell with a uniform command -structure. +brings the command set for Compute, Identity, Image, Network, Object +Storage and Block Storage APIs together in a single shell with a uniform +command structure. + +The ``openstackclient`` package is a metapackage that installs +``python-openstackclient`` and a number of optional plugins all at the same +time to simplify the installation of OSC. The major version of +``openstackclient`` will always correspond to the major version of +``python-openstackclient`` that will be installed. Getting Started --------------- @@ -17,16 +23,15 @@ Contributing OpenStackClient utilizes all of the usual OpenStack processes and requirements for contributions. The code is hosted `on OpenStack's Git server`_. `Bug reports`_ -and `blueprints`_ may be submitted to the ``openstackclient`` project +may be submitted to the :code:`python-openstackclient` Storyboard project on `Launchpad`_. Code may be submitted to the -``openstack/openstackclient`` project using `Gerrit`_. +:code:`openstack/python-openstackclient` project using `Gerrit`_. Developers may also be found in the `IRC channel`_ ``#openstack-sdks``. .. _`on OpenStack's Git server`: https://opendev.org/openstack/openstackclient .. _Launchpad: https://launchpad.net/python-openstackclient .. _Gerrit: https://docs.openstack.org/infra/manual/developers.html#development-workflow -.. _Bug reports: https://bugs.launchpad.net/python-openstackclient/+bugs -.. _blueprints: https://blueprints.launchpad.net/python-openstackclient +.. _Bug reports: https://storyboard.openstack.org/#!/project/975 .. _PyPi: https://pypi.org/project/openstackclient .. _tarball: https://tarballs.openstack.org/openstackclient .. _IRC channel: https://wiki.openstack.org/wiki/IRC diff --git a/requirements.txt b/requirements.txt index 6f2f333..b69a863 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,17 +10,18 @@ python-barbicanclient>=4.5.2 # Apache-2.0 python-congressclient<2000,>=1.3.0 # Apache-2.0 python-designateclient>=2.7.0 # Apache-2.0 python-heatclient>=1.10.0 # Apache-2.0 -python-ironicclient>=1.14.0 # Apache-2.0 +python-ironicclient>=2.3.0 # Apache-2.0 python-ironic-inspector-client>=1.5.0 # Apache-2.0 -python-mistralclient>=3.1.0 # Apache-2.0 +python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0 python-muranoclient>=0.8.2 # Apache-2.0 -python-neutronclient>=6.3.0 # Apache-2.0 -python-octaviaclient>=1.0.0 # Apache-2.0 -python-openstackclient>=3.12.0 # Apache-2.0 -python-saharaclient>=1.2.0 # Apache-2.0 +python-neutronclient>=6.7.0 # Apache-2.0 +python-octaviaclient>=1.3.0 # Apache-2.0 +python-openstackclient>=4.0.0 # Apache-2.0 +python-saharaclient>=1.4.0 # Apache-2.0 python-searchlightclient>=1.0.0 #Apache-2.0 python-senlinclient>=1.1.0 # Apache-2.0 python-troveclient>=2.2.0 # Apache-2.0 python-vitrageclient>=1.3.0 # Apache-2.0 python-watcherclient>=1.1.0 # Apache-2.0 python-zaqarclient>=1.0.0 # Apache-2.0 +python-zunclient>=3.4.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 98564e3..e1dcc4f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,15 +18,3 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 - -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 - -[upload_sphinx] -upload-dir = doc/build/html - -[pbr] -# TODO(jaegernandi): Set to True again once pbr 1.11.0 is out. -warnerrors = False diff --git a/test-requirements.txt b/test-requirements.txt index acefc21..70aac07 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,5 +4,5 @@ hacking<0.11,>=0.10.0 # this is required for the tests -oslotest>=1.10.0 # Apache-2.0 +oslotest>=3.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0