Skip to content

[DO NOT MERGE] Build: align Bazel and dependencies to restore successful macOS M1 wheel builds #7828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
czgdp1807 wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

[DO NOT MERGE] Build: align Bazel and dependencies to restore successful macOS M1 wheel builds #7828

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ae12d60
Build: update Bazel and dependency constraints for macOS M1 wheel suc…
czgdp1807 Mar 18, 2026
6be531d
chore: Add macos-latest in wheels.yml job
czgdp1807 Mar 18, 2026
5be312d
fix: remove filter_query (ZetaSQL) dependency from execution and reso…
czgdp1807 Mar 18, 2026
fdd0a89
fix: replace ZetaSQL filter_query with Python-level filtering
czgdp1807 Mar 18, 2026
dec249b
test: skip filter_query-dependent tests (ZetaSQL removed from ml-meta…
czgdp1807 Mar 19, 2026
c4b39d8
test(input_resolution): skip LatestPolicyModelOp lineage tests withou…
czgdp1807 Mar 19, 2026
22ca7df
test: skip SpanDrivenEvaluatorInputs tests requiring MLMD filter_query
czgdp1807 Mar 19, 2026
df2177d
test: skip TrainingRange resolver tests without ZetaSQL-backed filter…
czgdp1807 Mar 19, 2026
16975f0
Skip metadata resolver tests that require MLMD filter_query
czgdp1807 Mar 19, 2026
7b97b21
test(mlmd): skip filter_query-dependent store_ext tests after ZetaSQL…
czgdp1807 Mar 19, 2026
a99b7ac
chore: Fix pre-commit failures
czgdp1807 Mar 19, 2026
e2568ca
chore: Add macos in build_wheels job in wheels.yml
czgdp1807 Mar 19, 2026
7fd6753
chore: Keep only ubuntu-latest in Build sdist job
czgdp1807 Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
types: [published]

env:
USE_BAZEL_VERSION: "6.5.0"
USE_BAZEL_VERSION: "7.4.1"

jobs:
build_sdist:
name: Build sdist
runs-on: ubuntu-latest
runs-on: [ubuntu-latest, macos-latest]
steps:
- name: Check out the repo
uses: actions/checkout@v4
Expand Down
13 changes: 10 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ workspace(name = "tfx")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "zlib",
build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
sha256 = "17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c",
strip_prefix = "zlib-1.3.1",
urls = ["https://github.com/madler/zlib/archive/v1.3.1.tar.gz"],
)

# TF 1.15
# LINT.IfChange(tf_commit)
_TENSORFLOW_GIT_COMMIT = "590d6eef7e91a6a7392c8ffffb7b58f2e0c8bc6b"
Expand Down Expand Up @@ -54,9 +62,8 @@ http_archive(

http_archive(
name = "build_bazel_rules_apple",
urls = ["https://github.com/bazelbuild/rules_apple/archive/refs/tags/0.34.1.tar.gz"],
sha256 = "301ad0c16585f44fdb404dee7496332501606939698afb372e8311f7445f1175",
strip_prefix = "rules_apple-0.34.1",
urls = ["https://github.com/bazelbuild/rules_apple/releases/download/3.2.1/rules_apple.3.2.1.tar.gz"],
sha256 = "9c4f1e1ec4fdfeac5bddb07fa0e872c398e3d8eb0ac596af9c463f9123ace292",
)

# Needed by gRPC.
Expand Down
4 changes: 2 additions & 2 deletions test_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ alembic==1.13.3
annotated-types==0.7.0
anyio==4.6.0
apache-airflow==2.10.3
apache-beam==2.50.0
apache-beam>=2.47
apispec==6.6.1
argcomplete==3.5.1
argon2-cffi==23.1.0
Expand Down Expand Up @@ -192,7 +192,7 @@ mdurl==0.1.2
methodtools==0.4.7
mistune==3.0.2
ml-dtypes==0.3.2
ml-metadata>=1.17.1
ml-metadata-czgdp1807>=1.16.0
mmh==2.2
more-itertools==10.5.0
msgpack==1.1.0
Expand Down
6 changes: 3 additions & 3 deletions tfx/dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ def select_constraint(default, nightly=None, git_master=None):
def make_pipeline_sdk_required_install_packages():
return [
"absl-py>=0.9,<2.0.0",
"ml-metadata"
"ml-metadata-czgdp1807"
+ select_constraint(
# LINT.IfChange
default=">=1.17.0,<1.18.0",
default=">=1.16.0",
# LINT.ThenChange(tfx/workspace.bzl)
nightly=">=1.17.0",
git_master="@git+https://github.com/google/ml-metadata@master",
Expand All @@ -80,7 +80,7 @@ def make_required_install_packages():
# Make sure to sync the versions of common dependencies (absl-py, numpy,
# and protobuf) with TF.
return make_pipeline_sdk_required_install_packages() + [
"apache-beam[gcp]>=2.47,<3",
"apache-beam[gcp]>=2.47",
"attrs>=19.3.0,<24",
"click>=7,<9",
"google-api-core<3",
Expand Down
Loading