Skip to content

generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f0rmiga merged 1 commit into from
Jan 23, 2023
Merged

generate py_test without __test__ #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions gazelle/generate.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
// this package or not.
hasPyBinary := false

// hasPyTestFile and hasPyTestTarget control whether a py_test target should
// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
hasConftestFile := false

for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
ext := filepath.Ext(f)
if !hasPyBinary && f == pyBinaryEntrypointFilename {
hasPyBinary = true
} else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
} else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
} else if f == conftestFilename {
hasConftestFile = true
} else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

// If a __test__.py file was not found on disk, search for targets that are
// named __test__.
if !hasPyTestFile && args.File != nil {
if !hasPyTestEntryPointFile && args.File != nil {
for _, rule := range args.File.Rules {
if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
break
}
}
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

collisionErrors := singlylinkedlist.New()

if !hasPyTestFile && !hasPyTestTarget {
it := pyTestFilenames.Iterator()
for it.Next() {
pyLibraryFilenames.Add(it.Value())
}
}

var pyLibrary *rule.Rule
if !pyLibraryFilenames.Empty() {
deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
}

if hasPyTestFile || hasPyTestTarget {
if hasPyTestFile {
// Only add the pyTestEntrypointFilename to the pyTestFilenames if
// the file exists on disk.
pyTestFilenames.Add(pyTestEntrypointFilename)
}
var pyTestTargets []*targetBuilder
newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
deps, err := parser.parse(pyTestFilenames)
if err != nil {
log.Fatalf("ERROR: %v\n", err)
}

pyTestTargetName := cfg.RenderTestName(packageName)

// Check if a target with the same name we are generating already
// exists, and if it is of a different kind from the one we are
// generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
}
}
}

pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
addSrcs(pyTestFilenames).
addModuleDependencies(deps).
generateImportsAttribute()
}
if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
if hasPyTestEntryPointFile {
// Only add the pyTestEntrypointFilename to the pyTestFilenames if
// the file exists on disk.
pyTestFilenames.Add(pyTestEntrypointFilename)
}
pyTestTargetName := cfg.RenderTestName(packageName)
pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

if hasPyTestTarget {
if hasPyTestEntryPointTarget {
entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
} else {
pyTestTarget.setMain(pyTestEntrypointFilename)
}
pyTestTargets = append(pyTestTargets, pyTestTarget)
} else {
// Create one py_test target per file
pyTestFilenames.Each(func(index int, testFile interface{}) {
srcs := treeset.NewWith(godsutils.StringComparator, testFile)
pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
})
}

for _, pyTestTarget := range pyTestTargets {
if pyLibrary != nil {
pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
}
Expand Down
24 changes: 17 additions & 7 deletions gazelle/testdata/python_target_with_test_in_name/BUILD.out
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
name = "python_target_with_test_in_name",
srcs = [
"__init__.py",
"not_a_real_test.py",
"test_not_a_real.py",
],
srcs = ["__init__.py"],
visibility = ["//:__subpackages__"],
deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
name = "real_test",
srcs = ["real_test.py"],
deps = [
":python_target_with_test_in_name",
"@gazelle_python_test_boto3//:pkg",
],
)

py_test(
name = "test_reality",
srcs = ["test_reality.py"],
deps = [":python_target_with_test_in_name"],
)
0 ...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py
View file
Open in desktop
File renamed without changes.
0 ...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py
View file
Open in desktop
File renamed without changes.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
generate py_test without __test__ by linzhp · Pull Request #999 · bazel-contrib/rules_python · GitHub
Skip to content
generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

f0rmiga
merged 1 commit into

from

Jan 23, 2023
 Merged


