Page MenuHomeSoftware Heritage
Differential D8710

pre-commit, tox: Bump pre-commit, codespell, black and flake8
ClosedPublic
Actions

Authored by douardda on Oct 18 2022, 7:13 PM.

Details

Reviewers
None
Group Reviewers
Reviewers
Commits
rDDATASET8853c0ab74c7: pre-commit, tox: Bump pre-commit, codespell, black and flake8
Summary
  • pre-commit from 4.1.0 to 4.3.0,
  • codespell from 2.2.1 to 2.2.2,
  • black from 22.3.0 to 22.10.0 and
  • flake8 from 4.0.1 to 5.0.4. Also freeze flake8 dependencies.

Also change flake8's repo config to github (the gitlab mirror
being outdated).

Diff Detail

Event Timeline

douardda created this revision.Oct 18 2022, 7:13 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptOct 18 2022, 7:13 PM
swh-public-ci added a comment.Oct 18 2022, 7:17 PM

Build is green

Patch application report for D8710 (id=31434)

Rebasing onto 6d4154bc35...

Current branch diff-target is up to date.
Changes applied before test
commit 8853c0ab74c707dfdc76c7e2308b93a8077aec80
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Oct 18 18:20:41 2022 +0200

    pre-commit, tox: Bump pre-commit, codespell, black and flake8
    
    - pre-commit from 4.1.0 to 4.3.0,
    - codespell from 2.2.1 to 2.2.2,
    - black from 22.3.0 to 22.10.0 and
    - flake8 from 4.0.1 to 5.0.4. Also freeze flake8 dependencies.
    
    Also change flake8's repo config to github (the gitlab mirror
    being outdated).

See https://jenkins.softwareheritage.org/job/DDATASET/job/tests-on-diff/153/ for more details.

Harbormaster completed remote builds in B32380: Diff 31434.Oct 18 2022, 7:17 PM
douardda requested review of this revision.Oct 18 2022, 7:17 PM
This revision was not accepted when it landed; it landed in state Needs Review.Oct 18 2022, 7:50 PM
Closed by commit rDDATASET8853c0ab74c7: pre-commit, tox: Bump pre-commit, codespell, black and flake8 (authored by douardda). · Explain Why
This revision was automatically updated to reflect the committed changes.
douardda added a commit: rDDATASET8853c0ab74c7: pre-commit, tox: Bump pre-commit, codespell, black and flake8.

Revision Contents
Changeset List

PathSize
12 lines
7 lines

Diff 31434

View Options

.pre-commit-config.yaml

Show All 16 Lines
from swh.vault.tests.test_backend import TEST_SWHID from swh.vault.tests.test_backend import TEST_SWHID
@pytest.fixture @pytest.fixture
def swh_vault_server_config(swh_vault_config: Dict[str, Any]) -> Dict[str, Any]: def swh_vault_server_config(swh_vault_config: Dict[str, Any]) -> Dict[str, Any]:
"""Returns a vault server configuration, with ``storage``, ``scheduler`` and """Returns a vault server configuration, with ``storage``, ``scheduler`` and
``cache`` set at the toplevel""" ``cache`` set at the toplevel"""
return { return {
"vault": {"cls": "local", "db": swh_vault_config["db"]}, "vault": {"cls": "postgresql", "db": swh_vault_config["db"]},
"client_max_size": 1024**3, "client_max_size": 1024**3,
**{k: v for k, v in swh_vault_config.items() if k != "db"}, **{k: v for k, v in swh_vault_config.items() if k != "db"},
} }
@pytest.fixture @pytest.fixture
def swh_vault_server_config_file(swh_vault_server_config, monkeypatch, tmp_path): def swh_vault_server_config_file(swh_vault_server_config, monkeypatch, tmp_path):
"""Creates a vault server configuration file and sets it into SWH_CONFIG_FILENAME""" """Creates a vault server configuration file and sets it into SWH_CONFIG_FILENAME"""
▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Linesdef test_check_config_missing_vault_configuration() -> None:
"""Irrelevant configuration file path raises""" """Irrelevant configuration file path raises"""
with pytest.raises(ValueError, match="missing 'vault' configuration"): with pytest.raises(ValueError, match="missing 'vault' configuration"):
check_config({}) check_config({})
def test_check_config_not_local() -> None: def test_check_config_not_local() -> None:
"""Wrong configuration raises""" """Wrong configuration raises"""
expected_error = ( expected_error = (
"The vault backend can only be started with a 'local' configuration" "The vault backend can only be started with a 'postgresql' configuration"
) )
with pytest.raises(EnvironmentError, match=expected_error): with pytest.raises(EnvironmentError, match=expected_error):
check_config({"vault": {"cls": "remote"}}) check_config({"vault": {"cls": "remote"}})
def test_check_config_ok(swh_vault_server_config) -> None: @pytest.mark.parametrize("clazz", ["local", "postgresql"])
def test_check_config_ok(swh_vault_server_config, clazz) -> None:
"""Check that the default config is accepted""" """Check that the default config is accepted"""
config = swh_vault_server_config.copy()
config["vault"]["cls"] = clazz
assert check_config(swh_vault_server_config) is not None assert check_config(swh_vault_server_config) is not None
@pytest.mark.parametrize("missing_key", ["storage", "cache", "scheduler"]) @pytest.mark.parametrize("missing_key", ["storage", "cache", "scheduler"])
def test_check_config_missing_key(missing_key, swh_vault_server_config) -> None: def test_check_config_missing_key(missing_key, swh_vault_server_config) -> None:
"""Check that configs with a missing key get rejected""" """Check that configs with a missing key get rejected"""
config_ok = swh_vault_server_config config_ok = swh_vault_server_config
config_ko = copy.deepcopy(config_ok) config_ko = copy.deepcopy(config_ok)
config_ko["vault"].pop(missing_key, None) config_ko["vault"].pop(missing_key, None)
config_ko.pop(missing_key, None) config_ko.pop(missing_key, None)
expected_error = f"invalid configuration: missing {missing_key} config entry" expected_error = f"invalid configuration: missing {missing_key} config entry"
with pytest.raises(ValueError, match=expected_error): with pytest.raises(ValueError, match=expected_error):
check_config(config_ko) check_config(config_ko)
View Options

