Unverified Commit 90fb12b7 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #265655 from fabaff/baserow-fix 

python311Packages.django-redis: ignore DeprecationWarning
parents 4f66b50e 5cebbd4b

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

+29 −20
Original line number Diff line number Diff line 
{ arrow

{ lib

, stdenv

, arrow

, blessed

, buildPythonPackage

, croniter

, django

, django-redis

, django-picklefield

, django-redis

, fetchFromGitHub

, future

, lib

, pkgs

, poetry-core

, pytest-django

, pytest-mock

, pytestCheckHook

, pkgs

, stdenv

, pythonOlder

}:



buildPythonPackage rec {

  pname = "django-q";

  version = "1.3.9";

  format = "pyproject";

  pyproject = true;



  disabled = pythonOlder "3.6";



  src = fetchFromGitHub {

    owner = "Koed00";

    repo = "django-q";

    rev = "refs/tags/v${version}";

    hash = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA=";

    rev = "v${version}";

  };



  nativeBuildInputs = [ poetry-core ];

  # fixes empty version string

  # analog to https://github.com/NixOS/nixpkgs/pull/171200

  patches = [

    ./pep-621.patch

  ];



  nativeBuildInputs = [

    poetry-core

  ];



  propagatedBuildInputs = [

    django-picklefield
@@ -38,10 +49,12 @@ buildPythonPackage rec { 
    future

  ];



  # fixes empty version string

  # analog to https://github.com/NixOS/nixpkgs/pull/171200

  patches = [

    ./pep-621.patch

  nativeCheckInputs = [

    croniter

    django-redis

    pytest-django

    pytest-mock

    pytestCheckHook

  ];



  pythonImportsCheck = [
@@ -57,14 +70,6 @@ buildPythonPackage rec { 
    kill $REDIS_PID

  '';



  nativeCheckInputs = [

    croniter

    django-redis

    pytest-django

    pytest-mock

    pytestCheckHook

  ];



  # don't bother with two more servers to test

  disabledTests = [

    "test_disque"
@@ -76,7 +81,11 @@ buildPythonPackage rec { 
  meta = with lib; {

    description = "A multiprocessing distributed task queue for Django";

    homepage = "https://django-q.readthedocs.org";

    changelog = "https://github.com/Koed00/django-q/releases/tag/v${version}";

    license = licenses.mit;

    maintainers = with maintainers; [ gador ];

    # django-q is unmaintained at the moment

    # https://github.com/Koed00/django-q/issues/733

    broken = true;

  };

}

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

+19 −7
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, pythonAtLeast

, pythonOlder

, buildPythonPackage

, setuptools



# propagated

, django
@@ -18,13 +18,11 @@ 
, pytestCheckHook

}:



let

buildPythonPackage rec {

  pname = "django-redis";

  version = "5.4.0";

in

buildPythonPackage {

  inherit pname version;

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.6";



  src = fetchFromGitHub {
@@ -38,14 +36,23 @@ buildPythonPackage { 
    sed -i '/-cov/d' setup.cfg

  '';



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    django

    hiredis

    lz4

    msgpack

    redis

  ];



  passthru.optional-dependencies = {

    hiredis = [

      redis

    ] ++ redis.optional-dependencies.hiredis;

  };



  pythonImportsCheck = [

    "django_redis"

  ];
@@ -65,6 +72,11 @@ buildPythonPackage { 
    pytest-django

    pytest-mock

    pytestCheckHook

  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);



  pytestFlagsArray = [

    "-W"

    "ignore::DeprecationWarning"

  ];



  disabledTests = [