Remove flynt dependency (#6205)

check/format-incremental

@@ -6,8 +6,7 @@
 # Usage:
 #     check/format-incremental [BASE_REVISION] [--apply] [--all]
 #
-# By default, the script runs flynt to convert old string literal formatting to f-strings
-# and analyzes python files that have changed relative to the
+# By default, the script analyzes python files that have changed relative to the
 # base revision and determines whether they need to be formatted. If any changes
 # are needed, it prints the diff and exits with code 1, otherwise it exits with
 # code 0.
@@ -95,14 +94,6 @@ if (( ${#format_files[@]} == 0 )); then
     exit 0
 fi
 
-flynt_args=("--quiet" "-f")
-if (( only_print == 1 )); then
-    flynt_args+=("--dry-run")
-fi
-
-flynt "${format_files[@]}" "${flynt_args[@]}"
-FLYNTSTATUS=$?
-
 BLACKVERSION="$(black --version)"
 
 echo "Running the black formatter... (version: $BLACKVERSION)"
@@ -115,7 +106,7 @@ fi
 black "${args[@]}" "${format_files[@]}"
 BLACKSTATUS=$?
 
-if [[ "$FLYNTSTATUS" != "0" || "$BLACKSTATUS" != "0"  ]]; then
+if [[ "$BLACKSTATUS" != "0"  ]]; then
   exit 1
 fi
 exit 0

dev_tools/packaging/isolated_packages_test.py

@@ -21,13 +21,7 @@
 from dev_tools import shell_tools
 from dev_tools.modules import list_modules
 
-PACKAGES = [
-    "-r",
-    "dev_tools/requirements/deps/pytest.txt",
-    "-r",
-    # one of the _compat_test.py tests uses flynt for testing metadata
-    "dev_tools/requirements/deps/flynt.txt",
-]
+PACKAGES = ["-r", "dev_tools/requirements/deps/pytest.txt"]
 
 
 @pytest.mark.slow

dev_tools/requirements/deps/format.txt

@@ -1,2 +1 @@
--r flynt.txt
 black==23.3.0

dev_tools/requirements/pytest-minimal.env.txt

@@ -9,10 +9,6 @@
 -r deps/cirq-all-no-contrib.txt
 -r deps/ipython.txt
 
-# one of the _compat_test.py tests uses flynt for testing metadata
-
--r deps/flynt.txt
-
 # pylint is needed for invoking custom checkers
 
 -r deps/pylint.txt