1
0
forked from pool/python-Django

Accepting request 883369 from home:aplanas:branches:devel:languages:python:django

- Update to 3.2.0
  + Automatic ~django.apps.AppConfig discovery
  + Customizing type of auto-created primary keys
  + Functional indexes
  + pymemcache support
  + New decorators for the admin site  
  + For a complete description of new features check:
    https://github.com/django/django/blob/main/docs/releases/3.2.txt
- Update PYTHOPATH to include the local tests
- Drop i18n_test.patch, i18n_test_extraction.patch,
  test_clear_site_cache-sort.patch

OBS-URL: https://build.opensuse.org/request/show/883369
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-Django?expand=0&rev=78
This commit is contained in:
Alberto Planas 2021-04-24 07:12:22 +00:00 committed by Git OBS Bridge
parent 92c2e14db0
commit 74ea9e2062
9 changed files with 91 additions and 125 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:edb10b5c45e7e9c0fb1dc00b76ec7449aca258a39ffd613dbd078c51d19c9f03
size 9392125

View File

@ -1,63 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
This file contains MD5, SHA1, and SHA256 checksums for the source-code
tarball and wheel files of Django 3.1.4, released December 1, 2020.
To use this file, you will need a working install of PGP or other
compatible public-key encryption software. You will also need to have
the Django release manager's public key in your keyring; this key has
the ID ``2EF56372BA48CD1B`` and can be imported from the MIT
keyserver. For example, if using the open-source GNU Privacy Guard
implementation of PGP:
gpg --keyserver pgp.mit.edu --recv-key 2EF56372BA48CD1B
Once the key is imported, verify this file::
gpg --verify <<THIS FILENAME>>
Once you have verified this file, you can use normal MD5, SHA1, or SHA256
checksumming applications to generate the checksums of the Django
package and compare them to the checksums listed below.
Release packages:
=================
https://www.djangoproject.com/m/releases/3.1/Django-3.1.4-py3-none-any.whl
https://www.djangoproject.com/m/releases/3.1/Django-3.1.4.tar.gz
MD5 checksums
=============
1478c3a6d6d821b6ab6abdccfbf0217d Django-3.1.4-py3-none-any.whl
6c8d45beab6c8e41b112db094c608a4c Django-3.1.4.tar.gz
SHA1 checksums
==============
8a18f792c555e381df99640b00025526b528151c Django-3.1.4-py3-none-any.whl
91bb5a69a68feffda121038108dc404e76d2574a Django-3.1.4.tar.gz
SHA256 checksums
================
5c866205f15e7a7123f1eec6ab939d22d5bde1416635cab259684af66d8e48a2 Django-3.1.4-py3-none-any.whl
edb10b5c45e7e9c0fb1dc00b76ec7449aca258a39ffd613dbd078c51d19c9f03 Django-3.1.4.tar.gz
-----BEGIN PGP SIGNATURE-----
iQJPBAEBCAA5FiEEq7LCqM0B8WE2GLcNLvVjcrpIzRsFAl/F1ckbHGZlbGlzaWFr
Lm1hcml1c3pAZ21haWwuY29tAAoJEC71Y3K6SM0bbHoP/1xCJzxBiTGXPmhITnD0
/cDTGlPM8px3FhcRP6zcblRf5CWhfL4GxNohJ2/b1qxUjI6hH4h5of8kZO8aEerd
EOqMp3r4KLcE1oSv2ifDHllYFLVIeDNQFvy43MtrdO0IMBkmyPHS2J2Azn1/WV8u
j4vHyePvJcQfPedwWKtoI8tUn+gUnMKcUPWkSv/aUFuxPmBgpELbtz2Hs98jB6gs
DpCQNcTq3oFFqI8JiywvjF4DEtjK5nq1owVkIGJ5/fTJiJmjq5XqDIl8rPGuYv+O
50TOf/L4z/HkYWURkcWrNRi3r1HTju34cU1c8EXzzSMBkiyZMGVoz4EXzZXT1t7O
jaFNlIvfTYbpvZ/3YctczPLKydXc4iekvF2oBlhvaJ4Ky6qv5Vw2TjMEsrcPQ5UF
qtgrpfGmlt2f6PeJTl9Wz9Nc2b4+w0fVWeDC1jWnNyBJsoTG9ngN9ErEBP1RgVKg
VUpN9dquskn9EMBWJKVYizwFCXj6gfJ/eImDyNEmxVQZdjGLAF6dpYjb5QSmjhQe
vjb9pKV+Nc3bsE4UKHRK8Y6LbTefN3Dn183g3w28ScHWCofqDqj6fw/I5dAwnqHP
MXxfdG1qZ7LUttAdmkjXb30lMllcbaaajLo5Dz8vJlKcHUBRdPjVZpxXPDOKfRIK
MrLuFjtq7u5xrR+zFEhpDok4
=nLIt
-----END PGP SIGNATURE-----

