From 8acd7346dab4e90375422b5814d2f5fb17961250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Stradomski?= Date: Sun, 4 Oct 2020 18:34:15 +0200 Subject: [PATCH 1/2] Rename experimental/rules_python to experimental/tools This better reflects contents of this package. --- experimental/python/wheel.bzl | 2 +- experimental/{rules_python => tools}/BUILD | 0 experimental/{rules_python => tools}/wheelmaker.py | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename experimental/{rules_python => tools}/BUILD (100%) rename experimental/{rules_python => tools}/wheelmaker.py (100%) diff --git a/experimental/python/wheel.bzl b/experimental/python/wheel.bzl index d1c46d65c0..79cbc97e0d 100644 --- a/experimental/python/wheel.bzl +++ b/experimental/python/wheel.bzl @@ -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, diff --git a/experimental/rules_python/BUILD b/experimental/tools/BUILD similarity index 100% rename from experimental/rules_python/BUILD rename to experimental/tools/BUILD diff --git a/experimental/rules_python/wheelmaker.py b/experimental/tools/wheelmaker.py similarity index 100% rename from experimental/rules_python/wheelmaker.py rename to experimental/tools/wheelmaker.py From 83fd3dbca15cadd69d0c200c8b6aee84c765c6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Stradomski?= Date: Sun, 4 Oct 2020 18:39:14 +0200 Subject: [PATCH 2/2] Change "generator:" name embedded in wheels to bazel-wheelmaker. It will be easier to identify origin of the wheels. --- experimental/examples/wheel/wheel_test.py | 4 ++-- experimental/tools/wheelmaker.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/experimental/examples/wheel/wheel_test.py b/experimental/examples/wheel/wheel_test.py index f5d9b19897..318367bda6 100644 --- a/experimental/examples/wheel/wheel_test.py +++ b/experimental/examples/wheel/wheel_test.py @@ -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 @@ -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 """) diff --git a/experimental/tools/wheelmaker.py b/experimental/tools/wheelmaker.py index 4f69b62f4d..38fb1228f5 100644 --- a/experimental/tools/wheelmaker.py +++ b/experimental/tools/wheelmaker.py @@ -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():