generate py_test without __test__
#999
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 30 additions & 26 deletions
gazelle/generate.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
	// this package or not.
	hasPyBinary := false

	// hasPyTestFile and hasPyTestTarget control whether a py_test target should
	// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
	// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
	hasConftestFile := false

	for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 ext := filepath.Ext(f)
 if !hasPyBinary && f == pyBinaryEntrypointFilename {
 hasPyBinary = true
 } else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
 } else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
 } else if f == conftestFilename {
 hasConftestFile = true
 } else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	// If a __test__.py file was not found on disk, search for targets that are
	// named __test__.
	if !hasPyTestFile && args.File != nil {
	if !hasPyTestEntryPointFile && args.File != nil {
 for _, rule := range args.File.Rules {
 if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
 break
 }
 }
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	collisionErrors := singlylinkedlist.New()

	if !hasPyTestFile && !hasPyTestTarget {
 it := pyTestFilenames.Iterator()
 for it.Next() {
 pyLibraryFilenames.Add(it.Value())
 }
	}

	var pyLibrary *rule.Rule
	if !pyLibraryFilenames.Empty() {
 deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
	}

	if hasPyTestFile || hasPyTestTarget {
 if hasPyTestFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
	var pyTestTargets []*targetBuilder
	newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
 deps, err := parser.parse(pyTestFilenames)
 if err != nil {
 log.Fatalf("ERROR: %v\n", err)
 }

 pyTestTargetName := cfg.RenderTestName(packageName)

 // Check if a target with the same name we are generating already
 // exists, and if it is of a different kind from the one we are
 // generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 }
 }
 }

 pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 addSrcs(pyTestFilenames).
 addModuleDependencies(deps).
 generateImportsAttribute()
	}
	if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
 if hasPyTestEntryPointFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
 pyTestTargetName := cfg.RenderTestName(packageName)
 pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

 if hasPyTestTarget {
 if hasPyTestEntryPointTarget {
 entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
 main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
 pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 } else {
 pyTestTarget.setMain(pyTestEntrypointFilename)
 }
 pyTestTargets = append(pyTestTargets, pyTestTarget)
	} else {
 // Create one py_test target per file
 pyTestFilenames.Each(func(index int, testFile interface{}) {
 srcs := treeset.NewWith(godsutils.StringComparator, testFile)
 pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
 pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
 })
	}

	for _, pyTestTarget := range pyTestTargets {
 if pyLibrary != nil {
 pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
 }
Expand Down

24 changes: 17 additions & 7 deletions
gazelle/testdata/python_target_with_test_in_name/BUILD.out

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
 name = "python_target_with_test_in_name",
 srcs = [
 "__init__.py",
 "not_a_real_test.py",
 "test_not_a_real.py",
 ],
 srcs = ["__init__.py"],
 visibility = ["//:__subpackages__"],
 deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
 name = "real_test",
 srcs = ["real_test.py"],
 deps = [
 ":python_target_with_test_in_name",
 "@gazelle_python_test_boto3//:pkg",
 ],
)

py_test(
 name = "test_reality",
 srcs = ["test_reality.py"],
 deps = [":python_target_with_test_in_name"],
)

0
...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py

View file


Open in desktop


File renamed without changes.


0
...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
generate py_test without __test__ by linzhp · Pull Request #999 · bazel-contrib/rules_python · GitHub
Skip to content
generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

f0rmiga
merged 1 commit into

from

Jan 23, 2023
 Merged


generate py_test without __test__
#999
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 30 additions & 26 deletions
gazelle/generate.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
	// this package or not.
	hasPyBinary := false

	// hasPyTestFile and hasPyTestTarget control whether a py_test target should
	// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
	// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
	hasConftestFile := false

	for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 ext := filepath.Ext(f)
 if !hasPyBinary && f == pyBinaryEntrypointFilename {
 hasPyBinary = true
 } else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
 } else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
 } else if f == conftestFilename {
 hasConftestFile = true
 } else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	// If a __test__.py file was not found on disk, search for targets that are
	// named __test__.
	if !hasPyTestFile && args.File != nil {
	if !hasPyTestEntryPointFile && args.File != nil {
 for _, rule := range args.File.Rules {
 if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
 break
 }
 }
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	collisionErrors := singlylinkedlist.New()

	if !hasPyTestFile && !hasPyTestTarget {
 it := pyTestFilenames.Iterator()
 for it.Next() {
 pyLibraryFilenames.Add(it.Value())
 }
	}

	var pyLibrary *rule.Rule
	if !pyLibraryFilenames.Empty() {
 deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
	}

	if hasPyTestFile || hasPyTestTarget {
 if hasPyTestFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
	var pyTestTargets []*targetBuilder
	newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
 deps, err := parser.parse(pyTestFilenames)
 if err != nil {
 log.Fatalf("ERROR: %v\n", err)
 }

 pyTestTargetName := cfg.RenderTestName(packageName)

 // Check if a target with the same name we are generating already
 // exists, and if it is of a different kind from the one we are
 // generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 }
 }
 }

 pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 addSrcs(pyTestFilenames).
 addModuleDependencies(deps).
 generateImportsAttribute()
	}
	if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
 if hasPyTestEntryPointFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
 pyTestTargetName := cfg.RenderTestName(packageName)
 pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

 if hasPyTestTarget {
 if hasPyTestEntryPointTarget {
 entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
 main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
 pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 } else {
 pyTestTarget.setMain(pyTestEntrypointFilename)
 }
 pyTestTargets = append(pyTestTargets, pyTestTarget)
	} else {
 // Create one py_test target per file
 pyTestFilenames.Each(func(index int, testFile interface{}) {
 srcs := treeset.NewWith(godsutils.StringComparator, testFile)
 pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
 pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
 })
	}

	for _, pyTestTarget := range pyTestTargets {
 if pyLibrary != nil {
 pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
 }
Expand Down

24 changes: 17 additions & 7 deletions
gazelle/testdata/python_target_with_test_in_name/BUILD.out

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
 name = "python_target_with_test_in_name",
 srcs = [
 "__init__.py",
 "not_a_real_test.py",
 "test_not_a_real.py",
 ],
 srcs = ["__init__.py"],
 visibility = ["//:__subpackages__"],
 deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
 name = "real_test",
 srcs = ["real_test.py"],
 deps = [
 ":python_target_with_test_in_name",
 "@gazelle_python_test_boto3//:pkg",
 ],
)

