Skip to content

Commit 0ee2a7e

Browse files
aignasaignas
authored
refactor(gazelle): Move plugin to a separate directory. (bazel-contrib#983)
1 parent 64d287b commit 0ee2a7e

File tree

408 files changed

+95
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

408 files changed

+95
-85
lines changed

‎gazelle/BUILD.bazel

Lines changed: 5 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,12 @@
1-
load("@bazel_gazelle//:def.bzl", "gazelle_binary")
2-
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
3-
load("@rules_python//python:defs.bzl", "py_binary")
4-
5-
go_library(
1+
alias(
62
name = "gazelle",
7-
srcs = [
8-
"configure.go",
9-
"fix.go",
10-
"generate.go",
11-
"kinds.go",
12-
"language.go",
13-
"parser.go",
14-
"resolve.go",
15-
"std_modules.go",
16-
"target.go",
17-
],
18-
data = [
19-
":parse",
20-
":std_modules",
21-
],
22-
importpath = "github.com/bazelbuild/rules_python/gazelle",
23-
visibility = ["//visibility:public"],
24-
deps = [
25-
"//gazelle/manifest",
26-
"//gazelle/pythonconfig",
27-
"@bazel_gazelle//config:go_default_library",
28-
"@bazel_gazelle//label:go_default_library",
29-
"@bazel_gazelle//language:go_default_library",
30-
"@bazel_gazelle//repo:go_default_library",
31-
"@bazel_gazelle//resolve:go_default_library",
32-
"@bazel_gazelle//rule:go_default_library",
33-
"@com_github_bazelbuild_buildtools//build:go_default_library",
34-
"@com_github_bmatcuk_doublestar//:doublestar",
35-
"@com_github_emirpasic_gods//lists/singlylinkedlist",
36-
"@com_github_emirpasic_gods//sets/treeset",
37-
"@com_github_emirpasic_gods//utils",
38-
"@com_github_google_uuid//:uuid",
39-
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
40-
],
41-
)
42-
43-
py_binary(
44-
name = "parse",
45-
srcs = ["parse.py"],
3+
actual = "//gazelle/python",
464
visibility = ["//visibility:public"],
475
)
486

49-
py_binary(
50-
name = "std_modules",
51-
srcs = ["std_modules.py"],
52-
visibility = ["//visibility:public"],
53-
)
54-
55-
go_test(
56-
name = "gazelle_test",
57-
srcs = ["python_test.go"],
58-
data = [
59-
":gazelle_python_binary",
60-
":parse",
61-
":std_modules",
62-
] + glob(["testdata/**"]),
63-
deps = [
64-
"@bazel_gazelle//testtools:go_default_library",
65-
"@com_github_emirpasic_gods//lists/singlylinkedlist",
66-
"@com_github_ghodss_yaml//:yaml",
67-
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
68-
],
69-
)
70-
71-
gazelle_binary(
7+
alias(
728
name = "gazelle_python_binary",
73-
languages = ["//gazelle"],
9+
actual = "//gazelle/python:gazelle_binary",
7410
visibility = ["//visibility:public"],
7511
)
7612

@@ -79,6 +15,7 @@ filegroup(
7915
srcs = glob(["**"]) + [
8016
"//gazelle/manifest:distribution",
8117
"//gazelle/modules_mapping:distribution",
18+
"//gazelle/python:distribution",
8219
"//gazelle/pythonconfig:distribution",
8320
],
8421
visibility = ["//:__pkg__"],

‎gazelle/def.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"""
33

44
GAZELLE_PYTHON_RUNTIME_DEPS = [
5-
"@rules_python//gazelle:parse",
6-
"@rules_python//gazelle:std_modules",
5+
"@rules_python//gazelle/python:parse",
6+
"@rules_python//gazelle/python:std_modules",
77
]

‎gazelle/python/BUILD.bazel

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
load("@bazel_gazelle//:def.bzl", "gazelle_binary")
2+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
3+
load("@rules_python//python:defs.bzl", "py_binary")
4+
5+
go_library(
6+
name = "python",
7+
srcs = [
8+
"configure.go",
9+
"fix.go",
10+
"generate.go",
11+
"kinds.go",
12+
"language.go",
13+
"parser.go",
14+
"resolve.go",
15+
"std_modules.go",
16+
"target.go",
17+
],
18+
data = [
19+
":parse",
20+
":std_modules",
21+
],
22+
importpath = "github.com/bazelbuild/rules_python/gazelle/python",
23+
visibility = ["//visibility:public"],
24+
deps = [
25+
"//gazelle/manifest",
26+
"//gazelle/pythonconfig",
27+
"@bazel_gazelle//config:go_default_library",
28+
"@bazel_gazelle//label:go_default_library",
29+
"@bazel_gazelle//language:go_default_library",
30+
"@bazel_gazelle//repo:go_default_library",
31+
"@bazel_gazelle//resolve:go_default_library",
32+
"@bazel_gazelle//rule:go_default_library",
33+
"@com_github_bazelbuild_buildtools//build:go_default_library",
34+
"@com_github_bmatcuk_doublestar//:doublestar",
35+
"@com_github_emirpasic_gods//lists/singlylinkedlist",
36+
"@com_github_emirpasic_gods//sets/treeset",
37+
"@com_github_emirpasic_gods//utils",
38+
"@com_github_google_uuid//:uuid",
39+
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
40+
],
41+
)
42+
43+
py_binary(
44+
name = "parse",
45+
srcs = ["parse.py"],
46+
visibility = ["//visibility:public"],
47+
)
48+
49+
py_binary(
50+
name = "std_modules",
51+
srcs = ["std_modules.py"],
52+
visibility = ["//visibility:public"],
53+
)
54+
55+
go_test(
56+
name = "python_test",
57+
srcs = ["python_test.go"],
58+
data = [
59+
":gazelle_binary",
60+
":parse",
61+
":std_modules",
62+
] + glob(["testdata/**"]),
63+
deps = [
64+
"@bazel_gazelle//testtools:go_default_library",
65+
"@com_github_emirpasic_gods//lists/singlylinkedlist",
66+
"@com_github_ghodss_yaml//:yaml",
67+
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
68+
],
69+
)
70+
71+
gazelle_binary(
72+
name = "gazelle_binary",
73+
languages = [":python"],
74+
visibility = ["//visibility:public"],
75+
)
76+
77+
filegroup(
78+
name = "distribution",
79+
srcs = glob(["**"]),
80+
visibility = ["//gazelle:__pkg__"],
81+
)

‎gazelle/configure.go renamed to ‎gazelle/python/configure.go

File renamed without changes.

‎gazelle/fix.go renamed to ‎gazelle/python/fix.go

File renamed without changes.

‎gazelle/generate.go renamed to ‎gazelle/python/generate.go

File renamed without changes.

‎gazelle/kinds.go renamed to ‎gazelle/python/kinds.go

File renamed without changes.

‎gazelle/language.go renamed to ‎gazelle/python/language.go

File renamed without changes.

‎gazelle/parse.py renamed to ‎gazelle/python/parse.py

File renamed without changes.

‎gazelle/parser.go renamed to ‎gazelle/python/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var (
2525
)
2626

2727
func init() {
28-
parseScriptRunfile, err := bazel.Runfile("gazelle/parse")
28+
parseScriptRunfile, err := bazel.Runfile("gazelle/python/parse")
2929
if err != nil {
3030
log.Printf("failed to initialize parser: %v\n", err)
3131
os.Exit(1)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy