tandoor-recipes: 1.5.12 -> 1.5.16
This commit is contained in:
parent
fd281bd6b7
commit
0b854fe739
|
@ -1,15 +1,15 @@
|
||||||
{ lib, fetchFromGitHub }:
|
{ lib, fetchFromGitHub }:
|
||||||
rec {
|
rec {
|
||||||
version = "1.5.12";
|
version = "1.5.16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TandoorRecipes";
|
owner = "TandoorRecipes";
|
||||||
repo = "recipes";
|
repo = "recipes";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-5UslXRoiq9cipGCOiqpf+rv7OPTsW4qpVTjakNeg4ug=";
|
hash = "sha256-A5cPO3uybTmAV8zWY90S9vtU/tLgbh1Iqhi+ty0RLhM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
yarnHash = "sha256-CresovsRh+dLHGnv49fCi/i66QXOS3SnzfFNvkVUfd8=";
|
yarnHash = "sha256-OAgVaXWTVlKqIgDgKNT1MWN3dYzTqrAGgNAnXLDHE+I=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://tandoor.dev/";
|
homepage = "https://tandoor.dev/";
|
||||||
|
|
|
@ -32,15 +32,15 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Allow setting MEDIA_ROOT through environment variable
|
./pytest-xdist.patch # adapt pytest.ini the use $NIX_BUILD_CORES
|
||||||
# https://github.com/TandoorRecipes/recipes/pull/2931
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/TandoorRecipes/recipes/commit/abf981792057481f1d5b7473eb1090b3901ef8fa.patch";
|
|
||||||
hash = "sha256-3AFf0K/BpVwPQ2NGLUsefj6HvW7ej3szd3WaxFoqMiQ=";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace pytest.ini --subst-var NIX_BUILD_CORES
|
||||||
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = with python.pkgs; [
|
propagatedBuildInputs = with python.pkgs; [
|
||||||
|
aiohttp
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
bleach
|
bleach
|
||||||
bleach-allowlist
|
bleach-allowlist
|
||||||
|
@ -50,7 +50,6 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
|
||||||
django-allauth
|
django-allauth
|
||||||
django-annoying
|
django-annoying
|
||||||
django-auth-ldap
|
django-auth-ldap
|
||||||
django-autocomplete-light
|
|
||||||
django-cleanup
|
django-cleanup
|
||||||
django-cors-headers
|
django-cors-headers
|
||||||
django-crispy-forms
|
django-crispy-forms
|
||||||
|
@ -132,15 +131,21 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeCheckInputs = with python.pkgs; [
|
nativeCheckInputs = with python.pkgs; [
|
||||||
|
mock
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
|
pytest-asyncio
|
||||||
|
pytest-cov
|
||||||
pytest-django
|
pytest-django
|
||||||
pytest-factoryboy
|
pytest-factoryboy
|
||||||
|
pytest-html
|
||||||
|
pytest-xdist
|
||||||
];
|
];
|
||||||
|
|
||||||
# flaky
|
# flaky
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
"test_search_count"
|
"test_search_count"
|
||||||
"test_url_import_regex_replace"
|
"test_url_import_regex_replace"
|
||||||
|
"test_delete"
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|
12
pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch
Normal file
12
pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/pytest.ini b/pytest.ini
|
||||||
|
index a3d26ec4..8bdf12fb 100644
|
||||||
|
--- a/pytest.ini
|
||||||
|
+++ b/pytest.ini
|
||||||
|
@@ -3,5 +3,5 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings
|
||||||
|
testpaths = cookbook/tests
|
||||||
|
python_files = tests.py test_*.py *_tests.py
|
||||||
|
# uncomment to run coverage reports
|
||||||
|
-addopts = -n auto --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
|
||||||
|
+addopts = -n @NIX_BUILD_CORES@ --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
|
||||||
|
# addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
|
||||||
|
\ No newline at end of file
|
Loading…
Reference in New Issue
Block a user