diff options
| -rw-r--r-- | doc/source/conf.py | 2 | ||||
| -rw-r--r-- | releasenotes/source/index.rst | 1 | ||||
| -rw-r--r-- | releasenotes/source/train.rst | 6 | ||||
| -rw-r--r-- | setup.cfg | 13 | ||||
| -rw-r--r-- | setup.py | 9 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
6 files changed, 9 insertions, 23 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 8fb3dba..751b01a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,8 +10,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from __future__ import unicode_literals - import os import sys diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index c83f71d..5fcb304 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + train stein rocky queens diff --git a/releasenotes/source/train.rst b/releasenotes/source/train.rst new file mode 100644 index 0000000..7fa1088 --- /dev/null +++ b/releasenotes/source/train.rst @@ -0,0 +1,6 @@ +=================================== + Train Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/train @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/python-keystoneclient/latest/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -35,21 +36,12 @@ keystoneclient.auth.plugin = v3scopedsaml = keystoneclient.contrib.auth.v3.saml2:Saml2ScopedToken v3unscopedadfs = keystoneclient.contrib.auth.v3.saml2:ADFSUnscopedToken -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - [pbr] autodoc_tree_index_modules = True autodoc_tree_excludes = setup.py keystoneclient/tests/ -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = keystoneclient/locale domain = keystoneclient @@ -63,6 +55,3 @@ input_file = keystoneclient/locale/keystoneclient.pot keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = keystoneclient/locale/keystoneclient.pot - -[wheel] -universal = 1 @@ -13,17 +13,8 @@ # 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 -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index d27f88c..d9e1972 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,6 +12,7 @@ keyring>=5.5.1;python_version>='3.4' # MIT/PSF lxml!=3.7.0,>=3.4.1 # BSD mock>=2.0.0 # BSD oauthlib>=0.6.2 # BSD +os-client-config>=1.28.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0 |