summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/source/conf.py4
-rw-r--r--keystonemiddleware/audit/_notifier.py20
-rw-r--r--releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po54
-rw-r--r--releasenotes/source/locale/ko_KR/LC_MESSAGES/releasenotes.po63
-rw-r--r--requirements.txt10
-rw-r--r--setup.cfg6
-rw-r--r--setup.py2
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini2
9 files changed, 131 insertions, 32 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 71909b7..a6eb2c4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -43,10 +43,6 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.intersphinx',
- # NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and
- # remove this Sphinx extension when
- # https://launchpad.net/bugs/1260495 is fixed.
- 'ext.apidoc',
'oslosphinx',
'oslo_config.sphinxconfiggen'
]
diff --git a/keystonemiddleware/audit/_notifier.py b/keystonemiddleware/audit/_notifier.py
index 83898d4..9d17c29 100644
--- a/keystonemiddleware/audit/_notifier.py
+++ b/keystonemiddleware/audit/_notifier.py
@@ -18,8 +18,6 @@ try:
except ImportError:
oslo_messaging = None
-from pycadf import cadftaxonomy as taxonomy
-
from keystonemiddleware.i18n import _LI
@@ -46,24 +44,8 @@ class _MessagingNotifier(object):
def create_notifier(conf, log):
if oslo_messaging:
- proj = conf.project or taxonomy.UNKNOWN
-
- if proj:
- # Aliases to support backward compatibility
- aliases = {
- '%s.openstack.common.rpc.impl_kombu' % proj: 'rabbit',
- '%s.openstack.common.rpc.impl_qpid' % proj: 'qpid',
- '%s.openstack.common.rpc.impl_zmq' % proj: 'zmq',
- '%s.rpc.impl_kombu' % proj: 'rabbit',
- '%s.rpc.impl_qpid' % proj: 'qpid',
- '%s.rpc.impl_zmq' % proj: 'zmq',
- }
- else:
- aliases = {}
-
transport = oslo_messaging.get_transport(conf.oslo_conf_obj,
- url=conf.get('transport_url'),
- aliases=aliases)
+ url=conf.get('transport_url'))
notifier = oslo_messaging.Notifier(
transport,
diff --git a/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
new file mode 100644
index 0000000..c708926
--- /dev/null
+++ b/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
@@ -0,0 +1,54 @@
+# Gérald LONLAS <g.lonlas@gmail.com>, 2016. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: keystonemiddleware Release Notes 4.14.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-05 12:59+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-10-22 05:26+0000\n"
+"Last-Translator: Gérald LONLAS <g.lonlas@gmail.com>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+msgid "4.1.0"
+msgstr "4.1.0"
+
+msgid "4.2.0"
+msgstr "4.2.0"
+
+msgid "4.3.0"
+msgstr "4.3.0"
+
+msgid "4.5.0"
+msgstr "4.5.0"
+
+msgid "4.6.0"
+msgstr "4.6.0"
+
+msgid "Bug Fixes"
+msgstr "Corrections de bugs"
+
+msgid "Current Series Release Notes"
+msgstr "Note de la release actuelle"
+
+msgid "Deprecation Notes"
+msgstr "Notes dépréciées "
+
+msgid "Mitaka Series Release Notes"
+msgstr "Note de release pour Mitaka"
+
+msgid "New Features"
+msgstr "Nouvelles fonctionnalités"
+
+msgid "Newton Series Release Notes"
+msgstr "Note de release pour Newton"
+
+msgid "Security Issues"
+msgstr "Problèmes de sécurités"
+
+msgid "keystonemiddleware Release Notes"
+msgstr "Note de release de keystonemiddleware"
diff --git a/releasenotes/source/locale/ko_KR/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/ko_KR/LC_MESSAGES/releasenotes.po
new file mode 100644
index 0000000..e4d82ff
--- /dev/null
+++ b/releasenotes/source/locale/ko_KR/LC_MESSAGES/releasenotes.po
@@ -0,0 +1,63 @@
+# Ian Y. Choi <ianyrchoi@gmail.com>, 2017. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: keystonemiddleware Release Notes 4.14.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-05 12:59+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-01-19 04:08+0000\n"
+"Last-Translator: Ian Y. Choi <ianyrchoi@gmail.com>\n"
+"Language-Team: Korean (South Korea)\n"
+"Language: ko-KR\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+msgid "4.1.0"
+msgstr "4.1.0"
+
+msgid "4.12.0"
+msgstr "4.12.0"
+
+msgid "4.2.0"
+msgstr "4.2.0"
+
+msgid "4.3.0"
+msgstr "4.3.0"
+
+msgid "4.5.0"
+msgstr "4.5.0"
+
+msgid "4.6.0"
+msgstr "4.6.0"
+
+msgid "Bug Fixes"
+msgstr "버그 수정"
+
+msgid "Current Series Release Notes"
+msgstr "최신 시리즈에 대한 릴리즈 노트"
+
+msgid "Deprecation Notes"
+msgstr "지원 종료된 기능 노트"
+
+msgid "Mitaka Series Release Notes"
+msgstr "Mitaka 시리즈에 대한 릴리즈 노트"
+
+msgid "New Features"
+msgstr "새로운 기능"
+
+msgid "Newton Series Release Notes"
+msgstr "Newton 시리즈에 대한 릴리즈 노트"
+
+msgid "Ocata Series Release Notes"
+msgstr "Ocata 시리즈에 대한 릴리즈 노트"
+
+msgid "Security Issues"
+msgstr "보안 이슈"
+
+msgid "Upgrade Notes"
+msgstr "업그레이드 노트"
+
+msgid "keystonemiddleware Release Notes"
+msgstr "keystonemiddleware 릴리즈 노트"
diff --git a/requirements.txt b/requirements.txt
index a0cf3f8..3c58e68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,16 +3,16 @@
# process, which may cause wedges in the gate later.
keystoneauth1>=2.18.0 # Apache-2.0
-oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
+oslo.config>=3.22.0 # Apache-2.0
oslo.context>=2.12.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
-oslo.log>=3.11.0 # Apache-2.0
+oslo.log>=3.22.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.18.0 # Apache-2.0
-pbr>=1.8 # Apache-2.0
+oslo.utils>=3.20.0 # Apache-2.0
+pbr>=2.0.0 # Apache-2.0
positional>=1.1.1 # Apache-2.0
pycadf!=2.0.0,>=1.1.0 # Apache-2.0
python-keystoneclient>=3.8.0 # Apache-2.0
requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
six>=1.9.0 # MIT
-WebOb>=1.6.0 # MIT
+WebOb>=1.7.1 # MIT
diff --git a/setup.cfg b/setup.cfg
index dff4e89..232cb18 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,7 @@ packages =
[extras]
audit_notifications =
- oslo.messaging>=5.14.0 # Apache-2.0
+ oslo.messaging>=5.19.0 # Apache-2.0
[global]
setup-hooks =
@@ -45,6 +45,10 @@ source-dir = doc/source
build-dir = doc/build
all_files = 1
+[pbr]
+autodoc_tree_index_modules = True
+autodoc_tree_excludes = setup.py
+
[upload_sphinx]
upload-dir = doc/build/html
diff --git a/setup.py b/setup.py
index 782bb21..566d844 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr>=1.8'],
+ setup_requires=['pbr>=2.0.0'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index da0df94..8826962 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,7 +15,7 @@ oslotest>=1.10.0 # Apache-2.0
reno>=1.8.0 # Apache-2.0
requests-mock>=1.1 # Apache-2.0
sphinx>=1.5.1 # BSD
-stevedore>=1.17.1 # Apache-2.0
+stevedore>=1.20.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testresources>=0.2.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
diff --git a/tox.ini b/tox.ini
index 8277e9d..e9d9b56 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
[testenv:debug]
-commands = oslo_debug_helper {posargs}
+commands = oslo_debug_helper -t keystonemiddleware/tests {posargs}
[flake8]
# D100: Missing docstring in public module
View Lorry Controller Status