From 9565589087e5988998db13524dc3ef521916caa2cca74357ddef870a22745056 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 18 Dec 2021 23:53:16 +0000 Subject: [PATCH 1/5] Accepting request 936296 from home:aplanas:branches:devel:languages:python:django - Update to 4.0 + https://docs.djangoproject.com/en/4.0/releases/4.0/ OBS-URL: https://build.opensuse.org/request/show/936296 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-Django?expand=0&rev=94 --- Django-3.2.9.tar.gz | 3 - Django-3.2.9.tar.gz.asc | 67 ------------------- Django-4.0.tar.gz | 3 + Django-4.0.tar.gz.asc | 67 +++++++++++++++++++ python-Django-rpmlintrc | 2 +- python-Django.changes | 6 ++ python-Django.spec | 31 ++++----- ...coverrunnerextratestsdeprecationtests.diff | 12 ++++ 8 files changed, 105 insertions(+), 86 deletions(-) delete mode 100644 Django-3.2.9.tar.gz delete mode 100644 Django-3.2.9.tar.gz.asc create mode 100644 Django-4.0.tar.gz create mode 100644 Django-4.0.tar.gz.asc create mode 100644 skip_discoverrunnerextratestsdeprecationtests.diff diff --git a/Django-3.2.9.tar.gz b/Django-3.2.9.tar.gz deleted file mode 100644 index 5a52c3b..0000000 --- a/Django-3.2.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08 -size 9809157 diff --git a/Django-3.2.9.tar.gz.asc b/Django-3.2.9.tar.gz.asc deleted file mode 100644 index 3f8ece5..0000000 --- a/Django-3.2.9.tar.gz.asc +++ /dev/null @@ -1,67 +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.2.9, released November 1, 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 ``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 - -or via the GitHub API: - - curl https://github.com/felixxm.gpg | gpg --import - - -Once the key is imported, verify this file: - - gpg --verify <> - -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.9-py3-none-any.whl -https://www.djangoproject.com/m/releases/3.2/Django-3.2.9.tar.gz - -MD5 checksums -============= - -dbd4ed5f73c2a7976189ea7a504b1911 Django-3.2.9-py3-none-any.whl -86b100c1b2fd4ddf1a35ba394e4ad2d1 Django-3.2.9.tar.gz - -SHA1 checksums -============== - -208a91ac6ded319c51998421053b1439f2a2890a Django-3.2.9-py3-none-any.whl -cab67cdbd5124d8f87f7ab7c94fd08b52421bd7f Django-3.2.9.tar.gz - -SHA256 checksums -================ - -e22c9266da3eec7827737cde57694d7db801fedac938d252bf27377cec06ed1b Django-3.2.9-py3-none-any.whl -51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08 Django-3.2.9.tar.gz ------BEGIN PGP SIGNATURE----- - -iQJPBAEBCAA5FiEEq7LCqM0B8WE2GLcNLvVjcrpIzRsFAmF/sfobHGZlbGlzaWFr -Lm1hcml1c3pAZ21haWwuY29tAAoJEC71Y3K6SM0b+KUP/0MstkUHrx7bAvuoLiT5 -cFUnVCjKPE9zmBtR2OeWo44BX96VqZcVqnsdil5YssQPgerbujNfo6jokmCCYE14 -EwBAVDkiu773MBT9vdaNkVFWdtiJ/H1MdxHo86AUITuxJ+PdLWwkeu2NhayWaxD3 -0Y0LNgBmKJS96qhiOxicEptU88iJfZv7YQVPngfQA79rxiDSpn+2dWI7r1pYK2W5 -WBRDM1sQFQwueNKgOURI7U2KIU5shCjbOwGDiwPGmtZS8KFqTRTlIRb+SrPzz+Mv -xL6FGMgTTVup+4wmQvGY50xqdnWTcE6rDVwNbva9wVX1JHpUROj9s6+6sL6PeSoO -YFnUJaBZpPceBPEY61QAwldW4Z+zPGjFZ4DTqyVLXaKNpn5C8nbTl5PCVWT3abIX -OaQct7pAyqOdOmJ0BR8Kg7k+UNOBlrG5Ffu6FoIAk6mQpIhZ8ezW+p7KJmZZF9iL -kPdKQBpR86L42C5As+zTAhO4LZQ2HbFMvGoBrxF2sjJCDLVSbHfR5BsgRlYRn1tR -U60O7yb0pWpYurMvAZ/d56EFcISHI1M1he5gPc+P17OpGT85AxYrNt3F1jUjhLEv -27Toq38UQYxPU9KPhwJdetenz9icKgN6A3akZxyUhCfPHFmC5I9FOn8+TJjjlShP -cZavu4lgh/6vVpQXVG5Zjjcc -=rp+p ------END PGP SIGNATURE----- diff --git a/Django-4.0.tar.gz b/Django-4.0.tar.gz new file mode 100644 index 0000000..ea9026f --- /dev/null +++ b/Django-4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5a8a14da819a8b9237ee4d8c78dfe056ff6e8a7511987be627192225113ee75 +size 9980403 diff --git a/Django-4.0.tar.gz.asc b/Django-4.0.tar.gz.asc new file mode 100644 index 0000000..ca44216 --- /dev/null +++ b/Django-4.0.tar.gz.asc @@ -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 4.0, released December 7, 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 ``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 + +or via the GitHub API: + + curl https://github.com/felixxm.gpg | gpg --import - + +Once the key is imported, verify this file: + + gpg --verify <> + +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/4.0/Django-4.0-py3-none-any.whl +https://www.djangoproject.com/m/releases/4.0/Django-4.0.tar.gz + +MD5 checksums +============= + +be6fc2824c0c920728baa7d1911fc425 Django-4.0-py3-none-any.whl +0d2c393916334cbd80fdc08fa2b60932 Django-4.0.tar.gz + +SHA1 checksums +============== + +cb1145542b5564e1db31dea1054955243c95b0d9 Django-4.0-py3-none-any.whl +7e6d89db53d2e6833b7785fb4a28f7a24e259e44 Django-4.0.tar.gz + +SHA256 checksums +================ + +59304646ebc6a77b9b6a59adc67d51ecb03c5e3d63ed1f14c909cdfda84e8010 Django-4.0-py3-none-any.whl +d5a8a14da819a8b9237ee4d8c78dfe056ff6e8a7511987be627192225113ee75 Django-4.0.tar.gz +-----BEGIN PGP SIGNATURE----- + +iQJPBAEBCAA5FiEEq7LCqM0B8WE2GLcNLvVjcrpIzRsFAmGvJS4bHGZlbGlzaWFr +Lm1hcml1c3pAZ21haWwuY29tAAoJEC71Y3K6SM0bLIsP/AwzwgRVDLPrmBaqi514 +q1EvNLDxqHKcDVaFwzQVw4ru4k3bylQKFzEHGHMWP51af7D+7eMuJFptzUNHxJ4p +wzlRtky5oHFYqUZ33Gk0us+6MDbqoD1flLftIAvvpWb3h357He76Z6g6DA8GwRTJ +SPWO41LROK2UjaT2GvKsAk/Wh2XJRCr+LsfOFL+8pVRQ4fQOUpjlw6agpu8UwuHI +ETAHyXeNo4rmtgXPVXQkxUbA+LLOE8bzPVx46+GnKLFk/jrhS2NpXTLTlOoAfIkh +lhRVHtxCMWkZ4WOKFMNUOliIKRVffmm0inKUhwSkYDDKV6LRbEDBkXKyfnFEOxVU +e7rI2rUegrxcjoVLttoyNRPCiQrEhlyTXXDDP3iVBDbXe5dPAMlPsncj+tz5V5LR +b9BP5lYfV8gtTynoLbReAN6S8rtsUVla1X5c2oUgQZhuUCVI5bCGcnP39+dK8eRl +eoqxtcMMi4VUBFu63D7I80O8NrWpywvrX7Ry55nWKjhjB212g6oyMfAJbCTLV75P +YE0OLeCpZENVe9boALzc2BicPPxyYZ/L7e+Jo2bNFFW/z4bLHLZBbNYatH5ueqjw +S/xWMoH29kGpCkOYnFe5QD4vxcLLcJNjddcRDMRDzEHVnTlJJkSeVgEBYjXmBw2U +Nj5JulworLC1lgvwuG12eY1f +=EYHW +-----END PGP SIGNATURE----- diff --git a/python-Django-rpmlintrc b/python-Django-rpmlintrc index e8796ac..0159bae 100644 --- a/python-Django-rpmlintrc +++ b/python-Django-rpmlintrc @@ -2,4 +2,4 @@ addFilter("file-not-in-%lang") # Empty model.py files should be kept around: addFilter("zero-length") # Bash completion isn't config: -addFilter("non-conffile-in-etc /etc/bash_completion.d/django_bash_completion*") +# addFilter("non-conffile-in-etc /etc/bash_completion.d/django_bash_completion*") diff --git a/python-Django.changes b/python-Django.changes index 18297cc..aa0fb2a 100644 --- a/python-Django.changes +++ b/python-Django.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 7 14:09:24 UTC 2021 - Alberto Planas Dominguez + +- Update to 4.0 + + https://docs.djangoproject.com/en/4.0/releases/4.0/ + ------------------------------------------------------------------- Tue Nov 2 12:45:45 UTC 2021 - Alberto Planas Dominguez diff --git a/python-Django.spec b/python-Django.spec index 210c6e9..220458f 100644 --- a/python-Django.spec +++ b/python-Django.spec @@ -18,41 +18,45 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +%define skip_python36 1 # Selenium and memcached are not operational %bcond_with selenium %bcond_with memcached Name: python-Django # We want support LTS versions of Django - numbered 2.2 -> 3.2 -> 4.2 etc -Version: 3.2.9 +Version: 4.0 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.2/Django-%{version}.tar.gz -Source1: https://www.djangoproject.com/m/pgp/Django-%{version}.checksum.txt#/Django-%{version}.tar.gz.asc +Source: https://www.djangoproject.com/m/releases/4.0/Django-%{version}.tar.gz +Source1: https://media.djangoproject.com/pgp/Django-%{version}.checksum.txt#/Django-%{version}.tar.gz.asc Source2: %{name}.keyring Source99: python-Django-rpmlintrc +Patch0: skip_discoverrunnerextratestsdeprecationtests.diff BuildRequires: %{python_module Jinja2 >= 2.9.2} -BuildRequires: %{python_module Pillow} +BuildRequires: %{python_module Pillow >= 6.2.0} BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module argon2-cffi >= 16.1.0} -BuildRequires: %{python_module asgiref >= 3.3.2} -BuildRequires: %{python_module base >= 3.6} +BuildRequires: %{python_module asgiref >= 3.4.1} +BuildRequires: %{python_module backports.zoneinfo} +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module bcrypt} BuildRequires: %{python_module docutils} BuildRequires: %{python_module geoip2} BuildRequires: %{python_module pytz} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module sqlparse >= 0.2.2} -BuildRequires: %{python_module tblib} +BuildRequires: %{python_module tblib >= 1.5.0} BuildRequires: %{pythons} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: %{python_module numpy if (%python-base without python36-base)} Requires: python -Requires: python-Pillow +Requires: python-Pillow >= 6.2.0 Requires: python-argon2-cffi >= 16.1.0 -Requires: python-asgiref >= 3.3.2 +Requires: python-asgiref >= 3.4.1 +Requires: python-backports.zoneinfo Requires: python-pytz Requires: python-setuptools Requires: python-sqlparse >= 0.2.2 @@ -103,13 +107,11 @@ echo "`grep -e '^[0-9a-f]\{64\} Django-%{version}.tar.gz' %{SOURCE1} | cut -c1- %install %python_install -%python_clone -a %{buildroot}%{_bindir}/django-admin.py %python_clone -a %{buildroot}%{_bindir}/django-admin %{python_expand install -D -m 0644 extras/django_bash_completion %{buildroot}%%{_datadir}/bash-completion/completions/django_bash_completion-%{$python_bin_suffix}.sh # Fix wrong-script-interpreter sed -i "s|^#!%{_bindir}/env python$|#!%{_bindir}/$python|" \ - %{buildroot}%{$python_sitelib}/django/bin/django-admin.py \ %{buildroot}%{$python_sitelib}/django/conf/project_template/manage.py-tpl } %python_compileall @@ -129,16 +131,15 @@ export PATH=%{_libdir}/chromium:$PATH %endif %post -%{python_install_alternative django-admin.py django-admin} +%{python_install_alternative django-admin} -%preun -%python_uninstall_alternative django-admin +%postun +%{python_uninstall_alternative django-admin} %files %{python_files} %doc AUTHORS README.rst %license LICENSE %python_alternative %{_bindir}/django-admin -%python_alternative %{_bindir}/django-admin.py %{_datadir}/bash-completion/completions/django_bash_completion-%{python_bin_suffix}.sh %{python_sitelib}/django %{python_sitelib}/Django-%{version}-py*.egg-info diff --git a/skip_discoverrunnerextratestsdeprecationtests.diff b/skip_discoverrunnerextratestsdeprecationtests.diff new file mode 100644 index 0000000..5da15b4 --- /dev/null +++ b/skip_discoverrunnerextratestsdeprecationtests.diff @@ -0,0 +1,12 @@ +Index: Django-4.0/tests/test_runner/tests.py +=================================================================== +--- Django-4.0.orig/tests/test_runner/tests.py ++++ Django-4.0/tests/test_runner/tests.py +@@ -841,6 +841,7 @@ class DiscoverRunnerExtraTestsDeprecatio + def get_runner(self): + return NoOpTestRunner(verbosity=0, interactive=False) + ++ @unittest.skip("possible unittest issue") + def test_extra_tests_build_suite(self): + runner = self.get_runner() + with self.assertWarnsMessage(RemovedInDjango50Warning, self.msg): From acc0eb98b65a4964b3626f22fed4f033a2d43a8d729cec253700a81241e4e52d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 19 Dec 2021 00:03:34 +0000 Subject: [PATCH 2/5] Fix changes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-Django?expand=0&rev=95 --- python-Django.changes | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/python-Django.changes b/python-Django.changes index aa0fb2a..5899f1f 100644 --- a/python-Django.changes +++ b/python-Django.changes @@ -2,7 +2,29 @@ Tue Dec 7 14:09:24 UTC 2021 - Alberto Planas Dominguez - Update to 4.0 - + https://docs.djangoproject.com/en/4.0/releases/4.0/ + This is just a summary. Full release notes are available at + https://docs.djangoproject.com/en/4.0/releases/4.0/. + - Django 4.0 supports Python 3.8, 3.9, and 3.10. We highly + recommend and only officially support the latest release of + each series. + The Django 3.2.x series is the last to support Python 3.6 and + 3.7. + - The Python standard library’s zoneinfo is now the default + timezone implementation in Django. This is the next step in + the migration from using pytz to using zoneinfo. Django 3.2 + allowed the use of non-pytz time zones. Django 4.0 makes + zoneinfo the default implementation. Support for pytz is now + deprecated and will be removed in Django 5.0. + - The new *expressions positional argument of + UniqueConstraint() enables creating functional unique + constraints on expressions and database functions. + - The new scrypt password hasher is more secure and recommended + over PBKDF2. However, it’s not the default as it requires + OpenSSL 1.1+ and more memory. + - Redis cache backend + - Template based form rendering. Forms, Formsets, and ErrorList + are now rendered using the template engine to enhance + customization. ------------------------------------------------------------------- Tue Nov 2 12:45:45 UTC 2021 - Alberto Planas Dominguez From f5dc5666e472ef5c41208803412ab82813489561966e186944c94eea27907769 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 20 Dec 2021 10:37:24 +0000 Subject: [PATCH 3/5] - Clean up PYTHONPATH to make test_extra_tests_build_suite pass. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-Django?expand=0&rev=96 --- python-Django.changes | 5 +++++ python-Django.spec | 5 ++--- skip_discoverrunnerextratestsdeprecationtests.diff | 12 ------------ 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 skip_discoverrunnerextratestsdeprecationtests.diff diff --git a/python-Django.changes b/python-Django.changes index 5899f1f..8bb5e84 100644 --- a/python-Django.changes +++ b/python-Django.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 20 10:37:10 UTC 2021 - Matej Cepl + +- Clean up PYTHONPATH to make test_extra_tests_build_suite pass. + ------------------------------------------------------------------- Tue Dec 7 14:09:24 UTC 2021 - Alberto Planas Dominguez diff --git a/python-Django.spec b/python-Django.spec index 220458f..64551fa 100644 --- a/python-Django.spec +++ b/python-Django.spec @@ -33,7 +33,6 @@ Source: https://www.djangoproject.com/m/releases/4.0/Django-%{version}.t Source1: https://media.djangoproject.com/pgp/Django-%{version}.checksum.txt#/Django-%{version}.tar.gz.asc Source2: %{name}.keyring Source99: python-Django-rpmlintrc -Patch0: skip_discoverrunnerextratestsdeprecationtests.diff BuildRequires: %{python_module Jinja2 >= 2.9.2} BuildRequires: %{python_module Pillow >= 6.2.0} BuildRequires: %{python_module PyYAML} @@ -125,9 +124,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 diff --git a/skip_discoverrunnerextratestsdeprecationtests.diff b/skip_discoverrunnerextratestsdeprecationtests.diff deleted file mode 100644 index 5da15b4..0000000 --- a/skip_discoverrunnerextratestsdeprecationtests.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: Django-4.0/tests/test_runner/tests.py -=================================================================== ---- Django-4.0.orig/tests/test_runner/tests.py -+++ Django-4.0/tests/test_runner/tests.py -@@ -841,6 +841,7 @@ class DiscoverRunnerExtraTestsDeprecatio - def get_runner(self): - return NoOpTestRunner(verbosity=0, interactive=False) - -+ @unittest.skip("possible unittest issue") - def test_extra_tests_build_suite(self): - runner = self.get_runner() - with self.assertWarnsMessage(RemovedInDjango50Warning, self.msg): From 36c1e640e9dab1640e38e56ba1ec9231f9e1ed08d1a0de8cdaee99b2f25e2d59 Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Fri, 24 Dec 2021 23:29:23 +0000 Subject: [PATCH 4/5] Accepting request 942286 from home:jayvdb:branches:devel:languages:python:django - Avoid dependency on backports.zoneinfo except on Python 3.8 OBS-URL: https://build.opensuse.org/request/show/942286 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-Django?expand=0&rev=97 --- python-Django.changes | 5 +++++ python-Django.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-Django.changes b/python-Django.changes index 8bb5e84..c1bff6b 100644 --- a/python-Django.changes +++ b/python-Django.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 24 02:26:37 UTC 2021 - John Vandenberg + +- Avoid dependency on backports.zoneinfo except on Python 3.8 + ------------------------------------------------------------------- Mon Dec 20 10:37:10 UTC 2021 - Matej Cepl diff --git a/python-Django.spec b/python-Django.spec index 64551fa..55c66b9 100644 --- a/python-Django.spec +++ b/python-Django.spec @@ -38,7 +38,7 @@ BuildRequires: %{python_module Pillow >= 6.2.0} BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module argon2-cffi >= 16.1.0} BuildRequires: %{python_module asgiref >= 3.4.1} -BuildRequires: %{python_module backports.zoneinfo} +BuildRequires: %{python_module backports.zoneinfo if (%python-base with python38-base)} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module bcrypt} BuildRequires: %{python_module docutils} @@ -55,7 +55,9 @@ Requires: python Requires: python-Pillow >= 6.2.0 Requires: python-argon2-cffi >= 16.1.0 Requires: python-asgiref >= 3.4.1 +%if "%{python_flavor}" == "python38" Requires: python-backports.zoneinfo +%endif Requires: python-pytz Requires: python-setuptools Requires: python-sqlparse >= 0.2.2 From 9950c4c6e73d6c04b47df6075424cc0e5ea5012fd3d8634387e10c903ec0cfa5 Mon Sep 17 00:00:00 2001 From: Alberto Planas Dominguez Date: Tue, 28 Dec 2021 11:56:59 +0000 Subject: [PATCH 5/5] Accepting request 942768 from home:bnavigator:branches:devel:languages:python:django - Fix u-a scriptlet dependency. - Remove python36 conditional on numpy dep. OBS-URL: https://build.opensuse.org/request/show/942768 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-Django?expand=0&rev=98 --- python-Django.changes | 6 ++++++ python-Django.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python-Django.changes b/python-Django.changes index c1bff6b..a49a553 100644 --- a/python-Django.changes +++ b/python-Django.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 27 12:11:09 UTC 2021 - Ben Greiner + +- Fix u-a scriptlet dependency. +- Remove python36 conditional on numpy dep. + ------------------------------------------------------------------- Fri Dec 24 02:26:37 UTC 2021 - John Vandenberg diff --git a/python-Django.spec b/python-Django.spec index 55c66b9..4590b8b 100644 --- a/python-Django.spec +++ b/python-Django.spec @@ -43,6 +43,7 @@ BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module bcrypt} BuildRequires: %{python_module docutils} BuildRequires: %{python_module geoip2} +BuildRequires: %{python_module numpy} BuildRequires: %{python_module pytz} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module sqlparse >= 0.2.2} @@ -50,7 +51,6 @@ BuildRequires: %{python_module tblib >= 1.5.0} BuildRequires: %{pythons} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: %{python_module numpy if (%python-base without python36-base)} Requires: python Requires: python-Pillow >= 6.2.0 Requires: python-argon2-cffi >= 16.1.0 @@ -62,7 +62,7 @@ Requires: python-pytz Requires: python-setuptools Requires: python-sqlparse >= 0.2.2 Requires(post): update-alternatives -Requires(preun):update-alternatives +Requires(postun):update-alternatives Recommends: python-Jinja2 >= 2.9.2 Recommends: python-PyYAML Recommends: python-bcrypt