diff options
| author | nixpkgs-ci[bot] <190413589+nixpkgs-ci[bot]@users.noreply.github.com> | 2025-06-12 06:06:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-12 06:06:28 +0000 |
| commit | b281282ac7563aafc33fa0f81efd5ed400a582eb (patch) | |
| tree | 31daf7ff19355d391bb1af7e8d7591946e2710a1 /pkgs/development/python-modules/django | |
| parent | python3Packages: sort (diff) | |
| parent | cargo-nextest: 0.9.97 -> 0.9.98 (#416043) (diff) | |
| download | nixpkgs-b281282ac7563aafc33fa0f81efd5ed400a582eb.tar.gz | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/django')
| -rw-r--r-- | pkgs/development/python-modules/django/5_1.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/django/5_2.nix | 10 |
2 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/django/5_1.nix b/pkgs/development/python-modules/django/5_1.nix index c872bd6f704a..741d75c86cd3 100644 --- a/pkgs/development/python-modules/django/5_1.nix +++ b/pkgs/development/python-modules/django/5_1.nix @@ -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 diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix index 73a0a7b74fb5..e2f72a774e82 100644 --- a/pkgs/development/python-modules/django/5_2.nix +++ b/pkgs/development/python-modules/django/5_2.nix @@ -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 |