Ran black and isort to fix files missed by commit hook#790

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
groodt merged 1 commit into from
Aug 14, 2022
Merged

Ran black and isort to fix files missed by commit hook #790

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
1 change: 1 addition & 0 deletions examples/build_file_generation/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
r = requests.get(url)
print(r.text)
1 change: 0 additions & 1 deletion examples/build_file_generation/__main__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
main("https://example.com")
1 change: 1 addition & 0 deletions examples/pip_install/main.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
return dir(boto3)

Expand Down
2 changes: 1 addition & 1 deletion examples/pip_install/pip_install_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
env.split(" "),
[
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down
2 changes: 1 addition & 1 deletion examples/pip_parse/pip_parse_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
self.assertListEqual(
env.split(" "),
[
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down
8 changes: 3 additions & 5 deletions examples/pip_repository_annotations/pip_repository_annotations_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
current_wheel_version = "0.37.1"

r = runfiles.Create()
dist_info_dir = (
"pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
self.wheel_pkg_dir(),
current_wheel_version,
)
dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
self.wheel_pkg_dir(),
current_wheel_version,
)

# Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down
7 changes: 2 additions & 5 deletions gazelle/modules_mapping/generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
maybe_lib = path.split("/")[1].lower()
return is_metadata(path) and (
maybe_lib == "purelib" or maybe_lib == "platlib"
)

return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
if ext == ".so":
# Also remove extra metadata that is embeded as part of
# the file name as an extra extension.
ext = ''.join(pathlib.Path(root).suffixes)
ext = "".join(pathlib.Path(root).suffixes)
module = root[: -len(ext)].replace("/", ".")
mapping[module] = wheel_name

Expand Down
16 changes: 8 additions & 8 deletions gazelle/parse.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
"name": subnode.name,
"lineno": node.lineno,
"filepath": filepath,
"from": ""
"from": "",
}
modules.append(module)
elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
"name": f"{node.module}.{subnode.name}",
"lineno": node.lineno,
"filepath": filepath,
"from": node.module
"from": node.module,
}
modules.append(module)
return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
content = file.read()
# From simple benchmarks, 2 workers gave the best performance here.
with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
modules_future = executor.submit(parse_import_statements, content,
rel_filepath)
modules_future = executor.submit(
parse_import_statements, content, rel_filepath
)
comments_future = executor.submit(parse_comments, content)
modules = modules_future.result()
comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
filenames = parse_request["filenames"]
outputs = list()
if len(filenames) == 1:
outputs.append(parse(repo_root, rel_package_path,
filenames[0]))
outputs.append(parse(repo_root, rel_package_path, filenames[0]))
else:
futures = [
executor.submit(parse, repo_root, rel_package_path,
filename) for filename in filenames
executor.submit(parse, repo_root, rel_package_path, filename)
for filename in filenames
if filename != ""
]
for future in concurrent.futures.as_completed(futures):
Expand Down
3 changes: 1 addition & 2 deletions gazelle/testdata/with_third_party_requirements_from_imports/__main__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
print(aiplatform)
Expand Down
1 change: 1 addition & 0 deletions gazelle/testdata/with_third_party_requirements_from_imports/bar.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
a = dir(aiplatform)
b = dir(storage)
6 changes: 1 addition & 5 deletions python/pip_install/extract_wheels/bazel.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
annotation,
namespace_pkgs,
wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down
4 changes: 3 additions & 1 deletion python/pip_install/extract_wheels/extract_single_wheel.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
configure_reproducible_wheels,
)


def main() -> None:
Expand Down
25 changes: 15 additions & 10 deletions python/pip_install/extract_wheels/parse_requirements_to_bzl.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
if (
# PEP-440 direct references are considered pinned
# See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
not install_req.link and
not install_req.is_pinned
not install_req.link
and not install_req.is_pinned
):
unpinned_reqs.append(str(install_req))
install_req_and_lines.append(
(install_req, line)
)
install_req_and_lines.append((install_req, line))

else:
extra_pip_args.extend(shlex.split(line))

