Skip to content
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.

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

Update to latest pre-commit #40529

Merged
merged 1 commit into from
Jul 2, 2024
Merged
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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ repos:
pass_filenames: false
require_serial: true
- repo: https://github.com/asottile/blacken-docs
rev: 1.16.0
rev: 1.18.0
hooks:
- id: blacken-docs
name: Run black on Python code blocks in documentation files
Expand All @@ -224,7 +224,7 @@ repos:
alias: blacken-docs
additional_dependencies: [black==23.10.0]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-merge-conflict
name: Check that merge conflicts are not being committed
Expand Down Expand Up @@ -297,7 +297,7 @@ repos:
- --line-length
- '99999'
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell
name: Run codespell to check for common misspellings in files
Expand Down
2 changes: 1 addition & 1 deletion contributing-docs/testing/k8s_tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ Should show the status of current KinD cluster.
Note, that this command by default uses ``--use-uv`` flag to use ``uv`` to build the image instead of
``pip``. This is much faster (50% faster) to rebuild the image and iterate with your code but if you
built your PROD image without ``--use-uv`` flag the first build might be a bit longer. You can also switch
to using a ``pip`` based image by specifyin ``--no-use-uv`` flag together with ``--rebuid-base-image``.
to using a ``pip`` based image by specifying ``--no-use-uv`` flag together with ``--rebuid-base-image``.

.. code-block:: bash

Expand Down
3 changes: 3 additions & 0 deletions docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,8 @@ noqa
nosasl
NotFound
notificationChannels
NotIn
notin
npm
ns
ntlm
Expand Down Expand Up @@ -1649,6 +1651,7 @@ Tez
tez
theService
Thinknear
THIRDPARTY
TicketAudit
timedelta
timedeltas
Expand Down
2 changes: 1 addition & 1 deletion tests/providers/cncf/kubernetes/utils/test_pod_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ def test_extract_xcom_success(self, mock_exec_xcom_kill, mock_exec_pod_command,
@mock.patch("airflow.providers.cncf.kubernetes.utils.pod_manager.PodManager.extract_xcom_kill")
def test_extract_xcom_failure(self, mock_exec_xcom_kill, mock_exec_pod_command, mock_kubernetes_stream):
"""test when invalid json is retrieved from xcom sidecar container."""
xcom_json = """{"a": "tru"""
xcom_json = """{"a": "tru""" # codespell:ignore tru
mock_pod = MagicMock()
mock_exec_pod_command.return_value = xcom_json
with pytest.raises(JSONDecodeError):
Expand Down
1 change: 0 additions & 1 deletion tests/providers/google/cloud/hooks/test_vision.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ def test_update_productset_explicit_name_different_from_constructed(self, get_co
metadata=(),
)
err = ctx.value
# self.assertIn("The required parameter 'project_id' is missing", str(err))
assert err
assert ERR_DIFF_NAMES.format(
explicit_name=explicit_ps_name,
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/test_cli_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def test_cli_create_user_supplied_password_is_masked(
"airflow.utils.session.create_session"
) as mock_create_session:
metrics = cli._build_metrics(args[1], namespace)
# Make it so the default_action_log doesn't actually commit the txn, by giving it a nexted txn
# Make it so the default_action_log doesn't actually commit the txn, by giving it a next txn
# instead
mock_create_session.return_value = session.begin_nested()
mock_create_session.return_value.bulk_insert_mappings = session.bulk_insert_mappings
Expand Down