python313Packages.django-bootstrap{3,4,5}: 25.1 -> 25.1 (#386557)

Author: mweinelt

pkgs/by-name/pr/pretalx/package.nix

@@ -14,22 +14,6 @@ let
     packageOverrides = final: prev: {
       django = prev.django_5;
 
-      django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec {
-        version = "3.0.0";
-        src = oldAttrs.src.override {
-          tag = "v${version}";
-          hash = "sha256-a8BopUwZjmvxOzBVqs4fTo0SY8sEEloGUw90daYWfz8=";
-        };
-
-        propagatedBuildInputs = with final; [
-          beautifulsoup4
-          django
-        ];
-
-        # fails with some assertions
-        doCheck = false;
-      });
-
       django-extensions = prev.django-extensions.overridePythonAttrs {
         # Compat issues with Django 5.1
         # https://github.com/django-extensions/django-extensions/issues/1885
@@ -127,7 +111,6 @@ python.pkgs.buildPythonApplication rec {
       defusedcsv
       defusedxml
       django
-      django-bootstrap4
       django-compressor
       django-context-decorator
       django-countries

pkgs/by-name/pr/pretix/package.nix

@@ -92,6 +92,7 @@ python.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "beautifulsoup4"
+    "django-bootstrap3"
     "django-phonenumber-field"
     "dnspython"
     "drf_ujson2"

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

@@ -4,10 +4,9 @@
   fetchFromGitHub,
 
   # build-system
-  setuptools,
-  setuptools-scm,
+  hatchling,
 
-  # non-propagates
+  # dependencies
   django,
 
   # tests
@@ -17,22 +16,19 @@
 
 buildPythonPackage rec {
   pname = "django-bootstrap3";
-  version = "24.3";
+  version = "25.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap3";
     tag = "v${version}";
-    hash = "sha256-7aHGTa98NaHg6C+fxuQsrPk/8XjHB3awp+gAWysOhAw=";
+    hash = "sha256-gRDU2IDE6cOVBJzdOs8Ww9mItMy/2DPMYusC0TCTqkI=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
-  ];
+  build-system = [ hatchling ];
 
-  buildInputs = [ django ];
+  dependencies = [ django ];
 
   pythonImportsCheck = [ "bootstrap3" ];
 

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

@@ -4,8 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  setuptools,
-  setuptools-scm,
+  hatchling,
 
   # non-propagates
   django,
@@ -14,27 +13,23 @@
   beautifulsoup4,
 
   # tests
-  python,
   pytest-django,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "django-bootstrap4";
-  version = "24.4";
+  version = "25.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap4";
     tag = "v${version}";
-    hash = "sha256-9URZ+10GVX171Zht49UQEDkVOZ7LfOtUvapLydzNAlk=";
+    hash = "sha256-WIz7T2f3xvsT2rSq1MUFwHpvzgHyLgTRpzb9z98sUmo=";
   };
 
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
+  build-system = [ hatchling ];
 
   dependencies = [ beautifulsoup4 ];
 

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

@@ -4,18 +4,17 @@
   buildPythonPackage,
   django,
   fetchFromGitHub,
+  hatchling,
   jinja2,
   pillow,
   pytest-django,
   pytestCheckHook,
   pythonOlder,
-  setuptools-scm,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-bootstrap5";
-  version = "24.3";
+  version = "25.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,13 +23,10 @@ buildPythonPackage rec {
     owner = "zostera";
     repo = "django-bootstrap5";
     rev = "v${version}";
-    hash = "sha256-8e0Pi4uSvQhiLYiMgOqWJWDc/KPMXxyU5pnT9jvFZLU=";
+    hash = "sha256-5VYw9Kq33/YFW9mFzkFzhrxavfx6r/CtC1SJhZbanhg=";
   };
 
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
+  build-system = [ hatchling ];
 
   dependencies = [ django ];
 
@@ -44,7 +40,7 @@ buildPythonPackage rec {
     pillow
     pytest-django
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export DJANGO_SETTINGS_MODULE=tests.app.settings