Skip to content

Commit

Permalink
[Build] Update directory check in rules_python
Browse files Browse the repository at this point in the history
This checks if an item is a directory and ignores it when
files are being created in the
python package.
  • Loading branch information
AutomatedTester committed Oct 27, 2020
1 parent d3bcb8c commit 84c52f2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 76 deletions.
1 change: 1 addition & 0 deletions WORKSPACE
Expand Up @@ -119,6 +119,7 @@ npm_install(

http_archive(
name = "rules_python",
patches = ["//py:rules_python_wheel_directory_check.patch"],
sha256 = "4d8ed66d5f57a0b6b90e495ca8e29e5c5fa353b93f093e7c31c595a4631ff293",
strip_prefix = "rules_python-5c948dcfd4ca79c2ed3a87636c46abba9f5836e9",
url = "https://github.com/bazelbuild/rules_python/archive/5c948dcfd4ca79c2ed3a87636c46abba9f5836e9.zip",
Expand Down
69 changes: 0 additions & 69 deletions py/rules_python_any_version_wheel.patch

This file was deleted.

14 changes: 7 additions & 7 deletions py/rules_python_wheel_directory_check.patch
@@ -1,5 +1,5 @@
diff --git experimental/examples/wheel/BUILD experimental/examples/wheel/BUILD
index 8916423..8a4aeb4 100644
index 06371fe..eaf0709 100644
--- experimental/examples/wheel/BUILD
+++ experimental/examples/wheel/BUILD
@@ -31,6 +31,20 @@ py_library(
Expand Down Expand Up @@ -36,7 +36,7 @@ index 8916423..8a4aeb4 100644
py_wheel(
name = "minimal_with_py_package",
# Package data. We're building "example_minimal_package-0.0.1-py3-none-any.whl"
@@ -131,6 +151,16 @@ py_wheel(
@@ -135,6 +155,16 @@ py_wheel(
],
)

Expand All @@ -53,11 +53,11 @@ index 8916423..8a4aeb4 100644
py_test(
name = "wheel_test",
srcs = ["wheel_test.py"],
diff --git experimental/rules_python/wheelmaker.py experimental/rules_python/wheelmaker.py
index 1b3261d..1a28df2 100644
--- experimental/rules_python/wheelmaker.py
+++ experimental/rules_python/wheelmaker.py
@@ -101,6 +101,11 @@ class WheelMaker(object):
diff --git experimental/tools/wheelmaker.py experimental/tools/wheelmaker.py
index 38fb122..4c7be30 100644
--- experimental/tools/wheelmaker.py
+++ experimental/tools/wheelmaker.py
@@ -102,6 +102,11 @@ class WheelMaker(object):

return normalized_arcname

Expand Down

0 comments on commit 84c52f2

Please sign in to comment.