Skip to content

Cleanups #368

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
merged 2 commits into from
Oct 14, 2020
Merged

Cleanups #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8acd734
Rename experimental/rules_python to experimental/tools
pstradomski Oct 4, 2020
83fd3db
Change "generator:" name embedded in wheels to bazel-wheelmaker.
pstradomski Oct 4, 2020
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
4 changes: 2 additions & 2 deletions experimental/examples/wheel/wheel_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def test_customized_wheel(self):
self.assertEquals(record_contents, b"""\
example_customized-0.0.1.dist-info/METADATA,sha256=TeeEmokHE2NWjkaMcVJuSAq4_AXUoIad2-SLuquRmbg,372
example_customized-0.0.1.dist-info/RECORD,,
example_customized-0.0.1.dist-info/WHEEL,sha256=F01lGfVCzcXUzzQHzUkBmXAcu_TXd5zqMLrvrspncJo,85
example_customized-0.0.1.dist-info/WHEEL,sha256=sobxWSyDDkdg_rinUth-jxhXHqoNqlmNMJY3aTZn2Us,91
example_customized-0.0.1.dist-info/entry_points.txt,sha256=mEWsq4sMoyqR807QV8Z3KPocGfKvtgTo1lBFTRb6b78,150
experimental/examples/wheel/lib/data.txt,sha256=9vJKEdfLu8bZRArKLroPZJh1XKkK3qFMXiM79MBL2Sg,12
experimental/examples/wheel/lib/module_with_data.py,sha256=K_IGAq_CHcZX0HUyINpD1hqSKIEdCn58d9E9nhWF2EA,636
Expand All @@ -84,7 +84,7 @@ def test_customized_wheel(self):
""")
self.assertEquals(wheel_contents, b"""\
Wheel-Version: 1.0
Generator: wheelmaker 1.0
Generator: bazel-wheelmaker 1.0
Root-Is-Purelib: true
Tag: py3-none-any
""")
Expand Down
2 changes: 1 addition & 1 deletion experimental/python/wheel.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ tries to locate `.runfiles` directory which is not packaged in the wheel.
"_wheelmaker": attr.label(
executable = True,
cfg = "host",
default = "//experimental/rules_python:wheelmaker",
default = "//experimental/tools:wheelmaker",
),
},
_distribution_attrs,
Expand Down
0 experimental/rules_python/BUILD → experimental/tools/BUILD
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion experimental/rules_python/wheelmaker.py → experimental/tools/wheelmaker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def add_wheelfile(self):
# TODO(pstradomski): Support non-purelib wheels.
wheel_contents = """\
Wheel-Version: 1.0
Generator: wheelmaker 1.0
Generator: bazel-wheelmaker 1.0
Root-Is-Purelib: true
"""
for tag in self.disttags():
Expand Down