From 025bd7d3115a164b329a30ce03bc205abd68a8e4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 14 Jan 2025 14:23:44 +0100 Subject: [PATCH] gnu: python-django-compressor: Update to 4.5.1. * gnu/packages/django.scm (python-django-compressor): Update to 4.5.1. [build-system]: Use pyproject-build-system. [arguments]: Add phases 'relax-requirements and 'skip-bad-test; simplify 'check phase; enable tests. [propagated-inputs]: Add python-django and python-django-sekizai. [native-inputs]: Remove python-django-sekizai and python-mock; add python-setuptools and python-wheel. Change-Id: I3f528e3ac1eed971ee39494a4f49fedf14d6449d --- gnu/packages/django.scm | 46 ++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 0e8590ade06..106ebf651d1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1377,33 +1377,45 @@ forms using your favorite CSS framework, without writing template code.") (define-public python-django-compressor (package (name "python-django-compressor") - (version "2.4.1") + (version "4.5.1") (source (origin (method url-fetch) (uri (pypi-uri "django_compressor" version)) (sha256 - (base32 "1q0m0hfg7sqmj5km924g4dgy3nx51aszzsprlp6gsin10mv0fn1k")))) - (build-system python-build-system) + (base32 "08m8cs1mnpwd2zlck8cbl4cdp21dgv4vj7j17krbgn745s5a9n61")))) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">=")))) + ;; This needs calmjs. + (add-after 'unpack 'skip-bad-test + (lambda _ + (substitute* "compressor/tests/test_filters.py" + (("test_calmjs_filter") "_test_calmjs_filter")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (setenv "DJANGO_SETTINGS_MODULE" "compressor.test_settings") - (invoke "django-admin" "test" - "--pythonpath=.")) - #t)))) - ;; Tests fail with beautifulsoup 4.9+ - ;; https://github.com/django-compressor/django-compressor/issues/998 - #:tests? #f)) + (when tests? + (setenv "DJANGO_SETTINGS_MODULE" "compressor.test_settings") + (invoke "django-admin" "test" + "--pythonpath=."))))))) (propagated-inputs - (list python-django-appconf python-rcssmin python-rjsmin)) + (list python-django + python-django-appconf + python-django-sekizai + python-rcssmin + python-rjsmin)) (native-inputs - (list python-beautifulsoup4 python-brotli python-csscompressor - python-django-sekizai python-mock)) + (list python-beautifulsoup4 + python-brotli + python-csscompressor + python-setuptools + python-wheel)) (home-page "https://django-compressor.readthedocs.io/en/latest/") (synopsis "Compress linked and inline JavaScript or CSS into single cached files")