diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 666654998b..1cc121a4e7 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -12,10 +12,7 @@ all_targets: &all_targets # We control Bazel version in integration tests, so we don't need USE_BAZEL_VERSION for tests. skip_use_bazel_version_for_test: true test_targets: - - "--" - "..." - # Disabled due to https://github.com/bazelbuild/rules_python/issues/827 - - "-//python/tests/toolchains:python_3_8_10_x86_64-apple-darwin_test" platforms: ubuntu1804: <<: *all_targets @@ -40,4 +37,4 @@ platforms: # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260 - "-//tests:pip_repository_entry_points_example" test_flags: - - "--test_tag_filters=-fix-windows" + - "--test_tag_filters=-fix-windows" \ No newline at end of file diff --git a/python/repositories.bzl b/python/repositories.bzl index dc2c49e722..b676de1060 100644 --- a/python/repositories.bzl +++ b/python/repositories.bzl @@ -250,6 +250,12 @@ py_runtime_pair( python_path = python_bin, python_version = python_short_version, ) + + # On older macos versions there is a Python directory containing + # object files, which conflicts with a python symlink (macos is case + # insensitive). Therefore remove any file/directory from the archive + # before adding a python symlink. + rctx.delete("python") rctx.symlink(python_bin, "python") rctx.file(STANDALONE_INTERPRETER_FILENAME, "# File intentionally left blank. Indicates that this is an interpreter repo created by rules_python.") rctx.file("BUILD.bazel", build_content)