py_test(
 name = "test_reality",
 srcs = ["test_reality.py"],
 deps = [":python_target_with_test_in_name"],
)

0
...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py

View file


Open in desktop


File renamed without changes.


0
...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
generate py_test without __test__ by linzhp · Pull Request #999 · bazel-contrib/rules_python · GitHub
Skip to content
generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

f0rmiga
merged 1 commit into

from

Jan 23, 2023
 Merged


generate py_test without __test__
#999
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 30 additions & 26 deletions
gazelle/generate.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
	// this package or not.
	hasPyBinary := false

	// hasPyTestFile and hasPyTestTarget control whether a py_test target should
	// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
	// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
	hasConftestFile := false

	for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 ext := filepath.Ext(f)
 if !hasPyBinary && f == pyBinaryEntrypointFilename {
 hasPyBinary = true
 } else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
 } else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
 } else if f == conftestFilename {
 hasConftestFile = true
 } else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	// If a __test__.py file was not found on disk, search for targets that are
	// named __test__.
	if !hasPyTestFile && args.File != nil {
	if !hasPyTestEntryPointFile && args.File != nil {
 for _, rule := range args.File.Rules {
 if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
 break
 }
 }
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	collisionErrors := singlylinkedlist.New()

	if !hasPyTestFile && !hasPyTestTarget {
 it := pyTestFilenames.Iterator()
 for it.Next() {
 pyLibraryFilenames.Add(it.Value())
 }
	}

	var pyLibrary *rule.Rule
	if !pyLibraryFilenames.Empty() {
 deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
	}

	if hasPyTestFile || hasPyTestTarget {
 if hasPyTestFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
	var pyTestTargets []*targetBuilder
	newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
 deps, err := parser.parse(pyTestFilenames)
 if err != nil {
 log.Fatalf("ERROR: %v\n", err)
 }

 pyTestTargetName := cfg.RenderTestName(packageName)

 // Check if a target with the same name we are generating already
 // exists, and if it is of a different kind from the one we are
 // generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 }
 }
 }

 pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 addSrcs(pyTestFilenames).
 addModuleDependencies(deps).
 generateImportsAttribute()
	}
	if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
 if hasPyTestEntryPointFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
 pyTestTargetName := cfg.RenderTestName(packageName)
 pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

 if hasPyTestTarget {
 if hasPyTestEntryPointTarget {
 entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
 main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
 pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 } else {
 pyTestTarget.setMain(pyTestEntrypointFilename)
 }
 pyTestTargets = append(pyTestTargets, pyTestTarget)
	} else {
 // Create one py_test target per file
 pyTestFilenames.Each(func(index int, testFile interface{}) {
 srcs := treeset.NewWith(godsutils.StringComparator, testFile)
 pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
 pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
 })
	}

	for _, pyTestTarget := range pyTestTargets {
 if pyLibrary != nil {
 pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
 }
Expand Down

24 changes: 17 additions & 7 deletions
gazelle/testdata/python_target_with_test_in_name/BUILD.out

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
 name = "python_target_with_test_in_name",
 srcs = [
 "__init__.py",
 "not_a_real_test.py",
 "test_not_a_real.py",
 ],
 srcs = ["__init__.py"],
 visibility = ["//:__subpackages__"],
 deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
 name = "real_test",
 srcs = ["real_test.py"],
 deps = [
 ":python_target_with_test_in_name",
 "@gazelle_python_test_boto3//:pkg",
 ],
)

