Skip to content

swh: unbreak #458890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
drupol wants to merge 5 commits into from
Closed

swh: unbreak #458890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f65347
python3Packages.swh-web-client: relax python dependency, disable test…
drupol Nov 5, 2025
8dbd385
python3Packages.swh-storage: disable failing tests, unbreak
drupol Nov 5, 2025
e0b84e6
python3Packages.swh-scheduler: disable failing tests, unbreak
drupol Nov 5, 2025
cd91d4b
python3Packages.swh-scanner: remove obsolete patch, disable failing t…
drupol Nov 5, 2025
d83390d
python3Packages.swh-core: relax dependency, disable failing test, unb…
drupol Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pkgs/development/python-modules/swh-core/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ buildPythonPackage rec {
tenacity
];

pythonRelaxDeps = [ "click" ];
Copy link
Member

@transcaffeine transcaffeine Nov 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be removed when #454434 is merged


pythonImportsCheck = [ "swh.core" ];

__darwinAllowLocalNetworking = true;
Expand Down Expand Up @@ -100,7 +102,11 @@ buildPythonPackage rec {
pkgs.zstd
];

disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
disabledTests = [
"test_cli_swh_db_upgrade_new_api"
"test_cli_swh_db_upgrade_from_config"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# FileExistsError: [Errno 17] File exists:
"test_uncompress_upper_archive_extension"
# AssertionError: |500 - 632.1152460000121| not within 100
Expand Down
11 changes: 2 additions & 9 deletions pkgs/development/python-modules/swh-scanner/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,6 @@ buildPythonPackage rec {
hash = "sha256-baUUuYFapBD7iuDaDP8CSR9f4glVZcS5qBpZddVf7z8=";
};

patches = [
# To be removed at the next release
# See https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/merge_requests/160
(fetchpatch {
url = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/commit/0eb273475826b0074844c7619b767c052562cfe4.patch";
Copy link
Member

@dotlambda dotlambda Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That patch is in upstream's main branch but hasn't made it to any release yet. The only reason we can remove it is that the tests are now disabled.

hash = "sha256-i3hpaQJmHpIYgix+/npICQGtJ/IKVRXcCTm2O1VsR9M=";
})
];

build-system = [
setuptools
setuptools-scm
Expand Down Expand Up @@ -78,6 +69,8 @@ buildPythonPackage rec {
disabledTestPaths = [
# pytestRemoveBytecodePhase fails with: "error (ignored): error: opening directory "/tmp/nix-build-python3.12-swh-scanner-0.8.3.drv-5/build/pytest-of-nixbld/pytest-0/test_randomdir_policy_info_cal0/big-directory/dir/dir/dir/ ......"
"swh/scanner/tests/test_policy.py"
# TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
"swh/scanner/tests/test_cli.py"
];

meta = {
Expand Down
7 changes: 7 additions & 0 deletions pkgs/development/python-modules/swh-scheduler/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ buildPythonPackage rec {

disabledTests = [ "test_setup_log_handler_with_env_configuration" ];

disabledTestPaths = [
# TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
"swh/scheduler/tests/test_cli_celery_monitor.py"
# SystemExit: 1
"swh/scheduler/tests/test_cli_origin.py"
];

meta = {
description = "Job scheduler for the Software Heritage project";
homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/swh-storage/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ buildPythonPackage rec {
"swh/storage/tests/test_cli_cassandra.py"
# Failing tests
"swh/storage/tests/test_cli_object_references.py"
# TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
"swh/storage/tests/masking/test_cli.py"
"swh/storage/tests/blocking/test_cli.py"
];

meta = {
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/swh-web-client/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ buildPythonPackage rec {
swh-model
];

pythonRelaxDeps = [ "click" ];

pythonImportsCheck = [ "swh.web.client" ];

nativeCheckInputs = [
Expand All @@ -57,6 +59,10 @@ buildPythonPackage rec {
types-requests
];

disabledTests = [
"test_save_code_now_through_cli"
];

meta = {
description = "Client for Software Heritage Web applications, via their APIs";
homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-web-client";
Expand Down
Loading