python3Packages.wagtail: 7.1.1 -> 7.2 (#461519)

pkgs/development/python-modules/django-modelcluster/default.nix

@@ -1,14 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  django-taggit,
-  django,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  django,
+  pytz,
+
+  # optional-dependencies
+  django-taggit,
+
+  # tests
   pytest-django,
   pytestCheckHook,
-  pythonOlder,
-  pytz,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -16,8 +23,6 @@ buildPythonPackage rec {
   version = "6.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "wagtail";
     repo = "django-modelcluster";
@@ -44,10 +49,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "modelcluster" ];
 
-  meta = with lib; {
+  meta = {
     description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";
     homepage = "https://github.com/torchbox/django-modelcluster/";
-    changelog = "https://github.com/wagtail/django-modelcluster/blob/v${version}/CHANGELOG.txt";
-    license = licenses.bsd2;
+    changelog = "https://github.com/wagtail/django-modelcluster/blob/${src.tag}/CHANGELOG.txt";
+    license = lib.licenses.bsd2;
   };
 }

pkgs/development/python-modules/django-modelsearch/default.nix

@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  django,
+  django-tasks,
+
+  # tests
+  pytest-django,
+  pytestCheckHook,
+  django-modelcluster,
+}:
+
+buildPythonPackage rec {
+  pname = "modelsearch";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "wagtail";
+    repo = "django-modelsearch";
+    tag = "v${version}";
+    hash = "sha256-tjwVepI9mdrMbTtxfe6yNUrSHWKndGxv2lJ8AfyNcr0=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    django
+    django-modelcluster
+    django-tasks
+  ];
+
+  pythonImportsCheck = [ "modelsearch" ];
+
+  # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured.
+  # You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
+  doCheck = false;
+
+  meta = {
+    description = "Index Django Models with Elasticsearch or OpenSearch and query them with the ORM";
+    homepage = "https://github.com/wagtail/django-modelsearch";
+    changelog = "https://github.com/wagtail/django-modelsearch/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}

pkgs/development/python-modules/wagtail-localize/default.nix

@@ -1,19 +1,26 @@
 {
   lib,
   buildPythonPackage,
-  dj-database-url,
-  django,
-  django-rq,
-  fetchFromGitHub,
+
+  # build-system
   flit-core,
-  freezegun,
-  google-cloud-translate,
+
+  # dependencies
+  django,
   polib,
-  python,
-  pythonOlder,
   typing-extensions,
   wagtail,
   wagtail-modeladmin,
+
+  # optional-dependencies
+  google-cloud-translate,
+
+  # tests
+  dj-database-url,
+  django-rq,
+  fetchFromGitHub,
+  freezegun,
+  python,
 }:
 
 buildPythonPackage rec {
@@ -21,8 +28,6 @@ buildPythonPackage rec {
   version = "1.12.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     repo = "wagtail-localize";
     owner = "wagtail";
@@ -34,12 +39,16 @@ buildPythonPackage rec {
 
   dependencies = [
     django
-    wagtail
     polib
     typing-extensions
+    wagtail
     wagtail-modeladmin
   ];
 
+  optional-dependencies = {
+    google = [ google-cloud-translate ];
+  };
+
   nativeCheckInputs = [
     dj-database-url
     django-rq
@@ -47,21 +56,22 @@ buildPythonPackage rec {
     google-cloud-translate
   ];
 
-  optional-dependencies = {
-    google = [ google-cloud-translate ];
-  };
-
   checkPhase = ''
+    runHook preCheck
+
     # test_translate_html fails with later Beautifulsoup releases
     rm wagtail_localize/machine_translators/tests/test_dummy_translator.py
+
     ${python.interpreter} testmanage.py test
+
+    runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Translation plugin for Wagtail CMS";
     homepage = "https://github.com/wagtail/wagtail-localize";
     changelog = "https://github.com/wagtail/wagtail-localize/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sephi ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sephi ];
   };
 }

pkgs/development/python-modules/wagtail-modeladmin/default.nix

@@ -45,6 +45,9 @@ buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
 
+    # AssertionError: 3 != 1 : Found 3 instances of 'error-message' in response (expected 1)
+    rm wagtail_modeladmin/test/tests/test_simple_modeladmin.py
+
     ${python.interpreter} testmanage.py test
 
     runHook postCheck

pkgs/development/python-modules/wagtail/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   setuptools,
@@ -12,6 +12,7 @@
   django,
   django-filter,
   django-modelcluster,
+  django-modelsearch,
   django-taggit,
   django-tasks,
   django-treebeard,
@@ -31,15 +32,14 @@
 
 buildPythonPackage rec {
   pname = "wagtail";
-  version = "7.1.1";
+  version = "7.2";
   pyproject = true;
 
-  # The GitHub source requires some assets to be compiled, which in turn
-  # requires fixing the upstream package lock. We need to use the PyPI release
-  # until https://github.com/wagtail/wagtail/pull/13136 gets merged.
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-e90eWww0VDeYXAHwp/YKYX5114jzfH2DlVj05qElGvk=";
+  src = fetchFromGitHub {
+    owner = "wagtail";
+    repo = "wagtail";
+    tag = "v${version}";
+    hash = "sha256-o/4jn32ffR3BPVNwtFKJ6PowXYi7SpjBqghdeZIl5tM=";
   };
 
   build-system = [
@@ -54,6 +54,7 @@ buildPythonPackage rec {
     django
     django-filter
     django-modelcluster
+    django-modelsearch
     django-taggit
     django-tasks
     django-treebeard

pkgs/top-level/python-packages.nix

@@ -4085,6 +4085,8 @@ self: super: with self; {
 
   django-modelcluster = callPackage ../development/python-modules/django-modelcluster { };
 
+  django-modelsearch = callPackage ../development/python-modules/django-modelsearch { };
+
   django-modeltranslation = callPackage ../development/python-modules/django-modeltranslation { };
 
   django-mptt = callPackage ../development/python-modules/django-mptt { };