Unverified Commit c19c69c2 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

python3Packages.django_5_{1,2}: don't depend on pywatchman (#415400)

parents 363be8ec 2a3d6aec

pkgs/development/python-modules/django/5_1.nix

+0 −7
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
  pylibmc,

  pymemcache,

  python,

  pywatchman,

  pyyaml,

  pytz,

  redis,
@@ -108,7 +107,6 @@ buildPythonPackage rec { 
    pillow

    pylibmc

    pymemcache

    pywatchman

    pyyaml

    pytz

    redis
@@ -117,11 +115,6 @@ buildPythonPackage rec { 
    tzdata

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



  doCheck =

    !stdenv.hostPlatform.isDarwin

    # pywatchman depends on folly which does not support 32bits

    && !stdenv.hostPlatform.is32bit;



  preCheck = ''

    # make sure the installed library gets imported

    rm -rf django

pkgs/development/python-modules/django/5_2.nix

+2 −8
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
  pylibmc,

  pymemcache,

  python,

  pywatchman,

  pyyaml,

  pytz,

  redis,
@@ -101,7 +100,6 @@ buildPythonPackage rec { 
    pillow

    pylibmc

    pymemcache

    pywatchman

    pyyaml

    pytz

    redis
@@ -110,11 +108,6 @@ buildPythonPackage rec { 
    tzdata

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



  doCheck =

    !stdenv.hostPlatform.isDarwin

    # pywatchman depends on folly which does not support 32bits

    && !stdenv.hostPlatform.is32bit;



  preCheck = ''

    # make sure the installed library gets imported

    rm -rf django
@@ -132,7 +125,8 @@ buildPythonPackage rec { 
    runHook preCheck



    pushd tests

    ${python.interpreter} runtests.py --settings=test_sqlite

    # without --parallel=1, tests fail with an "unexpected error due to a database lock" on Darwin

    ${python.interpreter} runtests.py --settings=test_sqlite ${lib.optionalString stdenv.hostPlatform.isDarwin "--parallel=1"}

    popd



    runHook postCheck