From f6a01dc3355f3954d04a31aafc3058ad9915cf1d Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Fri, 7 Jul 2023 10:01:52 -0300 Subject: [PATCH 1/3] update pre-commits --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6a81071d..8d349177 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,23 +25,23 @@ repos: language_version: python3 - repo: https://github.com/asottile/add-trailing-comma - rev: v2.4.0 + rev: v3.0.0 hooks: - id: add-trailing-comma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.270 + rev: v0.0.277 hooks: - id: ruff - repo: https://github.com/tox-dev/pyproject-fmt - rev: 0.11.2 + rev: 0.13.0 hooks: - id: pyproject-fmt - repo: https://github.com/codespell-project/codespell - rev: v2.2.4 + rev: v2.2.5 hooks: - id: codespell args: From 29d67a5279246635b52b02dac4c425b778d4c5a1 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Fri, 7 Jul 2023 10:02:16 -0300 Subject: [PATCH 2/3] remove dups in sets --- compliance_checker/cf/util.py | 2 -- compliance_checker/tests/test_suite.py | 1 - 2 files changed, 3 deletions(-) diff --git a/compliance_checker/cf/util.py b/compliance_checker/cf/util.py index d033cd52..d57f7d86 100644 --- a/compliance_checker/cf/util.py +++ b/compliance_checker/cf/util.py @@ -73,7 +73,6 @@ "xlon", "XLON", "lonx", - "lonx", "lon_u", "LON_U", "lon_v", @@ -97,7 +96,6 @@ "ylat", "YLAT", "laty", - "laty", "lat_u", "LAT_U", "lat_v", diff --git a/compliance_checker/tests/test_suite.py b/compliance_checker/tests/test_suite.py index 1708a8d9..54f49a95 100644 --- a/compliance_checker/tests/test_suite.py +++ b/compliance_checker/tests/test_suite.py @@ -146,7 +146,6 @@ def test_skip_check_level(self): "§3.5 flag_meanings for lat", "§3.5 flag_meanings for lon", "§3.5 lat is a valid flags variable", - "§3.5 lat is a valid flags variable", "§3.5 lon is a valid flags variable", } From 6370ff69f71ab13471ab7838cf91445b07d69e9f Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Fri, 7 Jul 2023 10:02:25 -0300 Subject: [PATCH 3/3] add a skip for dups we want to keep --- pyproject.toml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2cd038aa..af8b5817 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,12 +6,6 @@ requires = [ "wheel", ] -[tool.pytest.ini_options] -markers = [ - "integration: marks integration tests (deselect with '-m \"not integration\"')", - "slowtest: marks slow tests (deselect with '-m \"not slowtest\"')" -] - [tool.ruff] select = [ "A", # flake8-builtins @@ -40,3 +34,10 @@ ignore = [ "A001", ] "compliance_checker/cfutil.py" = ["B028"] +"compliance_checker/cf/appendix_f.py" = ["B033"] # ignore duplicates items in the set + +[tool.pytest.ini_options] +markers = [ + "integration: marks integration tests (deselect with '-m \"not integration\"')", + "slowtest: marks slow tests (deselect with '-m \"not slowtest\"')" +]