Merge branch 'main' of https://github.com/bazel-contrib/rules_python into fix.bin.calls.bin

Author: rickeylev

CHANGELOG.md

@@ -129,6 +129,7 @@ END_UNRELEASED_TEMPLATE
 * (pypi) Support `requirements.txt` files that use different versions of the same
   package targeting different target platforms.
   ([#2797](https://github.com/bazel-contrib/rules_python/issues/2797)).
+* (py_wheel) Add directories in deterministic order.
 
 {#v0-0-0-added}
 ### Added

python/private/python_bootstrap_template.txt

@@ -457,6 +457,7 @@ source =
     env=env,
     cwd=workspace
   )
+  PrintVerboseCoverage('Return code of coverage run:', ret_code)
   output_filename = os.path.join(os.environ['COVERAGE_DIR'], 'pylcov.dat')
 
   PrintVerboseCoverage('Converting coveragepy database to lcov:', output_filename)
@@ -470,10 +471,12 @@ source =
     kparams['stdout'] = sys.stderr
     kparams['stderr'] = sys.stderr
 
-  ret_code = subprocess.call(
+  lcov_ret_code = subprocess.call(
     params,
     **kparams
-  ) or ret_code
+  )
+  PrintVerboseCoverage('Return code of coverage lcov:', lcov_ret_code)
+  ret_code = lcov_ret_code or ret_code
 
   try:
     os.unlink(rcfile_name)

tools/wheelmaker.py

@@ -152,7 +152,7 @@ def add_file(self, package_filename, real_filename):
         """Add given file to the distribution."""
 
         if os.path.isdir(real_filename):
-            directory_contents = os.listdir(real_filename)
+            directory_contents = sorted(os.listdir(real_filename))
             for file_ in directory_contents:
                 self.add_file(
                     "{}/{}".format(package_filename, file_),