py_test(
 name = "test_reality",
 srcs = ["test_reality.py"],
 deps = [":python_target_with_test_in_name"],
)

0
...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py

View file


Open in desktop


File renamed without changes.


0
...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
generate py_test without __test__ by linzhp · Pull Request #999 · bazel-contrib/rules_python · GitHub
Skip to content
generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

f0rmiga
merged 1 commit into

from

Jan 23, 2023
 Merged


generate py_test without __test__
#999
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 30 additions & 26 deletions
gazelle/generate.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
	// this package or not.
	hasPyBinary := false

	// hasPyTestFile and hasPyTestTarget control whether a py_test target should
	// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
	// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
	hasConftestFile := false

	for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 ext := filepath.Ext(f)
 if !hasPyBinary && f == pyBinaryEntrypointFilename {
 hasPyBinary = true
 } else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
 } else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
 } else if f == conftestFilename {
 hasConftestFile = true
 } else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	// If a __test__.py file was not found on disk, search for targets that are
	// named __test__.
	if !hasPyTestFile && args.File != nil {
	if !hasPyTestEntryPointFile && args.File != nil {
 for _, rule := range args.File.Rules {
 if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
 break
 }
 }
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	collisionErrors := singlylinkedlist.New()

	if !hasPyTestFile && !hasPyTestTarget {
 it := pyTestFilenames.Iterator()
 for it.Next() {
 pyLibraryFilenames.Add(it.Value())
 }
	}

	var pyLibrary *rule.Rule
	if !pyLibraryFilenames.Empty() {
 deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
	}

	if hasPyTestFile || hasPyTestTarget {
 if hasPyTestFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
	var pyTestTargets []*targetBuilder
	newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
 deps, err := parser.parse(pyTestFilenames)
 if err != nil {
 log.Fatalf("ERROR: %v\n", err)
 }

 pyTestTargetName := cfg.RenderTestName(packageName)

 // Check if a target with the same name we are generating already
 // exists, and if it is of a different kind from the one we are
 // generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 }
 }
 }

 pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 addSrcs(pyTestFilenames).
 addModuleDependencies(deps).
 generateImportsAttribute()
	}
	if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
 if hasPyTestEntryPointFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
 pyTestTargetName := cfg.RenderTestName(packageName)
 pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

 if hasPyTestTarget {
 if hasPyTestEntryPointTarget {
 entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
 main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
 pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 } else {
 pyTestTarget.setMain(pyTestEntrypointFilename)
 }
 pyTestTargets = append(pyTestTargets, pyTestTarget)
	} else {
 // Create one py_test target per file
 pyTestFilenames.Each(func(index int, testFile interface{}) {
 srcs := treeset.NewWith(godsutils.StringComparator, testFile)
 pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
 pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
 })
	}

	for _, pyTestTarget := range pyTestTargets {
 if pyLibrary != nil {
 pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
 }
Expand Down

24 changes: 17 additions & 7 deletions
gazelle/testdata/python_target_with_test_in_name/BUILD.out

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
 name = "python_target_with_test_in_name",
 srcs = [
 "__init__.py",
 "not_a_real_test.py",
 "test_not_a_real.py",
 ],
 srcs = ["__init__.py"],
 visibility = ["//:__subpackages__"],
 deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
 name = "real_test",
 srcs = ["real_test.py"],
 deps = [
 ":python_target_with_test_in_name",
 "@gazelle_python_test_boto3//:pkg",
 ],
)

py_test(
 name = "test_reality",
 srcs = ["test_reality.py"],
 deps = [":python_target_with_test_in_name"],
)

0
...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py

View file


Open in desktop


File renamed without changes.


