Skip to content
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

Use installer to remove custom unzip and spread code #715

Merged
merged 13 commits into from
Jun 30, 2022
Merged

Use installer to remove custom unzip and spread code #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bb5a7c4
Replace manual unzip with installer.
groodt May 28, 2022
625c7ed
Merge remote-tracking branch 'upstream/main' into groodt-replace-unzi…
groodt May 28, 2022
f37fe38
Merge branch 'master' into groodt-replace-unzip-installer
groodt Jun 7, 2022
5f11d7f
Merge branch 'bazelbuild:main' into groodt-replace-unzip-installer
groodt Jun 9, 2022
630fbcd
Merge branch 'bazelbuild:main' into groodt-replace-unzip-installer
groodt Jun 13, 2022
5861008
Remove f-strings
groodt Jun 14, 2022
60e63b4
Remove .idea
groodt Jun 14, 2022
8aa2f3a
Merge branch 'bazelbuild:main' into groodt-replace-unzip-installer
groodt Jun 15, 2022
47f5680
Merge branch 'main' into groodt-replace-unzip-installer
Jun 21, 2022
78b6b6a
Merge branch 'main' into groodt-replace-unzip-installer
groodt Jun 21, 2022
cd6d901
Merge branch 'main' into groodt-replace-unzip-installer
groodt Jun 21, 2022
b87b2c8
Merge branch 'main' into groodt-replace-unzip-installer
Jun 22, 2022
805c85a
Merge branch 'bazelbuild:main' into groodt-replace-unzip-installer
groodt Jun 28, 2022
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
24 changes: 12 additions & 12 deletions examples/pip_install/pip_install_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@ def test_data(self):
self.assertListEqual(
env.split(" "),
[
"external/pip/pypi__s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/INSTALL.md",
"external/pip/pypi__s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/LICENSE",
"external/pip/pypi__s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/NEWS",
"external/pip/pypi__s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/README.md",
"external/pip/pypi__s3cmd/s3cmd-2.1.0.data/data/share/man/man1/s3cmd.1",
"external/pip/pypi__s3cmd/s3cmd-2.1.0.data/scripts/s3cmd",
"external/pip/pypi__s3cmd/data/share/doc/packages/s3cmd/INSTALL.md",
"external/pip/pypi__s3cmd/data/share/doc/packages/s3cmd/LICENSE",
"external/pip/pypi__s3cmd/data/share/doc/packages/s3cmd/NEWS",
"external/pip/pypi__s3cmd/data/share/doc/packages/s3cmd/README.md",
"external/pip/pypi__s3cmd/data/share/man/man1/s3cmd.1",
],
)

Expand All @@ -52,12 +51,13 @@ def test_dist_info(self):
self.assertListEqual(
env.split(" "),
[
"external/pip/pypi__boto3/boto3-1.14.51.dist-info/DESCRIPTION.rst",
"external/pip/pypi__boto3/boto3-1.14.51.dist-info/METADATA",
"external/pip/pypi__boto3/boto3-1.14.51.dist-info/RECORD",
"external/pip/pypi__boto3/boto3-1.14.51.dist-info/WHEEL",
"external/pip/pypi__boto3/boto3-1.14.51.dist-info/metadata.json",
"external/pip/pypi__boto3/boto3-1.14.51.dist-info/top_level.txt",
"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/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",
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/metadata.json",
"external/pip/pypi__boto3/site-packages/boto3-1.14.51.dist-info/top_level.txt",
],
)

Expand Down
22 changes: 11 additions & 11 deletions examples/pip_parse/pip_parse_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@ def test_data(self):
self.assertListEqual(
env.split(" "),
[
"external/pypi_s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/INSTALL.md",
"external/pypi_s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/LICENSE",
"external/pypi_s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/NEWS",
"external/pypi_s3cmd/s3cmd-2.1.0.data/data/share/doc/packages/s3cmd/README.md",
"external/pypi_s3cmd/s3cmd-2.1.0.data/data/share/man/man1/s3cmd.1",
"external/pypi_s3cmd/s3cmd-2.1.0.data/scripts/s3cmd",
"external/pypi_s3cmd/data/share/doc/packages/s3cmd/INSTALL.md",
"external/pypi_s3cmd/data/share/doc/packages/s3cmd/LICENSE",
"external/pypi_s3cmd/data/share/doc/packages/s3cmd/NEWS",
"external/pypi_s3cmd/data/share/doc/packages/s3cmd/README.md",
"external/pypi_s3cmd/data/share/man/man1/s3cmd.1",
],
)

