#23 [AWAITS FESCO APPROVAL] Rebase to 4.0.x
Merged 2 years ago by mrunge. Opened 2 years ago by mrunge.
rpms/ mrunge/python-django rawhide  into  rawhide

file modified
+1
@@ -31,3 +31,4 @@ 

  /Django-3.2.6.tar.gz

  /Django-3.2.7.tar.gz

  /Django-3.2.9.tar.gz

+ /Django-4.0.1.tar.gz

@@ -1,42 +0,0 @@ 

- From f0480ddd2d3cb04b784cf7ea697f792b45c689cc Mon Sep 17 00:00:00 2001

- From: Mariusz Felisiak <felisiak.mariusz@gmail.com>

- Date: Wed, 17 Nov 2021 12:31:25 +0100

- Subject: [PATCH] Fixed crash building HTML docs since Sphinx 4.3.

- 

- See https://github.com/sphinx-doc/sphinx/commit/dd2ff3e911c751c06c81f494128fba56d8ecbafd.

- ---

-  docs/_ext/djangodocs.py | 10 ++++++++--

-  1 file changed, 8 insertions(+), 2 deletions(-)

- 

- diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py

- index dfc9e12682f3..2829d581cdb8 100644

- --- a/docs/_ext/djangodocs.py

- +++ b/docs/_ext/djangodocs.py

- @@ -8,7 +8,7 @@

-  from docutils import nodes

-  from docutils.parsers.rst import Directive

-  from docutils.statemachine import ViewList

- -from sphinx import addnodes

- +from sphinx import addnodes, version_info as sphinx_version

-  from sphinx.builders.html import StandaloneHTMLBuilder

-  from sphinx.directives.code import CodeBlock

-  from sphinx.domains.std import Cmdoption

- @@ -115,11 +115,17 @@ class DjangoHTMLTranslator(HTMLTranslator):

-      def visit_table(self, node):

-          self.context.append(self.compact_p)

-          self.compact_p = True

- -        self._table_row_index = 0  # Needed by Sphinx

- +        # Needed by Sphinx.

- +        if sphinx_version >= (4, 3):

- +            self._table_row_indices.append(0)

- +        else:

- +            self._table_row_index = 0

-          self.body.append(self.starttag(node, 'table', CLASS='docutils'))

-  

-      def depart_table(self, node):

-          self.compact_p = self.context.pop()

- +        if sphinx_version >= (4, 3):

- +            self._table_row_indices.pop()

-          self.body.append('</table>\n')

-  

-      def visit_desc_parameterlist(self, node):

file modified
+6 -8
@@ -1,10 +1,10 @@ 

  Name:           python-django

  %global         pkgname Django

- %global         ver 3.2.9

+ %global         ver 4.0.1

  #global         pre ...

  %global         real_version %{ver}%{?pre:%{pre}}

  Version:        %{ver}%{?pre:~%{pre}}

- Release:        5%{?dist}

+ Release:        1%{?dist}

  Summary:        A high-level Python Web framework

  

  License:        BSD
@@ -14,10 +14,6 @@ 

  # skip tests requiring network connectivity

  Patch000:       Django-2.0-skip-net-tests.patch

  

- # fix building docs with Sphinx 4.3.0

- # https://github.com/django/django/commit/f0480ddd2d3cb04b784cf7ea697f792b45c689cc

- Patch001:       fix-building-docs-with-sphinx-4-3.patch

- 

  BuildArch:      noarch

  

  %global _description %{expand:
@@ -68,7 +64,7 @@ 

  

  # hard-code python3 in django-admin

  pushd django

- for file in bin/django-admin.py conf/project_template/manage.py-tpl ; do

+ for file in conf/project_template/manage.py-tpl ; do

      sed -i "s/\/env python/\/python3/" $file ;

  done

  popd
@@ -133,7 +129,6 @@ 

  %files -n python3-django -f %{pyproject_files}

  %doc AUTHORS README.rst

  %license LICENSE

- %{_bindir}/django-admin.py

  %{_bindir}/django-admin

  %{_bindir}/django-admin-3

  %{_bindir}/django-admin-%{python3_version}
@@ -142,6 +137,9 @@ 

  

  

  %changelog

+ * Mon Jan 24 2022 Matthias Runge <mrunge@redhat.com> - 4.0.1-1

+ - rebase to 4.0.x, https://fedoraproject.org/wiki/Changes/Django4.0, also rhbz#2006537

+ 

  * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-5

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

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (Django-3.2.9.tar.gz) = 62fb297694a7f5e48465e102dc97e3d1d04b94499bc6d98d37a00d96b438b8c919b6d08055868a1836d62b89ff65ce4fa7dbc9390789dab2eeca0187269b125f

+ SHA512 (Django-4.0.1.tar.gz) = 7753c516b080c10673c3a95e8ec4af00984aeed5f288e4d6e7ab1efd461222a343701b21cfd27bc61ee4e63df5ce3f3be49398490a995f6839e63b40c3fe306c