Skip to content

Commit

Permalink
Move third_party/yapf to flutter/third_party/yapf. (#48847)
Browse files Browse the repository at this point in the history
As part of eliminating the Flutter buildroot
(flutter/flutter#67373), we are moving all
third-party dependencies from `//third_party` to
`//flutter/third_party`.
  • Loading branch information
matanlurey authored Dec 11, 2023
1 parent 61cec41 commit f0ab52b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ deps = {
'src/third_party/boringssl':
Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),

'src/third_party/yapf':
'src/flutter/third_party/yapf':
Var('github_git') + '/google/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',

'src/third_party/boringssl/src':
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,7 @@
../../../flutter/third_party/wuffs/release/c/README.md
../../../flutter/third_party/wuffs/script
../../../flutter/third_party/wuffs/sync.txt
../../../flutter/third_party/yapf
../../../flutter/tools
../../../flutter/tools/licenses/.dart_tool
../../../flutter/tools/licenses/.gitignore
Expand Down Expand Up @@ -3194,7 +3195,6 @@
../../../third_party/vulkan_memory_allocator/src
../../../third_party/vulkan_memory_allocator/tools
../../../third_party/web_dependencies/canvaskit
../../../third_party/yapf
../../../third_party/zlib/.git
../../../third_party/zlib/CMakeLists.txt
../../../third_party/zlib/DIR_METADATA
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 8063c36f273a2ca0d4db5f05f9d5991a
Signature: 9c9e9d44a47e4d85f1debd69bc795b40

2 changes: 1 addition & 1 deletion tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/txt/third_party/fonts',
r'flutter/third_party/wuffs/docs',
r'flutter/third_party/wuffs/script',
r'flutter/third_party/yapf', // only used for code formatting
r'flutter/tools',
r'flutter/web_sdk', // this code is not linked into Flutter apps; it's only used by engine tests and tools
r'fuchsia/sdk/linux/docs',
Expand Down Expand Up @@ -212,7 +213,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/vulkan_memory_allocator/src',
r'third_party/vulkan_memory_allocator/tools',
r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
r'third_party/yapf', // only used for code formatting
r'third_party/zlib/contrib/minizip/miniunz.c', // sample file
r'third_party/zlib/contrib/minizip/minizip.c', // sample file
r'tools', // not distributed in binary
Expand Down
2 changes: 1 addition & 1 deletion tools/yapf.bat
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ REM work across all platforms!
REM
REM --------------------------------------------------------------------------

SET yapf_path=%~dp0\..\..\third_party\yapf
SET yapf_path=%~dp0\..\..\flutter\third_party\yapf

cmd /V /C "SET PYTHONPATH=%yapf_path%&& vpython3 %yapf_path%\yapf %*"
2 changes: 1 addition & 1 deletion tools/yapf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ function follow_links() (

SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
YAPF_DIR="$(cd "$SRC_DIR/third_party/yapf"; pwd -P)"
YAPF_DIR="$(cd "$SRC_DIR/flutter/third_party/yapf"; pwd -P)"

PYTHONPATH="$YAPF_DIR" python3 "$YAPF_DIR/yapf" "$@"

0 comments on commit f0ab52b

Please sign in to comment.