0
...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
generate py_test without __test__ by linzhp · Pull Request #999 · bazel-contrib/rules_python · GitHub
Skip to content
generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

f0rmiga
merged 1 commit into

from

Jan 23, 2023
 Merged


generate py_test without __test__
#999
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 30 additions & 26 deletions
gazelle/generate.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
	// this package or not.
	hasPyBinary := false

	// hasPyTestFile and hasPyTestTarget control whether a py_test target should
	// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
	// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
	hasConftestFile := false

	for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 ext := filepath.Ext(f)
 if !hasPyBinary && f == pyBinaryEntrypointFilename {
 hasPyBinary = true
 } else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
 } else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
 } else if f == conftestFilename {
 hasConftestFile = true
 } else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	// If a __test__.py file was not found on disk, search for targets that are
	// named __test__.
	if !hasPyTestFile && args.File != nil {
	if !hasPyTestEntryPointFile && args.File != nil {
 for _, rule := range args.File.Rules {
 if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
 break
 }
 }
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	collisionErrors := singlylinkedlist.New()

	if !hasPyTestFile && !hasPyTestTarget {
 it := pyTestFilenames.Iterator()
 for it.Next() {
 pyLibraryFilenames.Add(it.Value())
 }
	}

	var pyLibrary *rule.Rule
	if !pyLibraryFilenames.Empty() {
 deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
	}

	if hasPyTestFile || hasPyTestTarget {
 if hasPyTestFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
	var pyTestTargets []*targetBuilder
	newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
 deps, err := parser.parse(pyTestFilenames)
 if err != nil {
 log.Fatalf("ERROR: %v\n", err)
 }

 pyTestTargetName := cfg.RenderTestName(packageName)

 // Check if a target with the same name we are generating already
 // exists, and if it is of a different kind from the one we are
 // generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 }
 }
 }

 pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 addSrcs(pyTestFilenames).
 addModuleDependencies(deps).
 generateImportsAttribute()
	}
	if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
 if hasPyTestEntryPointFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
 pyTestTargetName := cfg.RenderTestName(packageName)
 pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

 if hasPyTestTarget {
 if hasPyTestEntryPointTarget {
 entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
 main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
 pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 } else {
 pyTestTarget.setMain(pyTestEntrypointFilename)
 }
 pyTestTargets = append(pyTestTargets, pyTestTarget)
	} else {
 // Create one py_test target per file
 pyTestFilenames.Each(func(index int, testFile interface{}) {
 srcs := treeset.NewWith(godsutils.StringComparator, testFile)
 pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
 pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
 })
	}

	for _, pyTestTarget := range pyTestTargets {
 if pyLibrary != nil {
 pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
 }
Expand Down

24 changes: 17 additions & 7 deletions
gazelle/testdata/python_target_with_test_in_name/BUILD.out

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
 name = "python_target_with_test_in_name",
 srcs = [
 "__init__.py",
 "not_a_real_test.py",
 "test_not_a_real.py",
 ],
 srcs = ["__init__.py"],
 visibility = ["//:__subpackages__"],
 deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
 name = "real_test",
 srcs = ["real_test.py"],
 deps = [
 ":python_target_with_test_in_name",
 "@gazelle_python_test_boto3//:pkg",
 ],
)

py_test(
 name = "test_reality",
 srcs = ["test_reality.py"],
 deps = [":python_target_with_test_in_name"],
)

0
...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py

View file


Open in desktop


File renamed without changes.


0
...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
generate py_test without __test__ by linzhp · Pull Request #999 · bazel-contrib/rules_python · GitHub
Skip to content
generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

f0rmiga
merged 1 commit into

from

Jan 23, 2023
 Merged


