Use Python3.7+ syntax in pyupgrade (#20501)

* Use Python3.7+ syntax in pyupgrade * Update test_dataflow.py * Update test_dataflow.py * Update test_dataflow.py
apache · Dec 28, 2021 · b7086f9 · b7086f9
1 parent 3b709cc
commit b7086f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -196,10 +196,10 @@ repos:
  files: ^chart/values\.schema\.json$|^chart/values_schema\.schema\.json$
  pass_filenames: true
  - repo: https://github.com/asottile/pyupgrade
- rev: v2.29.0
+ rev: v2.29.1
  hooks:
  - id: pyupgrade
- args: ["--py36-plus"]
+ args: ["--py37-plus"]
  exclude: ^airflow/_vendor/
  - repo: https://github.com/pre-commit/pygrep-hooks
  rev: v1.9.0

diff --git a/airflow/providers/google/cloud/hooks/dataflow.py b/airflow/providers/google/cloud/hooks/dataflow.py
@@ -1035,7 +1035,7 @@ def start_sql_job(
  ]
  self.log.info("Executing command: %s", " ".join(shlex.quote(c) for c in cmd))
  with self.provide_authorized_gcloud():
- proc = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ proc = subprocess.run(cmd, capture_output=True)
  self.log.info("Output: %s", proc.stdout.decode())
  self.log.warning("Stderr: %s", proc.stderr.decode())
  self.log.info("Exit code %d", proc.returncode)

diff --git a/tests/providers/google/cloud/hooks/test_dataflow.py b/tests/providers/google/cloud/hooks/test_dataflow.py
@@ -19,7 +19,6 @@
 
 import copy
 import shlex
-import subprocess
 import unittest
 from typing import Any, Dict
 from unittest import mock
@@ -1108,8 +1107,7 @@ def test_start_sql_job_failed_to_run(
  '--bigquery-table=beam_output',
  '--bigquery-write-disposition=write-truncate',
  ],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
+ capture_output=True,
  )
  mock_controller.assert_called_once_with(
  dataflow=mock_get_conn.return_value,