Skip to content

Commit 89d0a33

Browse files
czgdp1807czgdp1807
committed
refactor: modernize build system and remove ZetaSQL dependencies
Update CI workflows to use python -m build instead of setup.py, and remove all ZetaSQL filter query dependencies from the codebase.
1 parent 4b23143 commit 89d0a33

File tree

8 files changed

+13
-90
lines changed

8 files changed

+13
-90
lines changed

‎.github/workflows/conda-build.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,23 @@ jobs:
5252
echo "USE_BAZEL_VERSION=6.5.0" >> $GITHUB_ENV
5353
bazel --version
5454
55+
- name: Install build tooling
56+
shell: bash -l {0}
57+
run: |
58+
python -m pip install --upgrade pip build wheel "setuptools<69.3"
59+
5560
- name: Build the package
5661
shell: bash -l {0}
5762
run: |
58-
python setup.py bdist_wheel
63+
python -m build --wheel --no-isolation
5964
6065
- name: Repair wheel (Linux)
6166
if: runner.os == 'Linux'
6267
shell: bash -l {0}
6368
run: |
69+
python -m pip install auditwheel
6470
WHEEL_PATH="$(ls dist/*.whl)"
65-
WHEEL_DIR=$(dirname "${WHEEL_PATH}")
66-
auditwheel repair --plat manylinux2014_x86_64 -w "${WHEEL_DIR}" "${WHEEL_PATH}"
71+
auditwheel repair --plat auto -w dist "${WHEEL_PATH}"
6772
rm "${WHEEL_PATH}"
6873
6974
- name: Upload wheel artifact