generate py_test without __test__
#999
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 30 additions & 26 deletions
gazelle/generate.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
	// this package or not.
	hasPyBinary := false

	// hasPyTestFile and hasPyTestTarget control whether a py_test target should
	// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
	// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
	hasConftestFile := false

	for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 ext := filepath.Ext(f)
 if !hasPyBinary && f == pyBinaryEntrypointFilename {
 hasPyBinary = true
 } else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
 } else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
 } else if f == conftestFilename {
 hasConftestFile = true
 } else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	// If a __test__.py file was not found on disk, search for targets that are
	// named __test__.
	if !hasPyTestFile && args.File != nil {
	if !hasPyTestEntryPointFile && args.File != nil {
 for _, rule := range args.File.Rules {
 if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
 break
 }
 }
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	collisionErrors := singlylinkedlist.New()

	if !hasPyTestFile && !hasPyTestTarget {
 it := pyTestFilenames.Iterator()
 for it.Next() {
 pyLibraryFilenames.Add(it.Value())
 }
	}

	var pyLibrary *rule.Rule
	if !pyLibraryFilenames.Empty() {
 deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
	}

	if hasPyTestFile || hasPyTestTarget {
 if hasPyTestFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
	var pyTestTargets []*targetBuilder
	newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
 deps, err := parser.parse(pyTestFilenames)
 if err != nil {
 log.Fatalf("ERROR: %v\n", err)
 }

 pyTestTargetName := cfg.RenderTestName(packageName)

 // Check if a target with the same name we are generating already
 // exists, and if it is of a different kind from the one we are
 // generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 }
 }
 }

 pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 addSrcs(pyTestFilenames).
 addModuleDependencies(deps).
 generateImportsAttribute()
	}
	if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
 if hasPyTestEntryPointFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
 pyTestTargetName := cfg.RenderTestName(packageName)
 pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

 if hasPyTestTarget {
 if hasPyTestEntryPointTarget {
 entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
 main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
 pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 } else {
 pyTestTarget.setMain(pyTestEntrypointFilename)
 }
 pyTestTargets = append(pyTestTargets, pyTestTarget)
	} else {
 // Create one py_test target per file
 pyTestFilenames.Each(func(index int, testFile interface{}) {
 srcs := treeset.NewWith(godsutils.StringComparator, testFile)
 pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
 pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
 })
	}

	for _, pyTestTarget := range pyTestTargets {
 if pyLibrary != nil {
 pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
 }
Expand Down

24 changes: 17 additions & 7 deletions
gazelle/testdata/python_target_with_test_in_name/BUILD.out

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
 name = "python_target_with_test_in_name",
 srcs = [
 "__init__.py",
 "not_a_real_test.py",
 "test_not_a_real.py",
 ],
 srcs = ["__init__.py"],
 visibility = ["//:__subpackages__"],
 deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
 name = "real_test",
 srcs = ["real_test.py"],
 deps = [
 ":python_target_with_test_in_name",
 "@gazelle_python_test_boto3//:pkg",
 ],
)

py_test(
 name = "test_reality",
 srcs = ["test_reality.py"],
 deps = [":python_target_with_test_in_name"],
)

0
...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py

View file


Open in desktop


File renamed without changes.


0
...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
generate py_test without __test__ by linzhp · Pull Request #999 · bazel-contrib/rules_python · GitHub
Skip to content
generate py_test without __test__#999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

f0rmiga
merged 1 commit into

from

Jan 23, 2023
 Merged


generate py_test without __test__
#999
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 30 additions & 26 deletions
gazelle/generate.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,10 +69,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
	// this package or not.
	hasPyBinary := false

	// hasPyTestFile and hasPyTestTarget control whether a py_test target should
	// hasPyTestEntryPointFile and hasPyTestEntryPointTarget control whether a py_test target should
	// be generated for this package or not.
