From 712c72c140a293326572db5685552c10fdf2ea0f Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Thu, 25 May 2017 17:49:38 -0400 Subject: [PATCH 1/3] Prepare for 1.2.1 Release Updated version in setup.py an in docs conf.py --- docs/source/conf.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 92ddb48f..a1bac273 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -58,9 +58,9 @@ # built documents. # # The short X.Y version. -version = '1.2.0' +version = '1.2.1' # The full version, including alpha/beta/rc tags. -release = '1.2.0' +release = '1.2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index d10dd96f..939c1acc 100755 --- a/setup.py +++ b/setup.py @@ -216,7 +216,7 @@ def gssapi_modules(lst): setup( name='gssapi', - version='1.2.0', + version='1.2.1', author='The Python GSSAPI Team', author_email='sross@redhat.com', packages=['gssapi', 'gssapi.raw', 'gssapi.raw._enum_extensions', From dd7ef630e42de136fda7fb4dd2e30d628c709073 Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Wed, 31 May 2017 17:43:32 -0400 Subject: [PATCH 2/3] Fix docs parsing error in creds.py In the case of :class`MechTypes`s, the "s" at the end was causing Sphinx to fail to parse the class markup. This fixes that by rewording slightly to remove the need for the trailing "s". --- gssapi/creds.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gssapi/creds.py b/gssapi/creds.py index df051fb8..2082a1dc 100644 --- a/gssapi/creds.py +++ b/gssapi/creds.py @@ -112,8 +112,8 @@ def acquire(cls, name=None, lifetime=None, mechs=None, usage='both', or None for the default name lifetime (int): the desired lifetime of the credentials, or None for indefinite - mechs (list): the desired :class:`MechType`s to be used with the - credentials, or None for the default set + mechs (list): the desired :class:`MechType` OIDs to be used + with the credentials, or None for the default set usage (str): the usage for the credentials -- either 'both', 'initiate', or 'accept' store (dict): the credential store information pointing to the @@ -215,7 +215,7 @@ def impersonate(self, name=None, lifetime=None, mechs=None, name (Name): the name to impersonate lifetime (int): the desired lifetime of the new credentials, or None for indefinite - mechs (list): the desired :class:`MechType`s for the new + mechs (list): the desired :class:`MechType` OIDs for the new credentials usage (str): the desired usage for the new credentials -- either 'both', 'initiate', or 'accept'. Note that some mechanisms From 9123a56ef4240be6da187ee76f6a6376145f1e01 Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Wed, 31 May 2017 17:44:54 -0400 Subject: [PATCH 3/3] Make requires_rfc.py properly set parents of nodes The requires_rfc.py docs extension was not properly setting the parent node when adding child text nodes. This caused a hiccup in newer versions of Sphinx, meaning we could not generate new documentation. This commit should fix that by using methods to clear and set the children, as opposed to directly setting the child list. --- docs/custom_extensions/requires_rfc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/custom_extensions/requires_rfc.py b/docs/custom_extensions/requires_rfc.py index b77ff4fa..d7bb8a7d 100644 --- a/docs/custom_extensions/requires_rfc.py +++ b/docs/custom_extensions/requires_rfc.py @@ -48,7 +48,8 @@ def __call__(self, name, rawtext, text, lineno, inliner, title_node = nodes.Text(ext_title, ext_title) - ref_nodes[0].children = [title_node] + ref_nodes[0].clear() + ref_nodes[0].append(title_node) middle_parts = ref_nodes