‎.github/workflows/conda-test.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,11 @@ jobs:
5555
run: |
5656
python setup.py bdist_wheel
5757
58-
- name: Install built wheel (Linux/macOS)
59-
if: runner.os != 'Windows'
58+
- name: Install built wheel
6059
shell: bash -l {0}
6160
run: |
6261
pip install dist/*.whl
6362
64-
- name: Install built wheel (Windows)
65-
if: runner.os == 'Windows'
66-
shell: bash -l {0}
67-
run: |
68-
pip install (Get-ChildItem dist/*.whl | Select-Object -First 1).FullName
69-
7063
- name: Run tests
7164
shell: bash -l {0}
7265
run: |

‎ci/environment-macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ channels:
44
- conda-forge
55
dependencies:
66
# Note: Bazel is installed separately via official installer (conda package is unreliable)
7-
- setuptools
7+
- setuptools<69.3 # Pin to avoid Metadata-Version 2.4 (PyPI only supports up to 2.3)
88
- wheel
99
- pip
10-
- numpy
10+
- numpy>=1.23,<2.0
1111
- pytest
1212
- pytest-cov
1313
- cmake=3.29 # Required for building libmysqlclient (CMake 4.x is incompatible)

‎ci/environment.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ channels:
44
- conda-forge
55
dependencies:
66
# Note: Bazel is installed separately via official installer (conda package is unreliable)
7-
- setuptools
7+
- setuptools<69.3 # Pin to avoid Metadata-Version 2.4 (PyPI only supports up to 2.3)
88
- wheel
99
- pip
10-
- numpy
10+
- numpy>=1.23,<2.0
1111
- pytest
1212
- pytest-cov
1313
- patchelf # For wheel repair on Linux

‎ml_metadata/metadata_store/BUILD‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,6 @@ cc_library(
271271
"@com_google_absl//absl/strings",
272272
"//ml_metadata/proto:metadata_source_proto",
273273
"//ml_metadata/proto:metadata_store_proto",
274-
# ZetaSQL filter query dependencies removed
275-
# "//ml_metadata/query:filter_query_ast_resolver",
276-
# "//ml_metadata/query:filter_query_builder",
277274
"//ml_metadata/util:return_utils",
278275
"//ml_metadata/util:struct_utils",
279276
"@com_google_glog//:glog",
@@ -1000,9 +997,6 @@ cc_library(
1000997
"@com_google_absl//absl/strings",
1001998
"//ml_metadata/proto:metadata_source_proto",
1002999
"//ml_metadata/proto:metadata_store_proto",
1003-
# ZetaSQL filter query dependencies removed
1004-
# "//ml_metadata/query:filter_query_ast_resolver",
1005-
# "//ml_metadata/query:filter_query_builder",
10061000
"//ml_metadata/util:return_utils",
10071001
"//ml_metadata/util:struct_utils",
10081002
"@com_google_glog//:glog",

‎ml_metadata/metadata_store/postgresql_query_executor.cc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ limitations under the License.
3232
#include "ml_metadata/metadata_store/query_executor.h"
3333
#include "ml_metadata/proto/metadata_source.pb.h"
3434
#include "ml_metadata/proto/metadata_store.pb.h"
35-
// ZetaSQL filter query removed - feature disabled
36-
// #include "ml_metadata/query/filter_query_ast_resolver.h"
37-
// #include "ml_metadata/query/filter_query_builder.h"
3835
#include "ml_metadata/util/return_utils.h"
3936
#include "ml_metadata/util/struct_utils.h"
4037

‎ml_metadata/metadata_store/query_config_executor.cc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ limitations under the License.
3333
#include "ml_metadata/metadata_store/list_operation_query_helper.h"
3434
#include "ml_metadata/proto/metadata_source.pb.h"
3535
#include "ml_metadata/proto/metadata_store.pb.h"
36-
// ZetaSQL filter query removed - feature disabled
37-
// #include "ml_metadata/query/filter_query_ast_resolver.h"
38-
// #include "ml_metadata/query/filter_query_builder.h"
3936
#include "ml_metadata/util/return_utils.h"
4037
#include "ml_metadata/util/struct_utils.h"
4138

‎ml_metadata/query/BUILD‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -18,66 +18,3 @@ load(
1818
)
1919

2020
licenses(["notice"])
21-
22-
# ZetaSQL-dependent libraries removed - these require ZetaSQL for SQL parsing
23-
# cc_library(
24-
# name = "filter_query_ast_resolver",
25-
# srcs = ["filter_query_ast_resolver.cc"],
26-
# hdrs = ["filter_query_ast_resolver.h"],
27-
# visibility = ["//ml_metadata:__subpackages__"],
28-
# deps = [
29-
# "@com_google_absl//absl/container:flat_hash_set",
30-
# "@com_google_absl//absl/status",
31-
# "@com_google_absl//absl/status:statusor",
32-
# "@com_google_absl//absl/strings",
33-
# "//ml_metadata/proto:metadata_store_proto",
34-
# "//ml_metadata/util:return_utils",
35-
# "@com_googlesource_code_re2//:re2",
36-
# "@com_google_zetasql//zetasql/public:analyzer",
37-
# "@com_google_zetasql//zetasql/public:simple_catalog",
38-
# ],
39-
# )
40-
41-
# ml_metadata_cc_test(
42-
# name = "filter_query_ast_resolver_test",
43-
# size = "small",
44-
# srcs = ["filter_query_ast_resolver_test.cc"],
45-
# deps = [
46-
# ":filter_query_ast_resolver",
47-
# "@com_google_googletest//:gtest_main",
48-
# "@com_google_absl//absl/status",
49-
# "//ml_metadata/metadata_store:test_util",
50-
# "//ml_metadata/proto:metadata_store_proto",
51-
# ],
52-
# )
53-
54-
# cc_library(
55-
# name = "filter_query_builder",
56-
# srcs = ["filter_query_builder.cc"],
57-
# hdrs = ["filter_query_builder.h"],
58-
# visibility = ["//ml_metadata:__subpackages__"],
59-
# deps = [
60-
# "@com_google_absl//absl/container:btree",
61-
# "@com_google_absl//absl/status",
62-
# "@com_google_absl//absl/strings",
63-
# "//ml_metadata/metadata_store:constants",
64-
# "//ml_metadata/proto:metadata_store_proto",
65-
# "@com_google_glog//:glog",
66-
# "@com_google_zetasql//zetasql/public:strings",
67-
# "@com_google_zetasql//zetasql/resolved_ast:sql_builder",
68-
# ],
69-
# )
70-
71-
# ml_metadata_cc_test(
72-
# name = "filter_query_builder_test",
73-
# size = "small",
74-
# srcs = ["filter_query_builder_test.cc"],
75-
# deps = [
76-
# ":filter_query_ast_resolver",
77-
# ":filter_query_builder",
78-
# "@com_google_googletest//:gtest_main",
79-
# "@com_google_absl//absl/status",
80-
# "//ml_metadata/metadata_store:test_util",
81-
# "//ml_metadata/proto:metadata_store_proto",
82-
# ],
83-
# )

0 commit comments

Comments
 (0)