From 0b6f4be0facc86f85e87332b91d0d8a401883cc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 30 Nov 2021 23:58:51 +0100 Subject: gnu: Django packages propagate Django, after all. This reverts commit d7922f488b658b1adb5aff09f04a9bed0221aee1. Mainly to placate the new 'sanity-check' phase, and because --with-input and friends makes it easy to override. * gnu/packages/django.scm (python-django-extensions, python-django-simple-math-captcha, python-django-taggit, python-easy-thumbnails, python-django-haystack, python-django-allauth, python-django-debug-toolbar, python-django-debug-toolbar-alchemy, python-django-assets, python-django-jinja, python-django-picklefield, python-django-bulk-update, python-django-contact-form, python-django-contrib-comments, python-django-pipeline, python-django-redis, python-django-rq, python-django-q, python-django-sortedm2m, python-django-appconf, python-django-statici18n, python-djangorestframework, python-django-sekizai, python-django-crispy-forms, python-django-override-storage, python-django-auth-ldap, python-django-logging-json, python-django-netfields, python-django-url-filter)[propagated-inputs]: Add PYTHON-DJANGO. [native-inputs]: Remove it. --- gnu/packages/django.scm | 125 +++++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index ae82e69bf1..c11d3cf2b5 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -166,10 +166,10 @@ to the @dfn{don't repeat yourself} (DRY) principle.") `(("python-six" ,python-six) ("python-vobject" ,python-vobject) ("python-werkzeug" ,python-werkzeug) - ("python-dateutil" ,python-dateutil))) + ("python-dateutil" ,python-dateutil) + ("python-django" ,python-django))) (native-inputs - `(("python-django" ,python-django) - ("python-mock" ,python-mock) + `(("python-mock" ,python-mock) ("python-factory-boy" ,python-factory-boy) ("python-tox" ,python-tox) ("python-pytest" ,python-pytest) @@ -250,10 +250,10 @@ that are useful for particular countries or cultures.") (lambda _ (invoke "python" "runtests.py")))))) (native-inputs - `(("python-django" ,python-django) - ("python-mock" ,python-mock))) + `(("python-mock" ,python-mock))) (propagated-inputs - `(("python-six" ,python-six))) + `(("python-django" ,python-django) + ("python-six" ,python-six))) (synopsis "Easy-to-use math field/widget captcha for Django forms") (description "A multi-value-field that presents a human answerable question, @@ -275,6 +275,8 @@ with arguments to the field constructor.") (build-system python-build-system) ;; FIXME: How to make the test templates available to Django? (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-django" ,python-django))) (home-page "https://github.com/divio/django-classy-tags") (synopsis "Class based template tags for Django") (description @@ -303,10 +305,10 @@ when coding custom template tags.") (lambda _ (invoke "python3" "-m" "django" "test" "--settings=tests.settings")))))) (propagated-inputs - `(("python-isort" ,python-isort))) - (native-inputs `(("python-django" ,python-django) - ("python-pytest" ,python-pytest) + ("python-isort" ,python-isort))) + (native-inputs + `(("python-pytest" ,python-pytest) ("python-mock" ,python-mock))) (home-page "https://github.com/jazzband/django-taggit") @@ -328,10 +330,9 @@ when coding custom template tags.") (base32 "14gzp5cv24z0qhxb7f7k7v9jgzpaj4n8yhjq83ynpx8183fs1rz4")))) (build-system python-build-system) - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs - `(("python-pillow" ,python-pillow))) + `(("python-django" ,python-django) + ("python-pillow" ,python-pillow))) (home-page "https://github.com/SmileyChris/easy-thumbnails") (synopsis "Easy thumbnails for Django") (description @@ -413,10 +414,11 @@ useful tools for testing Django applications and projects.") "/lib")) #t))) #:tests? #f)) ; OSError: libgdal.so.27: cannot open shared object file + (propagated-inputs + `(("python-django" ,python-django))) (native-inputs `(("gdal" ,gdal) ("python-coverage" ,python-coverage) - ("python-django" ,python-django) ("python-dateutil" ,python-dateutil) ("python-geopy" ,python-geopy) ("python-mock" ,python-mock) @@ -489,8 +491,9 @@ them do this.") ("python-requests" ,python-requests) ("python-requests-oauthlib" ,python-requests-oauthlib))) (native-inputs - `(("python-django" ,python-django) - ("python-mock" ,python-mock))) + `(("python-mock" ,python-mock))) + (inputs + `(("python-django" ,python-django))) (home-page "https://github.com/pennersr/django-allauth") (synopsis "Set of Django applications addressing authentication") (description @@ -515,10 +518,10 @@ account authentication.") "1m1j2sx7q0blma0miswj3c8hrfi5q4y5cq2b816v8gagy89xgc57")))) (build-system python-build-system) (propagated-inputs - `(("python-sqlparse" ,python-sqlparse))) + `(("python-sqlparse" ,python-sqlparse) + ("python-django" ,python-django))) (native-inputs - `(("python-django" ,python-django) - ("python-django-jinja" ,python-django-jinja) + `(("python-django-jinja" ,python-django-jinja) ("python-html5lib" ,python-html5lib))) (arguments '(#:phases @@ -548,7 +551,8 @@ request and response as a toolbar on the rendered page.") (build-system python-build-system) (arguments '(#:tests? #f)) ;XXX: 'make check' does "echo TODO" (propagated-inputs - `(("python-django-debug-toolbar" ,python-django-debug-toolbar) + `(("python-django" ,python-django) + ("python-django-debug-toolbar" ,python-django-debug-toolbar) ("python-jsonplus" ,python-jsonplus) ("python-six" ,python-six) ("python-sqlalchemy" ,python-sqlalchemy))) @@ -595,10 +599,10 @@ templatetags and a full test suite.") "0fc6i77faxxv1gjlp06lv3kw64b5bhdiypaygfxh5djddgk83fwa")))) (build-system python-build-system) (native-inputs - `(("python-django" ,python-django) - ("python-nose" ,python-nose))) + `(("python-nose" ,python-nose))) (propagated-inputs - `(("python-webassets" ,python-webassets))) + `(("python-django" ,python-django) + ("python-webassets" ,python-webassets))) (home-page "https://github.com/miracle2k/django-assets") (synopsis "Asset management for Django") (description @@ -623,7 +627,8 @@ merging, minifying and compiling CSS and Javascript files.") "06ldbkfkm6sc0p9sqpjph06gxrqpj78ih3dc2yik2fcba2y5mak1")))) (build-system python-build-system) (propagated-inputs - `(("python-jinja2" ,python-jinja2) + `(("python-django" ,python-django) + ("python-jinja2" ,python-jinja2) ("python-pytz" ,python-pytz) ("python-django-pipeline" ,python-django-pipeline))) (arguments @@ -692,7 +697,7 @@ conn_max_age argument to easily enable Django’s connection pool.") (lambda _ (invoke "python" "-m" "django" "test" "-v2" "--settings=tests.settings")))))) - (native-inputs + (propagated-inputs ;; XXX: Picklefield has not been updated in 10+ years and fails tests ;; with Django 3.2. `(("python-django@2.2" ,python-django-2.2))) @@ -714,6 +719,8 @@ conn_max_age argument to easily enable Django’s connection pool.") (arguments ;; XXX: Tests require a Postgres database. `(#:tests? #f)) + (propagated-inputs + `(("python-django" ,python-django))) (home-page "https://github.com/aykut/django-bulk-update") (synopsis "Simple bulk update over Django ORM or with helper function") (description @@ -740,8 +747,9 @@ project aims to bulk update given objects using one query over Django ORM.") (invoke "coverage" "run" "--source" "contact_form" "runtests.py")))))) (native-inputs - `(("python-coverage" ,python-coverage) - ("python-django" ,python-django))) + `(("python-coverage" ,python-coverage))) + (propagated-inputs + `(("python-django" ,python-django))) (home-page "https://github.com/ubernostrum/django-contact-form") (synopsis "Contact form for Django") (description @@ -760,10 +768,9 @@ for Django sites.") (base32 "0ccdiv784a5vnpfal36km4dyg12340rwhpr0riyy0k89wfnjn8yi")))) (build-system python-build-system) - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs - `(("python-six" ,python-six))) + `(("python-django" ,python-django) + ("python-six" ,python-six))) (home-page "https://github.com/django/django-contrib-comments") (synopsis "Comments framework") (description @@ -798,10 +805,9 @@ entries, photos, book chapters, or anything else.") (when tests? (setenv "DJANGO_SETTINGS_MODULE" "tests.settings") (invoke "django-admin" "test" "tests"))))))) - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs `(("python-css-html-js-minify" ,python-css-html-js-minify) + ("python-django" ,python-django) ("python-slimit" ,python-slimit) ("python-jsmin" ,python-jsmin))) (home-page @@ -833,14 +839,14 @@ support, and optional data-URI image and font embedding.") (with-directory-excursion "tests" (invoke "python" "runtests.py"))))))) (native-inputs - `(("python-django" ,python-django) - ("python-fakeredis" ,python-fakeredis) + `(("python-fakeredis" ,python-fakeredis) ("python-hiredis" ,python-hiredis) ("python-mock" ,python-mock) ("python-msgpack" ,python-msgpack) ("redis" ,redis))) (propagated-inputs - `(("python-redis" ,python-redis))) + `(("python-django" ,python-django) + ("python-redis" ,python-redis))) (home-page "https://github.com/niwibe/django-redis") (synopsis "Full featured redis cache backend for Django") (description @@ -868,13 +874,13 @@ support, and optional data-URI image and font embedding.") "--settings=django_rq.tests.settings" "--pythonpath=.")))))) (native-inputs - `(("python-django" ,python-django) - ("python-django-redis" ,python-django-redis) + `(("python-django-redis" ,python-django-redis) ("python-mock" ,python-mock) ("python-rq-scheduler" ,python-rq-scheduler) ("redis" ,redis))) (propagated-inputs - `(("python-rq" ,python-rq))) + `(("python-django" ,python-django) + ("python-rq" ,python-rq))) (home-page "https://github.com/ui/django-rq") (synopsis "Django integration with RQ") (description @@ -896,11 +902,10 @@ settings.py and easily use them in your project.") (build-system python-build-system) ;; FIXME: Tests require disque, Redis, MongoDB, Docker. (arguments '(#:tests? #f)) - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs `(("python-arrow" ,python-arrow) ("python-blessed" ,python-blessed) + ("python-django" ,python-django) ("python-django-picklefield" ,python-django-picklefield))) (home-page "https://django-q.readthedocs.io/") (synopsis "Multiprocessing distributed task queue for Django") @@ -926,7 +931,7 @@ using Python multiprocessing.") (lambda _ (invoke "python" "django-admin.py" "test" "--settings=settings")))))) - (native-inputs + (propagated-inputs `(("python-django" ,python-django))) (home-page "https://github.com/jazzband/django-sortedm2m") (synopsis "Drop-in replacement for django's own ManyToManyField") @@ -953,7 +958,7 @@ the order of added relations.") (lambda _ (setenv "DJANGO_SETTINGS_MODULE" "tests.test_settings") (invoke "python" "django-admin.py" "test" "-v2")))))) - (native-inputs + (propagated-inputs `(("python-django" ,python-django))) (home-page "https://github.com/django-compressor/django-appconf") (synopsis "Handle configuration defaults of packaged Django apps") @@ -988,11 +993,11 @@ name is purely coincidental.") (setenv "DJANGO_SETTINGS_MODULE" "project.settings") (invoke "pytest" "-vv")))))) (native-inputs - `(("python-django" ,python-django) - ("python-pytest" ,python-pytest) + `(("python-pytest" ,python-pytest) ("python-pytest-django" ,python-pytest-django))) (propagated-inputs - `(("django-appconf" ,python-django-appconf))) + `(("python-django" ,python-django) + ("django-appconf" ,python-django-appconf))) (synopsis "Generate JavaScript catalog to static files") (description "A Django app that provides helper for generating JavaScript catalog to @@ -1057,9 +1062,10 @@ Django projects, which allows association of a number of tags with any (invoke "python" "runtests.py" "--nolint") (format #t "test suite not run~%"))))))) (native-inputs - `(("python-django" ,python-django) - ("python-pytest" ,python-pytest) + `(("python-pytest" ,python-pytest) ("python-pytest-django" ,python-pytest-django))) + (propagated-inputs + `(("python-django" ,python-django))) (home-page "https://www.django-rest-framework.org") (synopsis "Toolkit for building Web APIs with Django") (description @@ -1080,10 +1086,9 @@ provides features like a Web-browsable API and authentication policies.") "0vrkli625b5s1wldri3dyrfvqbxg7zxy2pg0rpjixw3b1ndz0ag8")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Tests not included with release. - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs - `(("python-django-classy-tags" ,python-django-classy-tags) + `(("python-django" ,python-django) + ("python-django-classy-tags" ,python-django-classy-tags) ("python-six" ,python-six))) (home-page "https://github.com/divio/django-sekizai") (synopsis "Template blocks for Django projects") @@ -1112,7 +1117,7 @@ a single block.") (arguments '(;; No included tests #:tests? #f)) - (native-inputs + (propagated-inputs `(("python-django" ,python-django))) (home-page "http://github.com/maraujop/django-crispy-forms") @@ -1187,8 +1192,9 @@ template tag.") (lambda _ (invoke "python" "runtests.py")))))) (native-inputs - `(("python-django" ,python-django) - ("python-mock" ,python-mock))) + `(("python-mock" ,python-mock))) + (propagated-inputs + `(("python-django" ,python-django))) (synopsis "Django test helpers to manage file storage side effects") (description "This project provides tools to help reduce the side effects of using @@ -1220,10 +1226,10 @@ FileFields during tests.") "--settings" "tests.settings"))))))) (native-inputs `(("openldap" ,openldap) - ("python-django" ,python-django) ("python-mock" ,python-mock))) (propagated-inputs - `(("python-ldap" ,python-ldap))) + `(("python-django" ,python-django) + ("python-ldap" ,python-ldap))) (home-page "https://github.com/django-auth-ldap/django-auth-ldap") (synopsis "Django LDAP authentication backend") (description @@ -1242,10 +1248,9 @@ FileFields during tests.") "06041a8icazzp73kg93c7k1ska12wvkq7fpcad0l0sm1qnxx5yx7")))) (build-system python-build-system) (arguments '(#:tests? #f)) ;no tests - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs `(("python-certifi" ,python-certifi) + ("python-django" ,python-django) ("python-elasticsearch" ,python-elasticsearch) ("python-six" ,python-six))) (home-page "https://github.com/cipriantarta/django-logging") @@ -1268,10 +1273,9 @@ to ElasticSearch.") "1c47azr5am0q8g45x0fbn0cay7vyrack6n7k6siliw1j2p0gzi7s")))) (build-system python-build-system) (arguments '(#:tests? #f)) ;XXX: Requires a running PostgreSQL server - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs - `(("python-netaddr" ,python-netaddr) + `(("python-django" ,python-django) + ("python-netaddr" ,python-netaddr) ("python-six" ,python-six))) (home-page "https://github.com/jimfunk/django-postgresql-netfields") (synopsis "PostgreSQL netfields implementation for Django") @@ -1311,10 +1315,9 @@ to ElasticSearch.") (invoke "pytest" "-vv" "--doctest-modules" "tests/" "url_filter/")) (format #t "test suite not run~%"))))))) - (native-inputs - `(("python-django" ,python-django))) (propagated-inputs `(("python-cached-property" ,python-cached-property) + ("python-django" ,python-django) ("python-six" ,python-six))) (synopsis "Filter data via human-friendly URLs") (description -- cgit v1.2.3