if len(unpinned_reqs) > 0:
unpinned_reqs_str = "\n".join(unpinned_reqs)
raise RuntimeError(f"""\
raise RuntimeError(
f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
)

return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
}
)

output.write(textwrap.dedent(
"""\
output.write(
textwrap.dedent(
"""\
\"\"\"Starlark representation of locked requirements.

@generated by rules_python pip_parse repository rule
from {}
\"\"\"
""".format(args.requirements_lock_label)))
""".format(
args.requirements_lock_label
)
)
)
output.write(
generate_parsed_requirements_contents(
requirements_lock=args.requirements_lock,
Expand Down
4 changes: 2 additions & 2 deletions python/pip_install/extract_wheels/wheel.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
@property
def name(self) -> str:
# TODO Also available as installer.sources.WheelSource.distribution
name = str(self.metadata['Name'])
name = str(self.metadata["Name"])
return canonicalize_name(name)

@property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
dependency_set = set()

for wheel_req in self.metadata.get_all('Requires-Dist', []):
for wheel_req in self.metadata.get_all("Requires-Dist", []):
req = pkg_resources.Requirement(wheel_req) # type: ignore

if req.marker is None or any(
Expand Down
10 changes: 8 additions & 2 deletions python/pip_install/pip_compile.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
parts = requirements_in.split(os.path.sep, 2)
if parts[0] == "external":
requirements_in = parts[2]
requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
requirements_txt = (
requirements_txt
if "BUILD_WORKSPACE_DIRECTORY" in os.environ
else os.path.join("..", "..", requirements_txt)
)
os.chdir(os.path.join(parts[0], parts[1]))
update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
#
# Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
# from different directories within the WORKSPACE.
requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
requirements_txt = os.path.join(
os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
)
else:
err_msg = (
"Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down
2 changes: 1 addition & 1 deletion tools/wheelmaker.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
size = 0
with open(real_filename, "rb") as f:
while True:
block = f.read(2 ** 20)
block = f.read(2**20)
if not block:
break
hash.update(block)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Ran black and isort to fix files missed by commit hook#790

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

groodt
merged 1 commit into

from

Aug 14, 2022
 Merged


Ran black and isort to fix files missed by commit hook
#790
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


1 change: 1 addition & 0 deletions
examples/build_file_generation/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
 r = requests.get(url)
 print(r.text)

1 change: 0 additions & 1 deletion
examples/build_file_generation/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
 main("https://example.com")

1 change: 1 addition & 0 deletions
examples/pip_install/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
 return dir(boto3)

Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_install/pip_install_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
 env.split(" "),
 [
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse/pip_parse_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
 self.assertListEqual(
 env.split(" "),
 [
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down

8 changes: 3 additions & 5 deletions
examples/pip_repository_annotations/pip_repository_annotations_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
 current_wheel_version = "0.37.1"

 r = runfiles.Create()
 dist_info_dir = (
 "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )
 dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )

 # Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down

7 changes: 2 additions & 5 deletions
gazelle/modules_mapping/generator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
 maybe_lib = path.split("/")[1].lower()
 return is_metadata(path) and (
 maybe_lib == "purelib" or maybe_lib == "platlib"
 )

 return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
 if ext == ".so":
 # Also remove extra metadata that is embeded as part of
 # the file name as an extra extension.
 ext = ''.join(pathlib.Path(root).suffixes)
 ext = "".join(pathlib.Path(root).suffixes)
 module = root[: -len(ext)].replace("/", ".")
 mapping[module] = wheel_name

Expand Down

16 changes: 8 additions & 8 deletions
gazelle/parse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
 "name": subnode.name,
 "lineno": node.lineno,
 "filepath": filepath,
 "from": ""
 "from": "",
 }
 modules.append(module)
 elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
 "name": f"{node.module}.{subnode.name}",
 "lineno": node.lineno,
 "filepath": filepath,
 "from": node.module
 "from": node.module,
 }
 modules.append(module)
 return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
 content = file.read()
 # From simple benchmarks, 2 workers gave the best performance here.
 with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
 modules_future = executor.submit(parse_import_statements, content,
 rel_filepath)
 modules_future = executor.submit(
 parse_import_statements, content, rel_filepath
 )
 comments_future = executor.submit(parse_comments, content)
 modules = modules_future.result()
 comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
 filenames = parse_request["filenames"]
 outputs = list()
 if len(filenames) == 1:
 outputs.append(parse(repo_root, rel_package_path,
 filenames[0]))
 outputs.append(parse(repo_root, rel_package_path, filenames[0]))
 else:
 futures = [
 executor.submit(parse, repo_root, rel_package_path,
 filename) for filename in filenames
 executor.submit(parse, repo_root, rel_package_path, filename)
 for filename in filenames
 if filename != ""
 ]
 for future in concurrent.futures.as_completed(futures):
Expand Down

3 changes: 1 addition & 2 deletions
gazelle/testdata/with_third_party_requirements_from_imports/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
 print(aiplatform)
Expand Down

1 change: 1 addition & 0 deletions
gazelle/testdata/with_third_party_requirements_from_imports/bar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
 a = dir(aiplatform)
 b = dir(storage)

6 changes: 1 addition & 5 deletions
python/pip_install/extract_wheels/bazel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
 annotation,
 namespace_pkgs,
 wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down

4 changes: 3 additions & 1 deletion
python/pip_install/extract_wheels/extract_single_wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
 configure_reproducible_wheels,
)


def main() -> None:
Expand Down

25 changes: 15 additions & 10 deletions
python/pip_install/extract_wheels/parse_requirements_to_bzl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
 if (
 # PEP-440 direct references are considered pinned
 # See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
 not install_req.link and
 not install_req.is_pinned
 not install_req.link
and not install_req.is_pinned
 ):
 unpinned_reqs.append(str(install_req))
 install_req_and_lines.append(
 (install_req, line)
 )
 install_req_and_lines.append((install_req, line))

 else:
 extra_pip_args.extend(shlex.split(line))

 if len(unpinned_reqs) > 0:
 unpinned_reqs_str = "\n".join(unpinned_reqs)
 raise RuntimeError(f"""\
 raise RuntimeError(
 f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
 )

 return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
 }
 )

 output.write(textwrap.dedent(
 """\
 output.write(
 textwrap.dedent(
 """\
 \"\"\"Starlark representation of locked requirements.

 @generated by rules_python pip_parse repository rule
 from {}
 \"\"\"
 """.format(args.requirements_lock_label)))
 """.format(
 args.requirements_lock_label
 )
 )
 )
 output.write(
 generate_parsed_requirements_contents(
 requirements_lock=args.requirements_lock,
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/extract_wheels/wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
 @property
 def name(self) -> str:
 # TODO Also available as installer.sources.WheelSource.distribution
 name = str(self.metadata['Name'])
 name = str(self.metadata["Name"])
 return canonicalize_name(name)

 @property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
 def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
 dependency_set = set()

 for wheel_req in self.metadata.get_all('Requires-Dist', []):
 for wheel_req in self.metadata.get_all("Requires-Dist", []):
 req = pkg_resources.Requirement(wheel_req) # type: ignore

 if req.marker is None or any(
Expand Down

10 changes: 8 additions & 2 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

2 changes: 1 addition & 1 deletion
tools/wheelmaker.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
 size = 0
 with open(real_filename, "rb") as f:
 while True:
 block = f.read(2 ** 20)
 block = f.read(2**20)
 if not block:
 break
 hash.update(block)
Expand Down

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

Skip to content
Ran black and isort to fix files missed by commit hook#790

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

groodt
merged 1 commit into

from

Aug 14, 2022
 Merged


Ran black and isort to fix files missed by commit hook
#790
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


1 change: 1 addition & 0 deletions
examples/build_file_generation/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
 r = requests.get(url)
 print(r.text)

1 change: 0 additions & 1 deletion
examples/build_file_generation/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
 main("https://example.com")

1 change: 1 addition & 0 deletions
examples/pip_install/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
 return dir(boto3)

Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_install/pip_install_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
 env.split(" "),
 [
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse/pip_parse_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
 self.assertListEqual(
 env.split(" "),
 [
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down

8 changes: 3 additions & 5 deletions
examples/pip_repository_annotations/pip_repository_annotations_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
 current_wheel_version = "0.37.1"

 r = runfiles.Create()
 dist_info_dir = (
 "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )
 dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )

 # Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down

7 changes: 2 additions & 5 deletions
gazelle/modules_mapping/generator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
 maybe_lib = path.split("/")[1].lower()
 return is_metadata(path) and (
 maybe_lib == "purelib" or maybe_lib == "platlib"
 )

 return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
 if ext == ".so":
 # Also remove extra metadata that is embeded as part of
 # the file name as an extra extension.
 ext = ''.join(pathlib.Path(root).suffixes)
 ext = "".join(pathlib.Path(root).suffixes)
 module = root[: -len(ext)].replace("/", ".")
 mapping[module] = wheel_name

Expand Down

16 changes: 8 additions & 8 deletions
gazelle/parse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
 "name": subnode.name,
 "lineno": node.lineno,
 "filepath": filepath,
 "from": ""
 "from": "",
 }
 modules.append(module)
 elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
 "name": f"{node.module}.{subnode.name}",
 "lineno": node.lineno,
 "filepath": filepath,
 "from": node.module
 "from": node.module,
 }
 modules.append(module)
 return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
 content = file.read()
 # From simple benchmarks, 2 workers gave the best performance here.
 with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
 modules_future = executor.submit(parse_import_statements, content,
 rel_filepath)
 modules_future = executor.submit(
 parse_import_statements, content, rel_filepath
 )
 comments_future = executor.submit(parse_comments, content)
 modules = modules_future.result()
 comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
 filenames = parse_request["filenames"]
 outputs = list()
 if len(filenames) == 1:
 outputs.append(parse(repo_root, rel_package_path,
 filenames[0]))
 outputs.append(parse(repo_root, rel_package_path, filenames[0]))
 else:
 futures = [
 executor.submit(parse, repo_root, rel_package_path,
 filename) for filename in filenames
 executor.submit(parse, repo_root, rel_package_path, filename)
 for filename in filenames
 if filename != ""
 ]
 for future in concurrent.futures.as_completed(futures):
Expand Down

3 changes: 1 addition & 2 deletions
gazelle/testdata/with_third_party_requirements_from_imports/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
 print(aiplatform)
Expand Down

1 change: 1 addition & 0 deletions
gazelle/testdata/with_third_party_requirements_from_imports/bar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
 a = dir(aiplatform)
 b = dir(storage)

6 changes: 1 addition & 5 deletions
python/pip_install/extract_wheels/bazel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
 annotation,
 namespace_pkgs,
 wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down

4 changes: 3 additions & 1 deletion
python/pip_install/extract_wheels/extract_single_wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
 configure_reproducible_wheels,
)


def main() -> None:
Expand Down

25 changes: 15 additions & 10 deletions
python/pip_install/extract_wheels/parse_requirements_to_bzl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
 if (
 # PEP-440 direct references are considered pinned
 # See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
 not install_req.link and
 not install_req.is_pinned
 not install_req.link
and not install_req.is_pinned
 ):
 unpinned_reqs.append(str(install_req))
 install_req_and_lines.append(
 (install_req, line)
 )
 install_req_and_lines.append((install_req, line))

 else:
 extra_pip_args.extend(shlex.split(line))

 if len(unpinned_reqs) > 0:
 unpinned_reqs_str = "\n".join(unpinned_reqs)
 raise RuntimeError(f"""\
 raise RuntimeError(
 f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
 )

 return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
 }
 )

 output.write(textwrap.dedent(
 """\
 output.write(
 textwrap.dedent(
 """\
 \"\"\"Starlark representation of locked requirements.

 @generated by rules_python pip_parse repository rule
 from {}
 \"\"\"
 """.format(args.requirements_lock_label)))
 """.format(
 args.requirements_lock_label
 )
 )
 )
 output.write(
 generate_parsed_requirements_contents(
 requirements_lock=args.requirements_lock,
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/extract_wheels/wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
 @property
 def name(self) -> str:
 # TODO Also available as installer.sources.WheelSource.distribution
 name = str(self.metadata['Name'])
 name = str(self.metadata["Name"])
 return canonicalize_name(name)

 @property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
 def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
 dependency_set = set()

 for wheel_req in self.metadata.get_all('Requires-Dist', []):
 for wheel_req in self.metadata.get_all("Requires-Dist", []):
 req = pkg_resources.Requirement(wheel_req) # type: ignore

 if req.marker is None or any(
Expand Down

10 changes: 8 additions & 2 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

2 changes: 1 addition & 1 deletion
tools/wheelmaker.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
 size = 0
 with open(real_filename, "rb") as f:
 while True:
 block = f.read(2 ** 20)
 block = f.read(2**20)
 if not block:
 break
 hash.update(block)
Expand Down

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

Skip to content
Ran black and isort to fix files missed by commit hook#790

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

groodt
merged 1 commit into

from

Aug 14, 2022
 Merged


Ran black and isort to fix files missed by commit hook
#790
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


1 change: 1 addition & 0 deletions
examples/build_file_generation/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
 r = requests.get(url)
 print(r.text)

1 change: 0 additions & 1 deletion
examples/build_file_generation/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
 main("https://example.com")

1 change: 1 addition & 0 deletions
examples/pip_install/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
 return dir(boto3)

Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_install/pip_install_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
 env.split(" "),
 [
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse/pip_parse_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
 self.assertListEqual(
 env.split(" "),
 [
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down

8 changes: 3 additions & 5 deletions
examples/pip_repository_annotations/pip_repository_annotations_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
 current_wheel_version = "0.37.1"

 r = runfiles.Create()
 dist_info_dir = (
 "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )
 dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )

 # Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down

7 changes: 2 additions & 5 deletions
gazelle/modules_mapping/generator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
 maybe_lib = path.split("/")[1].lower()
 return is_metadata(path) and (
 maybe_lib == "purelib" or maybe_lib == "platlib"
 )

 return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
 if ext == ".so":
 # Also remove extra metadata that is embeded as part of
 # the file name as an extra extension.
 ext = ''.join(pathlib.Path(root).suffixes)
 ext = "".join(pathlib.Path(root).suffixes)
 module = root[: -len(ext)].replace("/", ".")
 mapping[module] = wheel_name

Expand Down

16 changes: 8 additions & 8 deletions
gazelle/parse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
 "name": subnode.name,
 "lineno": node.lineno,
 "filepath": filepath,
 "from": ""
 "from": "",
 }
 modules.append(module)
 elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
 "name": f"{node.module}.{subnode.name}",
 "lineno": node.lineno,
 "filepath": filepath,
 "from": node.module
 "from": node.module,
 }
 modules.append(module)
 return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
 content = file.read()
 # From simple benchmarks, 2 workers gave the best performance here.
 with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
 modules_future = executor.submit(parse_import_statements, content,
 rel_filepath)
 modules_future = executor.submit(
 parse_import_statements, content, rel_filepath
 )
 comments_future = executor.submit(parse_comments, content)
 modules = modules_future.result()
 comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
 filenames = parse_request["filenames"]
 outputs = list()
 if len(filenames) == 1:
 outputs.append(parse(repo_root, rel_package_path,
 filenames[0]))
 outputs.append(parse(repo_root, rel_package_path, filenames[0]))
 else:
 futures = [
 executor.submit(parse, repo_root, rel_package_path,
 filename) for filename in filenames
 executor.submit(parse, repo_root, rel_package_path, filename)
 for filename in filenames
 if filename != ""
 ]
 for future in concurrent.futures.as_completed(futures):
Expand Down

3 changes: 1 addition & 2 deletions
gazelle/testdata/with_third_party_requirements_from_imports/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
 print(aiplatform)
Expand Down

1 change: 1 addition & 0 deletions
gazelle/testdata/with_third_party_requirements_from_imports/bar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
 a = dir(aiplatform)
 b = dir(storage)

6 changes: 1 addition & 5 deletions
python/pip_install/extract_wheels/bazel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
 annotation,
 namespace_pkgs,
 wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down

4 changes: 3 additions & 1 deletion
python/pip_install/extract_wheels/extract_single_wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
 configure_reproducible_wheels,
)


def main() -> None:
Expand Down

25 changes: 15 additions & 10 deletions
python/pip_install/extract_wheels/parse_requirements_to_bzl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
 if (
 # PEP-440 direct references are considered pinned
 # See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
 not install_req.link and
 not install_req.is_pinned
 not install_req.link
and not install_req.is_pinned
 ):
 unpinned_reqs.append(str(install_req))
 install_req_and_lines.append(
 (install_req, line)
 )
 install_req_and_lines.append((install_req, line))

 else:
 extra_pip_args.extend(shlex.split(line))

 if len(unpinned_reqs) > 0:
 unpinned_reqs_str = "\n".join(unpinned_reqs)
 raise RuntimeError(f"""\
 raise RuntimeError(
 f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
 )

 return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
 }
 )

 output.write(textwrap.dedent(
 """\
 output.write(
 textwrap.dedent(
 """\
 \"\"\"Starlark representation of locked requirements.

 @generated by rules_python pip_parse repository rule
 from {}
 \"\"\"
 """.format(args.requirements_lock_label)))
 """.format(
 args.requirements_lock_label
 )
 )
 )
 output.write(
 generate_parsed_requirements_contents(
 requirements_lock=args.requirements_lock,
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/extract_wheels/wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
 @property
 def name(self) -> str:
 # TODO Also available as installer.sources.WheelSource.distribution
 name = str(self.metadata['Name'])
 name = str(self.metadata["Name"])
 return canonicalize_name(name)

 @property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
 def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
 dependency_set = set()

 for wheel_req in self.metadata.get_all('Requires-Dist', []):
 for wheel_req in self.metadata.get_all("Requires-Dist", []):
 req = pkg_resources.Requirement(wheel_req) # type: ignore

 if req.marker is None or any(
Expand Down

10 changes: 8 additions & 2 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

2 changes: 1 addition & 1 deletion
tools/wheelmaker.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
 size = 0
 with open(real_filename, "rb") as f:
 while True:
 block = f.read(2 ** 20)
 block = f.read(2**20)
 if not block:
 break
 hash.update(block)
Expand Down

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

Skip to content
Ran black and isort to fix files missed by commit hook#790

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

groodt
merged 1 commit into

from

Aug 14, 2022
 Merged


Ran black and isort to fix files missed by commit hook
#790
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


1 change: 1 addition & 0 deletions
examples/build_file_generation/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
 r = requests.get(url)
 print(r.text)

1 change: 0 additions & 1 deletion
examples/build_file_generation/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
 main("https://example.com")

1 change: 1 addition & 0 deletions
examples/pip_install/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
 return dir(boto3)

Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_install/pip_install_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
 env.split(" "),
 [
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse/pip_parse_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
 self.assertListEqual(
 env.split(" "),
 [
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down

8 changes: 3 additions & 5 deletions
examples/pip_repository_annotations/pip_repository_annotations_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
 current_wheel_version = "0.37.1"

 r = runfiles.Create()
 dist_info_dir = (
 "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )
 dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )

 # Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down

7 changes: 2 additions & 5 deletions
gazelle/modules_mapping/generator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
 maybe_lib = path.split("/")[1].lower()
 return is_metadata(path) and (
 maybe_lib == "purelib" or maybe_lib == "platlib"
 )

 return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
 if ext == ".so":
 # Also remove extra metadata that is embeded as part of
 # the file name as an extra extension.
 ext = ''.join(pathlib.Path(root).suffixes)
 ext = "".join(pathlib.Path(root).suffixes)
 module = root[: -len(ext)].replace("/", ".")
 mapping[module] = wheel_name

Expand Down

16 changes: 8 additions & 8 deletions
gazelle/parse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
 "name": subnode.name,
 "lineno": node.lineno,
 "filepath": filepath,
 "from": ""
 "from": "",
 }
 modules.append(module)
 elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
 "name": f"{node.module}.{subnode.name}",
 "lineno": node.lineno,
 "filepath": filepath,
 "from": node.module
 "from": node.module,
 }
 modules.append(module)
 return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
 content = file.read()
 # From simple benchmarks, 2 workers gave the best performance here.
 with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
 modules_future = executor.submit(parse_import_statements, content,
 rel_filepath)
 modules_future = executor.submit(
 parse_import_statements, content, rel_filepath
 )
 comments_future = executor.submit(parse_comments, content)
 modules = modules_future.result()
 comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
 filenames = parse_request["filenames"]
 outputs = list()
 if len(filenames) == 1:
 outputs.append(parse(repo_root, rel_package_path,
 filenames[0]))
 outputs.append(parse(repo_root, rel_package_path, filenames[0]))
 else:
 futures = [
 executor.submit(parse, repo_root, rel_package_path,
 filename) for filename in filenames
 executor.submit(parse, repo_root, rel_package_path, filename)
 for filename in filenames
 if filename != ""
 ]
 for future in concurrent.futures.as_completed(futures):
Expand Down

3 changes: 1 addition & 2 deletions
gazelle/testdata/with_third_party_requirements_from_imports/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
 print(aiplatform)
Expand Down

1 change: 1 addition & 0 deletions
gazelle/testdata/with_third_party_requirements_from_imports/bar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
 a = dir(aiplatform)
 b = dir(storage)

6 changes: 1 addition & 5 deletions
python/pip_install/extract_wheels/bazel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
 annotation,
 namespace_pkgs,
 wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down

4 changes: 3 additions & 1 deletion
python/pip_install/extract_wheels/extract_single_wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
 configure_reproducible_wheels,
)


def main() -> None:
Expand Down

25 changes: 15 additions & 10 deletions
python/pip_install/extract_wheels/parse_requirements_to_bzl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
 if (
 # PEP-440 direct references are considered pinned
 # See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
 not install_req.link and
 not install_req.is_pinned
 not install_req.link
and not install_req.is_pinned
 ):
 unpinned_reqs.append(str(install_req))
 install_req_and_lines.append(
 (install_req, line)
 )
 install_req_and_lines.append((install_req, line))

 else:
 extra_pip_args.extend(shlex.split(line))

 if len(unpinned_reqs) > 0:
 unpinned_reqs_str = "\n".join(unpinned_reqs)
 raise RuntimeError(f"""\
 raise RuntimeError(
 f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
 )

 return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
 }
 )

 output.write(textwrap.dedent(
 """\
 output.write(
 textwrap.dedent(
 """\
 \"\"\"Starlark representation of locked requirements.

 @generated by rules_python pip_parse repository rule
 from {}
 \"\"\"
 """.format(args.requirements_lock_label)))
 """.format(
 args.requirements_lock_label
 )
 )
 )
 output.write(
 generate_parsed_requirements_contents(
 requirements_lock=args.requirements_lock,
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/extract_wheels/wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
 @property
 def name(self) -> str:
 # TODO Also available as installer.sources.WheelSource.distribution
 name = str(self.metadata['Name'])
 name = str(self.metadata["Name"])
 return canonicalize_name(name)

 @property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
 def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
 dependency_set = set()

 for wheel_req in self.metadata.get_all('Requires-Dist', []):
 for wheel_req in self.metadata.get_all("Requires-Dist", []):
 req = pkg_resources.Requirement(wheel_req) # type: ignore

 if req.marker is None or any(
Expand Down

10 changes: 8 additions & 2 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

2 changes: 1 addition & 1 deletion
tools/wheelmaker.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
 size = 0
 with open(real_filename, "rb") as f:
 while True:
 block = f.read(2 ** 20)
 block = f.read(2**20)
 if not block:
 break
 hash.update(block)
Expand Down

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

Skip to content
Ran black and isort to fix files missed by commit hook#790

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

groodt
merged 1 commit into

from

Aug 14, 2022
 Merged


Ran black and isort to fix files missed by commit hook
#790
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


1 change: 1 addition & 0 deletions
examples/build_file_generation/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
 r = requests.get(url)
 print(r.text)

1 change: 0 additions & 1 deletion
examples/build_file_generation/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
 main("https://example.com")

1 change: 1 addition & 0 deletions
examples/pip_install/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
 return dir(boto3)

Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_install/pip_install_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
 env.split(" "),
 [
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse/pip_parse_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
 self.assertListEqual(
 env.split(" "),
 [
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down

8 changes: 3 additions & 5 deletions
examples/pip_repository_annotations/pip_repository_annotations_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
 current_wheel_version = "0.37.1"

 r = runfiles.Create()
 dist_info_dir = (
 "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )
 dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )

 # Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down

7 changes: 2 additions & 5 deletions
gazelle/modules_mapping/generator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
 maybe_lib = path.split("/")[1].lower()
 return is_metadata(path) and (
 maybe_lib == "purelib" or maybe_lib == "platlib"
 )

 return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
 if ext == ".so":
 # Also remove extra metadata that is embeded as part of
 # the file name as an extra extension.
 ext = ''.join(pathlib.Path(root).suffixes)
 ext = "".join(pathlib.Path(root).suffixes)
 module = root[: -len(ext)].replace("/", ".")
 mapping[module] = wheel_name

Expand Down

16 changes: 8 additions & 8 deletions
gazelle/parse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
 "name": subnode.name,
 "lineno": node.lineno,
 "filepath": filepath,
 "from": ""
 "from": "",
 }
 modules.append(module)
 elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
 "name": f"{node.module}.{subnode.name}",
 "lineno": node.lineno,
 "filepath": filepath,
 "from": node.module
 "from": node.module,
 }
 modules.append(module)
 return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
 content = file.read()
 # From simple benchmarks, 2 workers gave the best performance here.
 with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
 modules_future = executor.submit(parse_import_statements, content,
 rel_filepath)
 modules_future = executor.submit(
 parse_import_statements, content, rel_filepath
 )
 comments_future = executor.submit(parse_comments, content)
 modules = modules_future.result()
 comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
 filenames = parse_request["filenames"]
 outputs = list()
 if len(filenames) == 1:
 outputs.append(parse(repo_root, rel_package_path,
 filenames[0]))
 outputs.append(parse(repo_root, rel_package_path, filenames[0]))
 else:
 futures = [
 executor.submit(parse, repo_root, rel_package_path,
 filename) for filename in filenames
 executor.submit(parse, repo_root, rel_package_path, filename)
 for filename in filenames
 if filename != ""
 ]
 for future in concurrent.futures.as_completed(futures):
Expand Down

3 changes: 1 addition & 2 deletions
gazelle/testdata/with_third_party_requirements_from_imports/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
 print(aiplatform)
Expand Down

1 change: 1 addition & 0 deletions
gazelle/testdata/with_third_party_requirements_from_imports/bar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
 a = dir(aiplatform)
 b = dir(storage)

6 changes: 1 addition & 5 deletions
python/pip_install/extract_wheels/bazel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
 annotation,
 namespace_pkgs,
 wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down

4 changes: 3 additions & 1 deletion
python/pip_install/extract_wheels/extract_single_wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
 configure_reproducible_wheels,
)


def main() -> None:
Expand Down

25 changes: 15 additions & 10 deletions
python/pip_install/extract_wheels/parse_requirements_to_bzl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
 if (
 # PEP-440 direct references are considered pinned
 # See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
 not install_req.link and
 not install_req.is_pinned
 not install_req.link
and not install_req.is_pinned
 ):
 unpinned_reqs.append(str(install_req))
 install_req_and_lines.append(
 (install_req, line)
 )
 install_req_and_lines.append((install_req, line))

 else:
 extra_pip_args.extend(shlex.split(line))

 if len(unpinned_reqs) > 0:
 unpinned_reqs_str = "\n".join(unpinned_reqs)
 raise RuntimeError(f"""\
 raise RuntimeError(
 f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
 )

 return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
 }
 )

 output.write(textwrap.dedent(
 """\
 output.write(
 textwrap.dedent(
 """\
 \"\"\"Starlark representation of locked requirements.

 @generated by rules_python pip_parse repository rule
 from {}
 \"\"\"
 """.format(args.requirements_lock_label)))
 """.format(
 args.requirements_lock_label
 )
 )
 )
 output.write(
 generate_parsed_requirements_contents(
 requirements_lock=args.requirements_lock,
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/extract_wheels/wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
 @property
 def name(self) -> str:
 # TODO Also available as installer.sources.WheelSource.distribution
 name = str(self.metadata['Name'])
 name = str(self.metadata["Name"])
 return canonicalize_name(name)

 @property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
 def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
 dependency_set = set()

 for wheel_req in self.metadata.get_all('Requires-Dist', []):
 for wheel_req in self.metadata.get_all("Requires-Dist", []):
 req = pkg_resources.Requirement(wheel_req) # type: ignore

 if req.marker is None or any(
Expand Down

10 changes: 8 additions & 2 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

2 changes: 1 addition & 1 deletion
tools/wheelmaker.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
 size = 0
 with open(real_filename, "rb") as f:
 while True:
 block = f.read(2 ** 20)
 block = f.read(2**20)
 if not block:
 break
 hash.update(block)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Ran black and isort to fix files missed by commit hook#790

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

groodt
merged 1 commit into

from

Aug 14, 2022
 Merged


Ran black and isort to fix files missed by commit hook
#790
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


1 change: 1 addition & 0 deletions
examples/build_file_generation/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
 r = requests.get(url)
 print(r.text)

1 change: 0 additions & 1 deletion
examples/build_file_generation/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
 main("https://example.com")

1 change: 1 addition & 0 deletions
examples/pip_install/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
 return dir(boto3)

Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_install/pip_install_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
 env.split(" "),
 [
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse/pip_parse_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
 self.assertListEqual(
 env.split(" "),
 [
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down

8 changes: 3 additions & 5 deletions
examples/pip_repository_annotations/pip_repository_annotations_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
 current_wheel_version = "0.37.1"

 r = runfiles.Create()
 dist_info_dir = (
 "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )
 dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )

 # Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down

7 changes: 2 additions & 5 deletions
gazelle/modules_mapping/generator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
 maybe_lib = path.split("/")[1].lower()
 return is_metadata(path) and (
 maybe_lib == "purelib" or maybe_lib == "platlib"
 )

 return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
 if ext == ".so":
 # Also remove extra metadata that is embeded as part of
 # the file name as an extra extension.
 ext = ''.join(pathlib.Path(root).suffixes)
 ext = "".join(pathlib.Path(root).suffixes)
 module = root[: -len(ext)].replace("/", ".")
 mapping[module] = wheel_name

Expand Down

16 changes: 8 additions & 8 deletions
gazelle/parse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
 "name": subnode.name,
 "lineno": node.lineno,
 "filepath": filepath,
 "from": ""
 "from": "",
 }
 modules.append(module)
 elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
 "name": f"{node.module}.{subnode.name}",
 "lineno": node.lineno,
 "filepath": filepath,
 "from": node.module
 "from": node.module,
 }
 modules.append(module)
 return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
 content = file.read()
 # From simple benchmarks, 2 workers gave the best performance here.
 with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
 modules_future = executor.submit(parse_import_statements, content,
 rel_filepath)
 modules_future = executor.submit(
 parse_import_statements, content, rel_filepath
 )
 comments_future = executor.submit(parse_comments, content)
 modules = modules_future.result()
 comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
 filenames = parse_request["filenames"]
 outputs = list()
 if len(filenames) == 1:
 outputs.append(parse(repo_root, rel_package_path,
 filenames[0]))
 outputs.append(parse(repo_root, rel_package_path, filenames[0]))
 else:
 futures = [
 executor.submit(parse, repo_root, rel_package_path,
 filename) for filename in filenames
 executor.submit(parse, repo_root, rel_package_path, filename)
 for filename in filenames
 if filename != ""
 ]
 for future in concurrent.futures.as_completed(futures):
Expand Down

3 changes: 1 addition & 2 deletions
gazelle/testdata/with_third_party_requirements_from_imports/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
 print(aiplatform)
Expand Down

1 change: 1 addition & 0 deletions
gazelle/testdata/with_third_party_requirements_from_imports/bar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
 a = dir(aiplatform)
 b = dir(storage)

6 changes: 1 addition & 5 deletions
python/pip_install/extract_wheels/bazel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
 annotation,
 namespace_pkgs,
 wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down

4 changes: 3 additions & 1 deletion
python/pip_install/extract_wheels/extract_single_wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
 configure_reproducible_wheels,
)


def main() -> None:
Expand Down

25 changes: 15 additions & 10 deletions
python/pip_install/extract_wheels/parse_requirements_to_bzl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
 if (
 # PEP-440 direct references are considered pinned
 # See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
 not install_req.link and
 not install_req.is_pinned
 not install_req.link
and not install_req.is_pinned
 ):
 unpinned_reqs.append(str(install_req))
 install_req_and_lines.append(
 (install_req, line)
 )
 install_req_and_lines.append((install_req, line))

 else:
 extra_pip_args.extend(shlex.split(line))

 if len(unpinned_reqs) > 0:
 unpinned_reqs_str = "\n".join(unpinned_reqs)
 raise RuntimeError(f"""\
 raise RuntimeError(
 f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
 )

 return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
 }
 )

 output.write(textwrap.dedent(
 """\
 output.write(
 textwrap.dedent(
 """\
 \"\"\"Starlark representation of locked requirements.

 @generated by rules_python pip_parse repository rule
 from {}
 \"\"\"
 """.format(args.requirements_lock_label)))
 """.format(
 args.requirements_lock_label
 )
 )
 )
 output.write(
 generate_parsed_requirements_contents(
 requirements_lock=args.requirements_lock,
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/extract_wheels/wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
 @property
 def name(self) -> str:
 # TODO Also available as installer.sources.WheelSource.distribution
 name = str(self.metadata['Name'])
 name = str(self.metadata["Name"])
 return canonicalize_name(name)

 @property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
 def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
 dependency_set = set()

 for wheel_req in self.metadata.get_all('Requires-Dist', []):
 for wheel_req in self.metadata.get_all("Requires-Dist", []):
 req = pkg_resources.Requirement(wheel_req) # type: ignore

 if req.marker is None or any(
Expand Down

10 changes: 8 additions & 2 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

2 changes: 1 addition & 1 deletion
tools/wheelmaker.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
 size = 0
 with open(real_filename, "rb") as f:
 while True:
 block = f.read(2 ** 20)
 block = f.read(2**20)
 if not block:
 break
 hash.update(block)
Expand Down

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

Skip to content
Ran black and isort to fix files missed by commit hook#790

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

groodt
merged 1 commit into

from

Aug 14, 2022
 Merged


Ran black and isort to fix files missed by commit hook
#790
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


1 change: 1 addition & 0 deletions
examples/build_file_generation/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import requests


def main(url):
 r = requests.get(url)
 print(r.text)

1 change: 0 additions & 1 deletion
examples/build_file_generation/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
from __init__ import main


if __name__ == "__main__":
 main("https://example.com")

1 change: 1 addition & 0 deletions
examples/pip_install/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import boto3


def the_dir():
 return dir(boto3)

Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_install/pip_install_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ def test_dist_info(self):
 env.split(" "),
 [
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/DESCRIPTION.rst",
'external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER',
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/INSTALLER",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/METADATA",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/RECORD",
 "external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/WHEEL",
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse/pip_parse_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_dist_info(self):
 self.assertListEqual(
 env.split(" "),
 [
'external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER',
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/INSTALLER",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/LICENSE",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/METADATA",
 "external/pypi_requests/site-packages/requests-2.25.1.dist-info/RECORD",
Expand Down

8 changes: 3 additions & 5 deletions
examples/pip_repository_annotations/pip_repository_annotations_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,9 @@ def test_data_exclude_glob(self):
 current_wheel_version = "0.37.1"

 r = runfiles.Create()
 dist_info_dir = (
 "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )
 dist_info_dir = "pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
 self.wheel_pkg_dir(),
 current_wheel_version,
 )

 # Note: `METADATA` is important as it's consumed by https://docs.python.org/3/library/importlib.metadata.html
Expand Down

7 changes: 2 additions & 5 deletions
gazelle/modules_mapping/generator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,7 @@ def is_metadata(path):
# Ref: https://peps.python.org/pep-0427/#what-s-the-deal-with-purelib-vs-platlib
def data_has_purelib_or_platlib(path):
 maybe_lib = path.split("/")[1].lower()
 return is_metadata(path) and (
 maybe_lib == "purelib" or maybe_lib == "platlib"
 )

 return is_metadata(path) and (maybe_lib == "purelib" or maybe_lib == "platlib")


def module_for_path(path, whl, mapping):
Expand All@@ -95,7 +92,7 @@ def module_for_path(path, whl, mapping):
 if ext == ".so":
 # Also remove extra metadata that is embeded as part of
 # the file name as an extra extension.
 ext = ''.join(pathlib.Path(root).suffixes)
 ext = "".join(pathlib.Path(root).suffixes)
 module = root[: -len(ext)].replace("/", ".")
 mapping[module] = wheel_name

Expand Down

16 changes: 8 additions & 8 deletions
gazelle/parse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ def parse_import_statements(content, filepath):
 "name": subnode.name,
 "lineno": node.lineno,
 "filepath": filepath,
 "from": ""
 "from": "",
 }
 modules.append(module)
 elif isinstance(node, ast.ImportFrom) and node.level == 0:
Expand All@@ -30,7 +30,7 @@ def parse_import_statements(content, filepath):
 "name": f"{node.module}.{subnode.name}",
 "lineno": node.lineno,
 "filepath": filepath,
 "from": node.module
 "from": node.module,
 }
 modules.append(module)
 return modules
Expand All@@ -52,8 +52,9 @@ def parse(repo_root, rel_package_path, filename):
 content = file.read()
 # From simple benchmarks, 2 workers gave the best performance here.
 with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
 modules_future = executor.submit(parse_import_statements, content,
 rel_filepath)
 modules_future = executor.submit(
 parse_import_statements, content, rel_filepath
 )
 comments_future = executor.submit(parse_comments, content)
 modules = modules_future.result()
 comments = comments_future.result()
Expand All@@ -73,12 +74,11 @@ def main(stdin, stdout):
 filenames = parse_request["filenames"]
 outputs = list()
 if len(filenames) == 1:
 outputs.append(parse(repo_root, rel_package_path,
 filenames[0]))
 outputs.append(parse(repo_root, rel_package_path, filenames[0]))
 else:
 futures = [
 executor.submit(parse, repo_root, rel_package_path,
 filename) for filename in filenames
 executor.submit(parse, repo_root, rel_package_path, filename)
 for filename in filenames
 if filename != ""
 ]
 for future in concurrent.futures.as_completed(futures):
Expand Down

3 changes: 1 addition & 2 deletions
gazelle/testdata/with_third_party_requirements_from_imports/__main__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
from google.cloud import aiplatform

from bar import main
from google.cloud import aiplatform

if __name__ == "__main__":
 print(aiplatform)
Expand Down

1 change: 1 addition & 0 deletions
gazelle/testdata/with_third_party_requirements_from_imports/bar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
from google.cloud import aiplatform, storage


def main():
 a = dir(aiplatform)
 b = dir(storage)

6 changes: 1 addition & 5 deletions
python/pip_install/extract_wheels/bazel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,7 @@
from pathlib import Path
from typing import Dict, Iterable, List, Optional, Set

from python.pip_install.extract_wheels import (
 annotation,
 namespace_pkgs,
 wheel,
)
from python.pip_install.extract_wheels import annotation, namespace_pkgs, wheel

WHEEL_FILE_LABEL = "whl"
PY_LIBRARY_LABEL = "pkg"
Expand Down

4 changes: 3 additions & 1 deletion
python/pip_install/extract_wheels/extract_single_wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@
import sys
from tempfile import NamedTemporaryFile

from python.pip_install.extract_wheels.extract_wheels import configure_reproducible_wheels
from python.pip_install.extract_wheels import arguments, bazel, requirements
from python.pip_install.extract_wheels.annotation import annotation_from_str_path
from python.pip_install.extract_wheels.extract_wheels import (
 configure_reproducible_wheels,
)


def main() -> None:
Expand Down

25 changes: 15 additions & 10 deletions
python/pip_install/extract_wheels/parse_requirements_to_bzl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,25 +40,25 @@ def parse_install_requirements(
 if (
 # PEP-440 direct references are considered pinned
 # See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
 not install_req.link and
 not install_req.is_pinned
 not install_req.link
and not install_req.is_pinned
 ):
 unpinned_reqs.append(str(install_req))
 install_req_and_lines.append(
 (install_req, line)
 )
 install_req_and_lines.append((install_req, line))

 else:
 extra_pip_args.extend(shlex.split(line))

 if len(unpinned_reqs) > 0:
 unpinned_reqs_str = "\n".join(unpinned_reqs)
 raise RuntimeError(f"""\
 raise RuntimeError(
 f"""\
The `requirements_lock` file must be fully pinned. See `compile_pip_requirements`.
Alternatively, use `pip-tools` or a similar mechanism to produce a pinned lockfile.

The following requirements were not pinned:
{unpinned_reqs_str}""")
{unpinned_reqs_str}"""
 )

 return install_req_and_lines

Expand DownExpand Up@@ -259,14 +259,19 @@ def main(output: TextIO) -> None:
 }
 )

 output.write(textwrap.dedent(
 """\
 output.write(
 textwrap.dedent(
 """\
 \"\"\"Starlark representation of locked requirements.

 @generated by rules_python pip_parse repository rule
 from {}
 \"\"\"
 """.format(args.requirements_lock_label)))
 """.format(
 args.requirements_lock_label
 )
 )
 )
 output.write(
 generate_parsed_requirements_contents(
 requirements_lock=args.requirements_lock,
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/extract_wheels/wheel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def path(self) -> str:
 @property
 def name(self) -> str:
 # TODO Also available as installer.sources.WheelSource.distribution
 name = str(self.metadata['Name'])
 name = str(self.metadata["Name"])
 return canonicalize_name(name)

 @property
Expand DownExpand Up@@ -59,7 +59,7 @@ def entry_points(self) -> Dict[str, Tuple[str, str]]:
 def dependencies(self, extras_requested: Optional[Set[str]] = None) -> Set[str]:
 dependency_set = set()

 for wheel_req in self.metadata.get_all('Requires-Dist', []):
 for wheel_req in self.metadata.get_all("Requires-Dist", []):
 req = pkg_resources.Requirement(wheel_req) # type: ignore

 if req.marker is None or any(
Expand Down

10 changes: 8 additions & 2 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,11 @@ def _select_golden_requirements_file(
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = requirements_txt if "BUILD_WORKSPACE_DIRECTORY" in os.environ else os.path.join("..", "..", requirements_txt)
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

Expand DownExpand Up@@ -79,7 +83,9 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt)
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

2 changes: 1 addition & 1 deletion
tools/wheelmaker.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,7 @@ def arcname_from(name):
 size = 0
 with open(real_filename, "rb") as f:
 while True:
 block = f.read(2 ** 20)
 block = f.read(2**20)
 if not block:
 break
 hash.update(block)
Expand Down