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

mik-laj · web-flow · commit b7086f9815d3 · 2021-12-28T07:47:28.000+01:00
* Use Python3.7+ syntax in pyupgrade

* Update test_dataflow.py

* Update test_dataflow.py

* Update test_dataflow.py
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,

Original file line number	Diff line number	Diff line change
`@@ -1035,7 +1035,7 @@ def start_sql_job(`
`1035`	`1035`	`]`
`1036`	`1036`	`self.log.info("Executing command: %s", " ".join(shlex.quote(c) for c in cmd))`
`1037`	`1037`	`with self.provide_authorized_gcloud():`
`1038`		`- proc = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)`
	`1038`	`+ proc = subprocess.run(cmd, capture_output=True)`
`1039`	`1039`	`self.log.info("Output: %s", proc.stdout.decode())`
`1040`	`1040`	`self.log.warning("Stderr: %s", proc.stderr.decode())`
`1041`	`1041`	`self.log.info("Exit code %d", proc.returncode)`