Expand All @@ -50,11 +49,12 @@ def test_dist_info(self):
self.assertListEqual(
env.split(" "),
[
"external/pypi_requests/requests-2.25.1.dist-info/LICENSE",
"external/pypi_requests/requests-2.25.1.dist-info/METADATA",
"external/pypi_requests/requests-2.25.1.dist-info/RECORD",
"external/pypi_requests/requests-2.25.1.dist-info/WHEEL",
"external/pypi_requests/requests-2.25.1.dist-info/top_level.txt",
'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",
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/WHEEL",
"external/pypi_requests/site-packages/requests-2.25.1.dist-info/top_level.txt",
],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/pip_repository_annotations/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ write_file(
copy_executables = {"@pip_repository_annotations_example//:data/copy_executable.py": "copied_content/executable.py"},
copy_files = {"@pip_repository_annotations_example//:data/copy_file.txt": "copied_content/file.txt"},
data = [":generated_file"],
data_exclude_glob = ["*.dist-info/WHEEL"],
data_exclude_glob = ["site-packages/*.dist-info/WHEEL"],
),
}

Expand Down
2 changes: 1 addition & 1 deletion examples/pip_repository_annotations/pip_repository_annotations_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_data_exclude_glob(self):

r = runfiles.Create()
dist_info_dir = (
"pip_repository_annotations_example/external/{}/wheel-{}.dist-info".format(
"pip_repository_annotations_example/external/{}/site-packages/wheel-{}.dist-info".format(
self.wheel_pkg_dir(),
current_wheel_version,
)
Expand Down
12 changes: 0 additions & 12 deletions python/pip_install/extract_wheels/lib/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ py_library(
"arguments.py",
"bazel.py",
"namespace_pkgs.py",
"purelib.py",
"requirements.py",
"wheel.py",
],
Expand Down Expand Up @@ -135,17 +134,6 @@ py_test(
],
)

py_test(
name = "purelib_test",
size = "small",
srcs = [
"purelib_test.py",
],
deps = [
":lib",
],
)

filegroup(
name = "distribution",
srcs = glob(
Expand Down
31 changes: 9 additions & 22 deletions python/pip_install/extract_wheels/lib/bazel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from python.pip_install.extract_wheels.lib import (
annotation,
namespace_pkgs,
purelib,
wheel,
)

Expand Down Expand Up @@ -137,27 +136,18 @@ def generate_build_file_contents(
there may be no Python sources whatsoever (e.g. packages written in Cython: like `pymssql`).
"""

dist_info_ignores = [
# RECORD is known to contain sha256 checksums of files which might include the checksums
# of generated files produced when wheels are installed. The file is ignored to avoid
# Bazel caching issues.
"**/*.dist-info/RECORD",
]

data_exclude = list(
set(
[
"*.whl",
"**/__pycache__/**",
"**/* *",
"**/*.py",
"**/*.pyc",
"BUILD.bazel",
"WORKSPACE",
f"{WHEEL_ENTRY_POINT_PREFIX}*.py",
# RECORD is known to contain sha256 checksums of files which might include the checksums
# of generated files produced when wheels are installed. The file is ignored to avoid
# Bazel caching issues.
"**/*.dist-info/RECORD",
]
+ data_exclude
+ dist_info_ignores
)
)

Expand All @@ -172,12 +162,12 @@ def generate_build_file_contents(

filegroup(
name = "{dist_info_label}",
srcs = glob(["*.dist-info/**"], allow_empty = True),
srcs = glob(["site-packages/*.dist-info/**"], allow_empty = True),
)

filegroup(
name = "{data_label}",
srcs = glob(["*.data/**"], allow_empty = True),
srcs = glob(["data/**"], allow_empty = True),
)

filegroup(
Expand All @@ -188,11 +178,11 @@ def generate_build_file_contents(

py_library(
name = "{name}",
srcs = glob(["**/*.py"], exclude={srcs_exclude}, allow_empty = True),
data = {data} + glob(["**/*"], exclude={data_exclude}),
srcs = glob(["site-packages/**/*.py"], exclude={srcs_exclude}, allow_empty = True),
data = {data} + glob(["site-packages/**/*"], exclude={data_exclude}),
# This makes this directory a top-level in the python import
# search path for anything that depends on this.
imports = ["."],
imports = ["site-packages"],
deps = [{dependencies}],
tags = [{tags}],
)
Expand Down Expand Up @@ -377,9 +367,6 @@ def extract_wheel(
shutil.copy(whl.path, directory)
whl.unzip(directory)

# Note: Order of operations matters here
purelib.spread_purelib_into_root(directory)

if not enable_implicit_namespace_pkgs:
setup_namespace_pkg_compatibility(directory)

Expand Down
67 changes: 0 additions & 67 deletions python/pip_install/extract_wheels/lib/purelib.py
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions python/pip_install/extract_wheels/lib/purelib_test.py
View file
Open in desktop

This file was deleted.

Loading