Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 1 addition & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,12 @@ repos:
hooks:
# Run the linter.
- id: ruff
args: ['--fix']
args: ["--fix"]
require_serial: true
# Run the formatter.
- id: ruff-format
args: []

# python docstring formatting
- repo: https://github.com/myint/docformatter
rev: v1.7.5
hooks:
- id: docformatter
# https://github.com/PyCQA/docformatter/issues/172#issuecomment-1496443857
additional_dependencies: [tomli]
args: [--in-place]
require_serial: true

# md formatting
# NOTE: Disabling, since it wants to change the markdown regression files with escaped
# characters.
Expand Down
8 changes: 2 additions & 6 deletions tests/integration/test_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from milatools.utils.remote_v2 import RemoteV2

from ..conftest import job_name, launches_jobs
from .test_slurm_remote import PARAMIKO_SSH_BANNER_BUG, get_recent_jobs_info_dicts
from .test_slurm_remote import get_recent_jobs_info_dicts

logger = get_logger(__name__)

Expand Down Expand Up @@ -296,11 +296,7 @@ def doesnt_create_new_jobs_fixture(capsys: pytest.CaptureFixture):


@doesnt_create_new_jobs
@pytest.mark.parametrize(
"use_v1",
[False, pytest.param(True, marks=[PARAMIKO_SSH_BANNER_BUG])],
ids=["code", "code_v1"],
)
@pytest.mark.parametrize("use_v1", [False, True], ids=["code", "code_v1"])
@pytest.mark.parametrize(
("use_node_name", "use_job_id"),
[(True, False), (False, True), (True, True)],
Expand Down
8 changes: 6 additions & 2 deletions tests/integration/test_code_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@
from milatools.utils.remote_v1 import RemoteV1
from milatools.utils.remote_v2 import RemoteV2

from ..cli.common import in_github_CI
from ..conftest import launches_jobs
from .test_slurm_remote import PARAMIKO_SSH_BANNER_BUG, get_recent_jobs_info_dicts
from .test_slurm_remote import get_recent_jobs_info_dicts

logger = get_logger(__name__)


@pytest.mark.slow
@launches_jobs
@PARAMIKO_SSH_BANNER_BUG
@pytest.mark.skipif(
in_github_CI,
reason="Misbehaving since the 2FA changes on the Mila cluster.",
)
@pytest.mark.parametrize("persist", [True, False])
def test_code_v1(
login_node: RemoteV1 | RemoteV2,
Expand Down
Loading