tox.ini

Show All 16 Lines
from swh.vault.tests.test_backend import TEST_SWHID from swh.vault.tests.test_backend import TEST_SWHID
@pytest.fixture @pytest.fixture
def swh_vault_server_config(swh_vault_config: Dict[str, Any]) -> Dict[str, Any]: def swh_vault_server_config(swh_vault_config: Dict[str, Any]) -> Dict[str, Any]:
"""Returns a vault server configuration, with ``storage``, ``scheduler`` and """Returns a vault server configuration, with ``storage``, ``scheduler`` and
``cache`` set at the toplevel""" ``cache`` set at the toplevel"""
return { return {
"vault": {"cls": "local", "db": swh_vault_config["db"]}, "vault": {"cls": "postgresql", "db": swh_vault_config["db"]},
"client_max_size": 1024**3, "client_max_size": 1024**3,
**{k: v for k, v in swh_vault_config.items() if k != "db"}, **{k: v for k, v in swh_vault_config.items() if k != "db"},
} }
@pytest.fixture @pytest.fixture
def swh_vault_server_config_file(swh_vault_server_config, monkeypatch, tmp_path): def swh_vault_server_config_file(swh_vault_server_config, monkeypatch, tmp_path):
"""Creates a vault server configuration file and sets it into SWH_CONFIG_FILENAME""" """Creates a vault server configuration file and sets it into SWH_CONFIG_FILENAME"""
▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Linesdef test_check_config_missing_vault_configuration() -> None:
"""Irrelevant configuration file path raises""" """Irrelevant configuration file path raises"""
with pytest.raises(ValueError, match="missing 'vault' configuration"): with pytest.raises(ValueError, match="missing 'vault' configuration"):
check_config({}) check_config({})
def test_check_config_not_local() -> None: def test_check_config_not_local() -> None:
"""Wrong configuration raises""" """Wrong configuration raises"""
expected_error = ( expected_error = (
"The vault backend can only be started with a 'local' configuration" "The vault backend can only be started with a 'postgresql' configuration"
) )
with pytest.raises(EnvironmentError, match=expected_error): with pytest.raises(EnvironmentError, match=expected_error):
check_config({"vault": {"cls": "remote"}}) check_config({"vault": {"cls": "remote"}})
def test_check_config_ok(swh_vault_server_config) -> None: @pytest.mark.parametrize("clazz", ["local", "postgresql"])
def test_check_config_ok(swh_vault_server_config, clazz) -> None:
"""Check that the default config is accepted""" """Check that the default config is accepted"""
config = swh_vault_server_config.copy()
config["vault"]["cls"] = clazz
assert check_config(swh_vault_server_config) is not None assert check_config(swh_vault_server_config) is not None
@pytest.mark.parametrize("missing_key", ["storage", "cache", "scheduler"]) @pytest.mark.parametrize("missing_key", ["storage", "cache", "scheduler"])
def test_check_config_missing_key(missing_key, swh_vault_server_config) -> None: def test_check_config_missing_key(missing_key, swh_vault_server_config) -> None:
"""Check that configs with a missing key get rejected""" """Check that configs with a missing key get rejected"""
config_ok = swh_vault_server_config config_ok = swh_vault_server_config
config_ko = copy.deepcopy(config_ok) config_ko = copy.deepcopy(config_ok)
config_ko["vault"].pop(missing_key, None) config_ko["vault"].pop(missing_key, None)
config_ko.pop(missing_key, None) config_ko.pop(missing_key, None)
expected_error = f"invalid configuration: missing {missing_key} config entry" expected_error = f"invalid configuration: missing {missing_key} config entry"
with pytest.raises(ValueError, match=expected_error): with pytest.raises(ValueError, match=expected_error):
check_config(config_ko) check_config(config_ko)
About · Developer information · Legal