From d48206814e8220e5bc90940eeab47d25cd9a67f1 Mon Sep 17 00:00:00 2001 From: aceforeverd Date: Tue, 10 Jan 2023 23:56:18 +0800 Subject: [PATCH 1/2] squash changes --- bazel/zetasql_deps_step_2.bzl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bazel/zetasql_deps_step_2.bzl b/bazel/zetasql_deps_step_2.bzl index 1a748497..405dbb65 100644 --- a/bazel/zetasql_deps_step_2.bzl +++ b/bazel/zetasql_deps_step_2.bzl @@ -772,10 +772,9 @@ java_library( if not native.existing_rule("jinja"): http_archive( name = "jinja", - # Jinja release 2.10 - url = "https://github.com/pallets/jinja/archive/2.10.tar.gz", - strip_prefix = "jinja-2.10", - sha256 = "0d31d3466c313a9ca014a2d904fed18cdac873a5ba1f7b70b8fd8b206cd860d6", + url = "https://github.com/pallets/jinja/archive/3.0.1.tar.gz", + strip_prefix = "jinja-3.0.1/src", + sha256 = "1e37a6f86c29fa8ace108ea72b41d2d5c5bd67d79be14bfeca3ba6eb37d789de", build_file_content = """py_library( name = "jinja2", visibility = ["//visibility:public"], @@ -803,10 +802,10 @@ java_library( http_archive( name = "markupsafe", urls = [ - "https://github.com/pallets/markupsafe/archive/1.0.tar.gz", + "https://github.com/pallets/markupsafe/archive/2.1.1.tar.gz", ], - sha256 = "dc3938045d9407a73cf9fdd709e2b1defd0588d50ffc85eb0786c095ec846f15", - strip_prefix = "markupsafe-1.0/markupsafe", + sha256 = "0f83b6d1bf6fa65546221d42715034e7e654845583a84906c5936590f9a7ad8f", + strip_prefix = "markupsafe-2.1.1/src/markupsafe", build_file_content = """py_library( name = "markupsafe", visibility = ["//visibility:public"], From fde839d85eb844659e19bc6db3520c64e32c84fb Mon Sep 17 00:00:00 2001 From: aceforeverd Date: Tue, 10 Jan 2023 23:57:12 +0800 Subject: [PATCH 2/2] use python3.10 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a0a867b..2437c42f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -117,10 +117,10 @@ jobs: - name: update bazel version run: echo ${{ env.bazel_version }} > .bazelversion - - name: setup python3.9 + - name: setup python3.10 uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.10' - name: install bazelisk run: |