#39 Update list of bundled Javascript modules
Merged a month ago by salimma. Opened a month ago by salimma.
rpms/ salimma/python-django virtual_provides  into  rawhide

@@ -0,0 +1,5 @@ 

+ # these are intentionally unversioned, they are virtual provides

+ # declared by every Django stack's subpackages

+ addFilter("W: unversioned-explicit-provides python-django-bash-completion-impl")

+ addFilter("W: unversioned-explicit-provides python-django-doc-impl")

+ addFilter("W: unversioned-explicit-provides python-django-impl")

file modified
+18 -8
@@ -10,6 +10,7 @@ 

  License:        BSD-3-Clause

  URL:            https://www.djangoproject.com/

  Source:         %{pypi_source %{pkgname} %{real_version}}

+ Source:         %{name}.rpmlintrc

  

  # This allows to build the package without tests, e.g. when bootstrapping new Python version

  %bcond tests    1
@@ -30,6 +31,10 @@ 

  BuildRequires:  bash-completion

  Requires:       bash-completion

  

+ # Make sure this replaces any other Django bash-completion package

+ Provides:       python-django-bash-completion-impl

+ Conflicts:      python-django-bash-completion-impl

+ 

  %description bash-completion

  This package contains the Bash completion files form Django high-level

  Python Web framework.
@@ -40,6 +45,10 @@ 

  Suggests:       python3-django = %{version}-%{release}

  BuildRequires:  make

  

+ # Make sure this replaces any other Django doc package

+ Provides:       python-django-doc-impl

+ Conflicts:      python-django-doc-impl

+ 

  %description -n python3-django-doc

  This package contains the documentation for the Django high-level

  Python Web framework.
@@ -53,8 +62,14 @@ 

  BuildRequires:  python3-devel

  BuildRequires:  python3-asgiref

  

- Provides: bundled(jquery) = 2.2.3

- Provides: bundled(xregexp) = 2.0.0

+ # see django/contrib/admin/static/admin/js/vendor/

+ Provides:       bundled(jquery) = 3.6.4

+ Provides:       bundled(select2) = 4.0.13

+ Provides:       bundled(xregexp) = 3.2.0

+ 

+ # Make sure this replaces any other Django package

+ Provides:       python-django-impl

+ Conflicts:      python-django-impl

  

  %description -n python3-django %_description

  
@@ -134,12 +149,7 @@ 

  export PYTHONPATH=$(pwd)

  cd tests

  

- # disable two tests due to regression in 3.12b4:

- # https://github.com/python/cpython/issues/106669

- %{python3} runtests.py --settings=test_sqlite --verbosity=2 --parallel 1 \

- %if v"%{python3_version}" >= v"3.12"

-   -k "not test_safe_mime_multipart and not test_unicode_address_header"

- %endif

+ %{python3} runtests.py --settings=test_sqlite --verbosity=2 --parallel 1

  %endif

  

  %files bash-completion

  • Add virtual Provides and Conflicts to allow swapping Django stacks
  • Re-enable tests temporarily disabled for Python 3.12 beta

Signed-off-by: Michel Lind salimma@fedoraproject.org

rebased onto ae82317

a month ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/ab453857b64945b289c64ee8d3aeb5f2

Pull-Request has been merged by salimma

a month ago
Metadata