Unverified Commit b8c32981 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

djangorestframework: 3.15.1 -> 3.15.2, add support for django 5 (#331288)

parents 6d26fa79 d07eb6be

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

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
  djangorestframework,

  pytestCheckHook,

  pytest-django,

  pytz,

}:



buildPythonPackage rec {
@@ -29,6 +30,7 @@ buildPythonPackage rec { 
    djangorestframework

    pytestCheckHook

    pytest-django

    pytz

  ];



  env.DJANGO_SETTINGS_MODULE = "tests.settings";

pkgs/development/python-modules/django-timezone-field/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
  pytestCheckHook,

  pytest-django,

  pytest-lazy-fixture,

  pytz,

}:



buildPythonPackage rec {
@@ -43,6 +44,7 @@ buildPythonPackage rec { 
    pytestCheckHook

    pytest-django

    pytest-lazy-fixture

    pytz

  ];



  meta = with lib; {

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

+24 −19
Original line number Diff line number Diff line
@@ -11,51 +11,56 @@ 
  django,

  pytz,



  # tests

  # optional-dependencies

  coreapi,

  coreschema,

  django-guardian,

  inflection,

  psycopg2,

  pygments,

  pyyaml,



  # tests

  pytestCheckHook,

  pytest-django,

  pyyaml,

}:



buildPythonPackage rec {

  pname = "djangorestframework";

  version = "3.15.1";

  format = "setuptools";

  version = "3.15.2";

  pyproject = true;

  disabled = pythonOlder "3.6";



  src = fetchFromGitHub {

    owner = "encode";

    repo = "django-rest-framework";

    rev = version;

    hash = "sha256-G914NvxRmKGkxrozoWNUIoI74YkYRbeNcQwIG4iSeXU=";

    hash = "sha256-ne0sk4m11Ha77tNmCsdhj7QVmCkYj5GjLn/dLF4qxU8=";

  };



  build-system = [

    setuptools

  ];

  build-system = [ setuptools ];



  dependencies = [

    django

    pytz

  ];



  nativeCheckInputs = [

    pytest-django

    pytestCheckHook

    pygments

  ] ++ (lib.optional (lib.versionOlder django.version "5.0.0") pytz);



    # optional tests

  optional-dependencies = {

    complete = [

      coreapi

      coreschema

      django-guardian

      inflection

      psycopg2

      pygments

      pyyaml

    ];

  };



  nativeCheckInputs = [

    pytest-django

    pytestCheckHook

  ] ++ optional-dependencies.complete;



  disabledTests = [

    # https://github.com/encode/django-rest-framework/issues/9422