8000 keep file permissions when unpacking · gmweaver/rules_python@6742ef2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6742ef2

Browse files
Garrett WeaverJonathon Belotti
Garrett Weaver
authored and
Jonathon Belotti
committed
keep file permissions when unpacking
add zipextended.py to BUILD fix import path use pip internal unzip use pip internal unzip tools remove custom zipfile implementation Add documentation of community / Bazel team ownership (bazel-contrib#308) This adds a more nuanced CODEOWNERS and explains its purpose in CONTRIBUTING.md. Fixes bazel-contrib#291. point README readers to new 0.0.2 release (bazel-contrib#302) update version in version.bzl (bazel-contrib#303) Fix for when there are so many file arguments it creates the Command To Long error (bazel-contrib#320) Fix failing build on CI by specifying pip package version (bazel-contrib#329) `bazel build //...` was failing due to "googleapis-common-protos[grpc]" pip package being unavailable. It seems to be caused by latest googleapis-common-protos release. Specify googleapis-common-protos in requirements.txt to be in the previous version (1.51.0) to fix this. Fixes bazel-contrib#321. "Skylark" is an outdated name of the language, please use "starlark" instead (bazel-contrib#327) Co-authored-by: Andy Scott <andyscott@users.noreply.github.com> Support python interpreter target in pip_import. (bazel-contrib#312) * Support python interpreter target in pip_import. This allows users to use a custom python interpreter that is built by another repository rule instead of using a pre-built interpreter binary that is checked-in. This tangentially addresses bazel-contrib#257 since a common setup is to use the custom built interpreter in the python toolchain. For example, see: https://github.com/kku1993/bazel-hermetic-python * Actually use interpreter path. Co-authored-by: Andy Scott <andyscott@users.noreply.github.com> Address bazel-contrib#289 (bazel-contrib#328) Co-authored-by: Andy Scott <andyscott@users.noreply.github.com> Fix errors with incompatible_disallow_empty_glob (bazel-contrib#315) Allow py_library sources to be empty. If --incompatible_disallow_empty_glob is set then generated py_library targets will fail if there are no .py files. Examples are pymssql==2.1.4 and cx-Oracle==7.2.3. Set `allow_empty = True` for glob(). Bazel issue for incompatible_disallow_empty_glob: bazelbuild/bazel#8195 Co-authored-by: Andy Scott <andyscott@users.noreply.github.com> rebuild piptool and whltool update filename, add links to pip function definitions remove typing checks chore: github setup improvements (bazel-contrib#334) Remove mention and usage of Bazel Federation (bazel-contrib#339) It's currently a stalled project so it's not useful for us to direct new users there in our README. Separately it is harder to develop on rules_python since it is currently not self-contained. For example it's hard to find or adjust the version of rules_pkg without looking/editing in the federation repo. Tony says this is an okay change: bazelbuild/bazel-federation@63f9746#commitcomment-40577834 leaner implementation of pip unzip remove unzip.py temp test with tools 2nd test with tools final test with tools replace with master tools merge original tools feat(examples): move examples to a nested WORKSPACE (bazel-contrib#337) This lets users understand the example in isolation. They can copy/paste the example directory and it works correctly. This refactors the existing examples which are quite weak, only really demonstrating pip usage. This makes room for examples demonstrating other features (like protocol buffers) or package managers (like poetry). In a later commit I'll add bazel-integration-testing so we get a test target that confirms the examples build (including their WORKSPACE being self-contained) warn against putting .par file changes in PR. (bazel-contrib#342)
1 parent 0f8183b commit 6742ef2

File tree

1 file changed

+31
-2
lines changed

1 file changed

+31
-2
lines changed

‎packaging/whl.py

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,25 @@
1818
import os
1919
import pkg_resources
2020
import re
21+
import stat
2122
import zipfile
2223

2324

25+
def current_umask():
26+
"""Get the current umask which involves having to set it temporarily."""
27+
mask = os.umask(0)
28+
os.umask(mask)
29+
return mask
30+
31+
32+
def set_extracted_file_to_default_mode_plus_executable(path):
33+
"""
34+
Make file present at path have execute for user/group/world
35+
(chmod +x) is no-op on windows per python docs
36+
"""
37+
os.chmod(path, (0o777 & ~current_umask() | 0o111))
38+
39+
2440
class Wheel(object):
2541

2642
def __init__(self, path):
@@ -107,8 +123,21 @@ def extras(self):
107123
return self.metadata().get('extras', [])
108124

109125
def expand(self, directory):
110-
with zipfile.ZipFile(self.path(), 'r') as whl:
111-
whl.extractall(directory)
126+
with zipfile.ZipFile(self.path(), "r", allowZip64=True) as whl:
127+
whl.extractall(directory)
128+
# The following logic is borrowed from Pip:
129+
# https://github.com/pypa/pip/blob/cc48c07b64f338ac5e347d90f6cb4efc22ed0d0b/src/pip/_internal/utils/unpacking.py#L240
130+
for info in whl.infolist():
131+
name = info.filename
132+
# Do not attempt to modify directories.
133+
if name.endswith("/") or name.endswith("\\"):
134+
continue
135+
mode = info.external_attr >> 16
136+
# if mode and regular file and any execute permissions for
137+
# user/group/world?
138+
if mode and stat.S_ISREG(mode) and mode & 0o111:
139+
name = os.path.join(directory, name)
140+
set_extracted_file_to_default_mode_plus_executable(name)
112141

113142
# _parse_metadata parses METADATA files according to https://www.python.org/dev/peps/pep-0314/
114143
def _parse_metadata(self, content):

0 commit comments

Comments
 (0)
0