3
Django-3.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d
size 9819119

67
Django-3.2.tar.gz.asc Normal file
View File

@ -0,0 +1,67 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
This file contains MD5, SHA1, and SHA256 checksums for the source-code
tarball and wheel files of Django 3.2, released April 6, 2021.
To use this file, you will need a working install of PGP or other
compatible public-key encryption software. You will also need to have
the Django release manager's public key in your keyring. This key has
the ID ``E17DF5C82B4F9D00`` and can be imported from the MIT
keyserver, for example, if using the open-source GNU Privacy Guard
implementation of PGP:
gpg --keyserver pgp.mit.edu --recv-key E17DF5C82B4F9D00
or via the GitHub API:
curl https://github.com/carltongibson.gpg | gpg --import -
Once the key is imported, verify this file:
gpg --verify <<THIS FILENAME>>
Once you have verified this file, you can use normal MD5, SHA1, or SHA256
checksumming applications to generate the checksums of the Django
package and compare them to the checksums listed below.
Release packages:
=================
https://www.djangoproject.com/m/releases/3.2/Django-3.2.tar.gz
https://www.djangoproject.com/m/releases/3.2/Django-3.2-py3-none-any.whl
MD5 checksums
=============
0db580470a6a1dc20ccb805f94479ffa Django-3.2.tar.gz
e2cfd14ad74a389429bec15cd8b7391b Django-3.2-py3-none-any.whl
SHA1 checksums
==============
00abafe8e50230aa41892b28456c35ae18c16b8b Django-3.2.tar.gz
07015dcabc200f09266991978f611bdca56ce93f Django-3.2-py3-none-any.whl
SHA256 checksums
================
21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d Django-3.2.tar.gz
0604e84c4fb698a5e53e5857b5aea945b2f19a18f25f10b8748dbdf935788927 Django-3.2-py3-none-any.whl
-----BEGIN PGP SIGNATURE-----
iQJPBAEBCAA5FiEE/l+2OHah1xioxnVW4X31yCtPnQAFAmBsKcQbHGNhcmx0b24u
Z2lic29uQG5vdW1lbmFsLmVzAAoJEOF99cgrT50APIkP/1pmxTi40TM+EKi/PuGv
rv7ft9gXDbCkgnS0BMr5qnqi3allE7x7JJ0qEXN7mvo2ZEevVntR3gLRV8y6h9H6
zYprz4iEs/+tfnEzcuZhCbkqDidY4SaoClNh9rqXBcMCWR2/CkR9GLNYDvMAYK9S
g/bRQBH3iy1Naw6TCum9fLcTqhpQgkbgN1qdxfDE12QsHTcxfIrkB54Jd1TSswWt
QzYwhhIdLkot785UBRsFk7rcNTsPCSXUDIlNUHxqMx6ubJXKPLLiDoaxZqXFyYAi
Pqhak9Itj7Q34emm+BkMpFj2fKAcdS8ufDtrTjiS3gmjNJ1Pw+A6+eamanVNFfYb
4eTbr2+X7Ttp9rUrJdMmBUNN+hEM8HwdShcjp94w+8ExDk2j80ZDGfjdxSwEh1Dj
drIFAyewXQ1umsK333gtI+xJS7bXak+6XjRg44PtfNH3WbSnKNuJ1u2wHYNFmARA
undAOhBiEsCz/TOKo3Rd2jb14j84J0x/ksiEQRfNWhjRAUvuFJohMtlV3/ig53Vw
icGvRwp0X3zst4I4p/SK+e/XAuOU+Cwc6GTP5yKBJZhtZIFAG8BZ2Z8CWYjNViQT
o43K7QtZlit6mmGXDEvONJhSXl3W7CQ0Wrwd3xI0ySE9fFRq1RQLOhjSpiidIXfE
oP/d3xyNLl4s58C0irBMrg9j
=Aeit
-----END PGP SIGNATURE-----

View File

