diff options
| -rw-r--r-- | .gitreview | 2 | ||||
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | keystonemiddleware/auth_token/_auth.py | 2 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | releasenotes/source/index.rst | 1 | ||||
| -rw-r--r-- | releasenotes/source/stein.rst | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
7 files changed, 14 insertions, 6 deletions
@@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/keystonemiddleware.git diff --git a/doc/requirements.txt b/doc/requirements.txt index 6e62d8d..bf40912 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -6,7 +6,8 @@ doc8>=0.6.0 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +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 sphinxcontrib-apidoc>=0.2.0 # BSD # For autodoc builds diff --git a/keystonemiddleware/auth_token/_auth.py b/keystonemiddleware/auth_token/_auth.py index 29019d9..652918c 100644 --- a/keystonemiddleware/auth_token/_auth.py +++ b/keystonemiddleware/auth_token/_auth.py @@ -41,7 +41,7 @@ class AuthTokenPlugin(plugin.BaseAuthPlugin): log.warning('Configuring admin URI using auth fragments was ' 'deprecated in the Kilo release, and will be ' 'removed in the Newton release, ' - 'use \'identity_uri\ instead.') + "use 'identity_uri' instead.") if ':' in auth_host: # Note(dzyu) it is an IPv6 address, so it needs to be wrapped diff --git a/lower-constraints.txt b/lower-constraints.txt index 09c0e2a..9ea603f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -58,7 +58,7 @@ pyparsing==2.2.0 pyperclip==1.6.0 python-dateutil==2.7.0 python-keystoneclient==3.10.0 -python-memcached==1.56 +python-memcached==1.59 python-mimeparse==1.6.0 python-subunit==1.2.0 pytz==2018.3 diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 072e2e1..62d6b53 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + stein rocky queens pike diff --git a/releasenotes/source/stein.rst b/releasenotes/source/stein.rst new file mode 100644 index 0000000..efaceb6 --- /dev/null +++ b/releasenotes/source/stein.rst @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff --git a/test-requirements.txt b/test-requirements.txt index 3153d81..6ca0c43 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,9 +15,9 @@ stevedore>=1.20.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD testtools>=2.2.0 # MIT -python-memcached>=1.56 # PSF +python-memcached>=1.59 # PSF WebTest>=2.0.27 # MIT oslo.messaging>=5.29.0 # Apache-2.0 # Bandit security code scanner -bandit>=1.1.0 # Apache-2.0 +bandit!=1.6.0,>=1.1.0 # Apache-2.0 |