hasPyTestFile := false
hasPyTestTarget := false
hasPyTestEntryPointFile := false
hasPyTestEntryPointTarget := false
	hasConftestFile := false

	for _, f := range args.RegularFiles {
Expand All@@ -82,8 +82,8 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 ext := filepath.Ext(f)
 if !hasPyBinary && f == pyBinaryEntrypointFilename {
 hasPyBinary = true
 } else if !hasPyTestFile && f == pyTestEntrypointFilename {
hasPyTestFile = true
 } else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
hasPyTestEntryPointFile = true
 } else if f == conftestFilename {
 hasConftestFile = true
 } else if strings.HasSuffix(f, "_test.py") || (strings.HasPrefix(f, "test_") && ext == ".py") {
Expand All@@ -95,10 +95,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	// If a __test__.py file was not found on disk, search for targets that are
	// named __test__.
	if !hasPyTestFile && args.File != nil {
	if !hasPyTestEntryPointFile && args.File != nil {
 for _, rule := range args.File.Rules {
 if rule.Name() == pyTestEntrypointTargetname {
hasPyTestTarget = true
hasPyTestEntryPointTarget = true
 break
 }
 }
Expand DownExpand Up@@ -185,13 +185,6 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes

	collisionErrors := singlylinkedlist.New()

	if !hasPyTestFile && !hasPyTestTarget {
 it := pyTestFilenames.Iterator()
 for it.Next() {
 pyLibraryFilenames.Add(it.Value())
 }
	}

	var pyLibrary *rule.Rule
	if !pyLibraryFilenames.Empty() {
 deps, err := parser.parse(pyLibraryFilenames)
Expand DownExpand Up@@ -309,19 +302,12 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 result.Imports = append(result.Imports, conftest.PrivateAttr(config.GazelleImportsKey))
	}

	if hasPyTestFile || hasPyTestTarget {
 if hasPyTestFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
	var pyTestTargets []*targetBuilder
	newPyTestTargetBuilder := func(pyTestFilenames *treeset.Set, pyTestTargetName string) *targetBuilder {
 deps, err := parser.parse(pyTestFilenames)
 if err != nil {
 log.Fatalf("ERROR: %v\n", err)
 }

 pyTestTargetName := cfg.RenderTestName(packageName)

 // Check if a target with the same name we are generating already
 // exists, and if it is of a different kind from the one we are
 // generating. If so, we have to throw an error since Gazelle won't
Expand All@@ -338,13 +324,21 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 }
 }
 }

 pyTestTarget := newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 return newTargetBuilder(pyTestKind, pyTestTargetName, pythonProjectRoot, args.Rel).
 addSrcs(pyTestFilenames).
 addModuleDependencies(deps).
 generateImportsAttribute()
	}
	if hasPyTestEntryPointFile || hasPyTestEntryPointTarget {
 if hasPyTestEntryPointFile {
 // Only add the pyTestEntrypointFilename to the pyTestFilenames if
 // the file exists on disk.
 pyTestFilenames.Add(pyTestEntrypointFilename)
 }
 pyTestTargetName := cfg.RenderTestName(packageName)
 pyTestTarget := newPyTestTargetBuilder(pyTestFilenames, pyTestTargetName)

 if hasPyTestTarget {
 if hasPyTestEntryPointTarget {
 entrypointTarget := fmt.Sprintf(":%s", pyTestEntrypointTargetname)
 main := fmt.Sprintf(":%s", pyTestEntrypointFilename)
 pyTestTarget.
Expand All@@ -354,7 +348,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 } else {
 pyTestTarget.setMain(pyTestEntrypointFilename)
 }
 pyTestTargets = append(pyTestTargets, pyTestTarget)
	} else {
 // Create one py_test target per file
 pyTestFilenames.Each(func(index int, testFile interface{}) {
 srcs := treeset.NewWith(godsutils.StringComparator, testFile)
 pyTestTargetName := strings.TrimSuffix(filepath.Base(testFile.(string)), ".py")
 pyTestTargets = append(pyTestTargets, newPyTestTargetBuilder(srcs, pyTestTargetName))
 })
	}

	for _, pyTestTarget := range pyTestTargets {
 if pyLibrary != nil {
 pyTestTarget.addModuleDependency(module{Name: pyLibrary.PrivateAttr(uuidKey).(string)})
 }
Expand Down

24 changes: 17 additions & 7 deletions
gazelle/testdata/python_target_with_test_in_name/BUILD.out

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

py_library(
 name = "python_target_with_test_in_name",
 srcs = [
 "__init__.py",
 "not_a_real_test.py",
 "test_not_a_real.py",
 ],
 srcs = ["__init__.py"],
 visibility = ["//:__subpackages__"],
 deps = ["@gazelle_python_test_boto3//:pkg"],
)

py_test(
 name = "real_test",
 srcs = ["real_test.py"],
 deps = [
 ":python_target_with_test_in_name",
 "@gazelle_python_test_boto3//:pkg",
 ],
)

py_test(
 name = "test_reality",
 srcs = ["test_reality.py"],
 deps = [":python_target_with_test_in_name"],
)

0
...rget_with_test_in_name/not_a_real_test.py → ...hon_target_with_test_in_name/real_test.py

View file


Open in desktop


File renamed without changes.


0
...rget_with_test_in_name/test_not_a_real.py → ..._target_with_test_in_name/test_reality.py

View file


Open in desktop


File renamed without changes.