@ -1,13 +0,0 @@
Index: Django-2.2/tests/i18n/tests.py
===================================================================
--- Django-2.2.orig/tests/i18n/tests.py
+++ Django-2.2/tests/i18n/tests.py
@@ -1820,7 +1820,7 @@ class WatchForTranslationChangesTests(Si
def test_i18n_app_dirs(self):
mocked_sender = mock.MagicMock()
- with self.settings(INSTALLED_APPS=['tests.i18n.sampleproject']):
+ with self.settings(INSTALLED_APPS=['i18n.sampleproject']):
watch_for_translation_changes(mocked_sender)
project_dir = Path(__file__).parent / 'sampleproject' / 'locale'
mocked_sender.watch_dir.assert_any_call(project_dir, '**/*.mo')

View File

@ -1,21 +0,0 @@
Index: Django-3.1/tests/i18n/test_extraction.py
===================================================================
--- Django-3.1.orig/tests/i18n/test_extraction.py
+++ Django-3.1/tests/i18n/test_extraction.py
@@ -6,7 +6,7 @@
import warnings
from io import StringIO
from pathlib import Path
-from unittest import mock, skipIf, skipUnless
+from unittest import mock, skip, skipIf, skipUnless
from admin_scripts.tests import AdminScriptTestCase
@@ -225,6 +225,7 @@
open(os.path.join(self.test_dir, 'vidéo.txt'), 'a').close()
management.call_command('makemessages', locale=[LOCALE], verbosity=0)
+ @skip("xgettext 0.21 do not produce warning")
def test_extraction_warning(self):
"""test xgettext warning about multiple bare interpolation placeholders"""
shutil.copyfile('./code.sample', './code_sample.py')

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Apr 6 09:27:50 UTC 2021 - Alberto Planas Dominguez <aplanas@suse.com>
- Update to 3.2.0
+ Automatic ~django.apps.AppConfig discovery
+ Customizing type of auto-created primary keys
+ Functional indexes
+ pymemcache support
+ New decorators for the admin site
+ For a complete description of new features check:
https://github.com/django/django/blob/main/docs/releases/3.2.txt
- Update PYTHOPATH to include the local tests
- Drop i18n_test.patch, i18n_test_extraction.patch,
test_clear_site_cache-sort.patch
-------------------------------------------------------------------
Sat Feb 13 22:41:42 UTC 2021 - Ben Greiner <code@bnavigator.de>

View File

@ -23,25 +23,21 @@
%bcond_with memcached
Name: python-Django
# We want support LTS versions of Django - numbered 2.2 -> 3.2 -> 4.2 etc
Version: 3.1.4
Version: 3.2
Release: 0
Summary: A high-level Python Web framework
License: BSD-3-Clause
URL: https://www.djangoproject.com
Source: https://www.djangoproject.com/m/releases/3.1/Django-%{version}.tar.gz
Source: https://www.djangoproject.com/m/releases/3.2/Django-%{version}.tar.gz
Source1: https://www.djangoproject.com/m/pgp/Django-%{version}.checksum.txt#/Django-%{version}.tar.gz.asc
Source2: %{name}.keyring
Source99: python-Django-rpmlintrc
Patch0: i18n_test.patch
Patch1: test_clear_site_cache-sort.patch
# PATCH-FIX-OPENSUSE i18n_test_extraction.patch
Patch2: i18n_test_extraction.patch
BuildRequires: %{python_module Jinja2 >= 2.9.2}
BuildRequires: %{python_module Pillow}
BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module argon2-cffi >= 16.1.0}
BuildRequires: %{python_module asgiref >= 3.2.10}
BuildRequires: %{python_module base >= 3.5}
BuildRequires: %{python_module base >= 3.6}
BuildRequires: %{python_module bcrypt}
BuildRequires: %{python_module docutils}
BuildRequires: %{python_module geoip2}
@ -64,7 +60,6 @@ Requires(post): update-alternatives
Requires(preun):update-alternatives
Recommends: python-Jinja2 >= 2.9.2
Recommends: python-PyYAML
Recommends: python-argon2-cffi >= 16.1.0
Recommends: python-bcrypt
Recommends: python-geoip2
Recommends: python-pylibmc
@ -101,7 +96,6 @@ echo "`grep -e '^[0-9a-f]\{64\} Django-%{version}.tar.gz' %{SOURCE1} | cut -c1-
%setup -q -n Django-%{version}
%autopatch -p1
chmod a-x django/contrib/admin/static/admin/js/vendor/xregexp/xregexp.js
%build
%python_build
@ -129,9 +123,9 @@ export LANG=en_US.UTF8
export PYTHONDONTWRITEBYTECODE=1
%if %{with selenium}
export PATH=%{_libdir}/chromium:$PATH
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run $python tests/runtests.py -v 2 --selenium=chrome
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:. xvfb-run $python tests/runtests.py -v 2 --selenium=chrome
%else
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python tests/runtests.py -v 2
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:. $python tests/runtests.py -v 2
%endif
%post

View File

@ -1,13 +0,0 @@
Index: Django-2.2/tests/sites_tests/tests.py
===================================================================
--- Django-2.2.orig/tests/sites_tests/tests.py
+++ Django-2.2/tests/sites_tests/tests.py
@@ -162,7 +162,7 @@ class SitesFrameworkTests(TestCase):
self.assertEqual(models.SITE_CACHE, {})
get_current_site(request)
expected_cache = {self.site.id: self.site}
- self.assertEqual(models.SITE_CACHE, expected_cache)
+ self.assertCountEqual(models.SITE_CACHE, expected_cache)
with self.settings(SITE_ID=''):
get_current_site(request)