Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module(
)

# https://registry.bazel.build/modules/abseil-cpp
bazel_dep(name = "abseil-cpp", version = "20260526.0", repo_name = "com_google_absl")
bazel_dep(name = "abseil-cpp", version = "20260817.0", repo_name = "com_google_absl")
single_version_override(
module_name = "abseil-cpp",
version = "20260526.0",
version = "20260817.0",
)

# https://registry.bazel.build/modules/abseil-py
Expand Down Expand Up @@ -47,7 +47,11 @@ bazel_dep(name = "pybind11_abseil", version = "202402.0")
bazel_dep(name = "pybind11_bazel", version = "3.0.0")

# https://registry.bazel.build/modules/rules_cc
bazel_dep(name = "rules_cc", version = "0.2.16")
bazel_dep(name = "rules_cc", version = "0.2.18")
single_version_override(
module_name = "rules_cc",
version = "0.2.18",
)

# https://registry.bazel.build/modules/rules_proto
bazel_dep(name = "rules_proto", version = "7.1.0")
Expand Down
8 changes: 4 additions & 4 deletions cel_expr_python/cel_env_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -725,18 +725,18 @@ def test_config_functions_deprecated_syntax(self):
self.assertFalse(res.value())

def test_env_options(self):
options = cel.Options(enable_pratt_parser=True)
options = cel.Options()
self.assertTrue(options.enable_pratt_parser)
self.assertEqual(repr(options), "Options(enable_pratt_parser=True)")
options.enable_pratt_parser = False
self.assertFalse(options.enable_pratt_parser)
self.assertEqual(repr(options), "Options(enable_pratt_parser=False)")

env = cel.NewEnv(options=cel.Options(enable_pratt_parser=True))
self.assertTrue(env.options().enable_pratt_parser)
env = cel.NewEnv(options=cel.Options(enable_pratt_parser=False))
self.assertFalse(env.options().enable_pratt_parser)

default_env = cel.NewEnv()
self.assertFalse(default_env.options().enable_pratt_parser)
self.assertTrue(default_env.options().enable_pratt_parser)


class TestCelExtension(cel.CelExtension):
Expand Down
4 changes: 2 additions & 2 deletions cel_expr_python/cel_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1074,8 +1074,8 @@ class CelTest(_CelTestBase):
pass


class CelPrattParserTest(_CelTestBase):
options = cel.Options(enable_pratt_parser=True)
class CelAntlrParserTest(_CelTestBase):
options = cel.Options(enable_pratt_parser=False)


if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion cel_expr_python/py_cel_options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void PyCelOptions::DefinePythonBindings(pybind11::module& m) {
.def(py::init([](bool enable_pratt_parser) {
return PyCelOptions{.enable_pratt_parser = enable_pratt_parser};
}),
py::arg("enable_pratt_parser") = false)
py::arg("enable_pratt_parser") = true)
.def_readwrite("enable_pratt_parser", &PyCelOptions::enable_pratt_parser)
.def("__repr__", &GenericRepr);
}
Expand Down
2 changes: 1 addition & 1 deletion cel_expr_python/py_cel_options.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace cel_python {
struct PyCelOptions {
static void DefinePythonBindings(pybind11::module& m);

bool enable_pratt_parser = false;
bool enable_pratt_parser = true;
};

} // namespace cel_python
Expand Down
4 changes: 4 additions & 0 deletions conformance/conformance_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ class ConformanceTestSuite(unittest.TestSuite):
"timestamps/timestamp_arithmetic/subtract_max_duration_from_max_time",
"timestamps/timestamp_range/sub_time_duration_over",
"timestamps/timestamp_range/sub_time_duration_under",
# TODO(b/581943737): These depend on legacy US/ timezones, which are
# incompletely supported in our test environment.
"timestamps/timestamp_selectors_tz/getDayOfMonth_name_pos",
"timestamps/timestamp_selectors_tz/getDayOfYear",
"wrappers/duration/nanos_over",
"wrappers/duration/nanos_under",
"wrappers/duration/negative_seconds_positive_nanos",
Expand Down
Loading