#10 Update to 2.7.17
Merged 2 months ago by churchyard. Opened 2 months ago by churchyard.
rpms/ churchyard/python2-docs f31-2.7.17  into  f31

file modified
+1

@@ -17,3 +17,4 @@ 

  /Python-2.7.14.tar.xz

  /Python-2.7.15.tar.xz

  /Python-2.7.16.tar.xz

+ /Python-2.7.17.tar.xz

@@ -1,58 +0,0 @@ 

- From 869652b426bb34a30ce7b39f0a0ac242ed5b1016 Mon Sep 17 00:00:00 2001

- From: Julien Palard <julien@palard.fr>

- Date: Mon, 18 Mar 2019 19:11:30 +0100

- Subject: [PATCH] [2.7] bpo-35605: Fix documentation build for sphinx<1.6

-  (GH-12413)

- 

- (cherry picked from commit dfc8fc15fa989acba3c372572e52bbcb5ab38a37)

- ---

-  Doc/conf.py                                                 | 2 +-

-  Doc/tools/extensions/pyspecific.py                          | 6 +++++-

-  .../Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst  | 1 +

-  3 files changed, 7 insertions(+), 2 deletions(-)

-  create mode 100644 Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst

- 

- diff --git a/Doc/conf.py b/Doc/conf.py

- index 557fe1e72f27..df76b943b794 100644

- --- a/Doc/conf.py

- +++ b/Doc/conf.py

- @@ -57,7 +57,7 @@

-  

-  # Custom sidebar templates, filenames relative to this file.

-  html_sidebars = {

- -    'index': 'indexsidebar.html',

- +    'index': ['indexsidebar.html'],

-  }

-  

-  # Additional templates that should be rendered to pages.

- diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py

- index 6378f76bdc2c..1ec88c23e01b 100644

- --- a/Doc/tools/extensions/pyspecific.py

- +++ b/Doc/tools/extensions/pyspecific.py

- @@ -15,7 +15,6 @@

-  from docutils import nodes, utils

-  from docutils.parsers.rst import Directive

-  

- -from sphinx.util import status_iterator

-  from sphinx.util.nodes import split_explicit_title

-  from sphinx.writers.html import HTMLTranslator

-  from sphinx.writers.latex import LaTeXTranslator

- @@ -173,6 +172,11 @@ def get_target_uri(self, docname, typ=None):

-          return ''  # no URIs

-  

-      def write(self, *ignored):

- +        try:  # sphinx>=1.6

- +            from sphinx.util import status_iterator

- +        except ImportError:  # sphinx<1.6

- +            status_iterator = self.status_iterator

- +

-          writer = TextWriter(self)

-          for label in status_iterator(pydoc_topic_labels,

-                                       'building topics... ',

- diff --git a/Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst b/Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst

- new file mode 100644

- index 000000000000..cbc0f1e07f31

- --- /dev/null

- +++ b/Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst

- @@ -0,0 +1 @@

- +Fix documentation build for sphinx<1.6.  Patch by Anthony Sottile.

file modified
+5 -5

@@ -2,17 +2,14 @@ 

  

  Name:			python2-docs

  # The Version needs to be in-sync with the "python2" package:

- Version:		2.7.16

- Release:		3%{?dist}

+ Version:		2.7.17

+ Release:		1%{?dist}

  Summary:		Documentation for the Python 2 programming language

  License:		Python

  URL:			https://www.python.org/

  

  Source:			https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz

  

- # Make it build with Sphinx 2

- Patch1:			https://github.com/python/cpython/commit/869652b426bb34a30ce7b39f0a0ac242ed5b1016.patch

- 

  # this changes the makefile so that build requires are used instead of

  # hard coded svn checkout to get sphinx

  Patch19: python-2.7-texinfomakefile.patch

@@ -99,6 +96,9 @@ 

  %license	LICENSE

  

  %changelog

+ * Sun Oct 20 2019 Miro Hrončok <mhroncok@redhat.com> - 2.7.17-1

+ - Update to 2.7.17

+ 

  * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.16-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (Python-2.7.16.tar.xz) = 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0

+ SHA512 (Python-2.7.17.tar.xz) = 2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a