diff options
author | Edwin Kempin <ekempin@google.com> | 2021-08-13 14:26:01 +0200 |
---|---|---|
committer | Edwin Kempin <ekempin@google.com> | 2021-08-13 14:31:52 +0200 |
commit | 5ead5ae89d548e5c9f6dfa6dfa8cd4882ff72fa2 (patch) | |
tree | 270e7f6f303a6b2e870ef85d86524c23812490a1 | |
parent | f75dab70882e570878ea1c504d8565b6ef2323a1 (diff) | |
parent | 0458df9096610a1e994940d242011bc8c95e8409 (diff) |
Merge branch 'stable-3.3'
* stable-3.3:
Update git submodules
Disable setting cancelLeftPadding if avatars are not set in the config
ProjectOperations: Add method to wipe all access sections
Migrate to python 3
Pop up accounts when typing within assignee or attention on the searchbar
Add attention operator for auto-complete
Update CodeMirror to 5.62.2
Replace non-standard event.path with event.composedPath
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I88cf74b3892d708c5b4707500a223265bf8797f8
-rw-r--r-- | .bazelrc | 2 | ||||
-rw-r--r-- | Documentation/dev-bazel.txt | 2 | ||||
-rwxr-xr-x | Documentation/replace_macros.py | 2 | ||||
-rwxr-xr-x | contrib/check-valid-commit.py | 2 | ||||
-rwxr-xr-x | contrib/git-push-review | 2 | ||||
-rwxr-xr-x | contrib/populate-fixture-data.py | 2 | ||||
m--------- | plugins/codemirror-editor | 0 | ||||
-rw-r--r-- | tools/bzl/js.bzl | 10 | ||||
-rw-r--r-- | tools/bzl/license-map.py | 2 | ||||
-rw-r--r-- | tools/bzl/license.bzl | 2 | ||||
-rw-r--r-- | tools/bzl/maven_jar.bzl | 2 | ||||
-rwxr-xr-x | tools/download_file.py | 2 | ||||
-rwxr-xr-x | tools/eclipse/project.py | 2 | ||||
-rwxr-xr-x | tools/js/download_bower.py | 2 | ||||
-rwxr-xr-x | tools/js/npm_pack.py | 2 | ||||
-rw-r--r-- | tools/js/run_npm_binary.py | 2 | ||||
-rwxr-xr-x | tools/maven/mvn.py | 2 | ||||
-rw-r--r-- | tools/util_test.py | 2 | ||||
-rwxr-xr-x | tools/version.py | 2 | ||||
-rw-r--r-- | tools/workspace_status.py | 2 | ||||
-rw-r--r-- | tools/workspace_status_release.py | 10 |
21 files changed, 28 insertions, 28 deletions
@@ -1,4 +1,4 @@ -build --workspace_status_command="python ./tools/workspace_status.py" +build --workspace_status_command="python3 ./tools/workspace_status.py" build --repository_cache=~/.gerritcodereview/bazel-cache/repository build --action_env=PATH build --disk_cache=~/.gerritcodereview/bazel-cache/cas diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt index cfe0ffb51e..61565f8202 100644 --- a/Documentation/dev-bazel.txt +++ b/Documentation/dev-bazel.txt @@ -19,7 +19,7 @@ To build Gerrit from source, you need: * A Linux or macOS system (Windows is not supported at this time) * A JDK for Java 8|11|... -* Python 2 or 3 +* Python 3 * link:https://github.com/nodesource/distributions/blob/master/README.md[Node.js (including npm),role=external,window=_blank] * Bower (`npm install -g bower`) * link:https://docs.bazel.build/versions/master/install.html[Bazel,role=external,window=_blank] -launched with diff --git a/Documentation/replace_macros.py b/Documentation/replace_macros.py index aaa9223bf0..f2702313db 100755 --- a/Documentation/replace_macros.py +++ b/Documentation/replace_macros.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # coding=utf-8 # Copyright (C) 2013 The Android Open Source Project # diff --git a/contrib/check-valid-commit.py b/contrib/check-valid-commit.py index 763ae3e062..bb018f9bcf 100755 --- a/contrib/check-valid-commit.py +++ b/contrib/check-valid-commit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function diff --git a/contrib/git-push-review b/contrib/git-push-review index b995fc25a6..5a7f664bf3 100755 --- a/contrib/git-push-review +++ b/contrib/git-push-review @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2014 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/contrib/populate-fixture-data.py b/contrib/populate-fixture-data.py index 2341f6c619..774a382aa4 100755 --- a/contrib/populate-fixture-data.py +++ b/contrib/populate-fixture-data.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plugins/codemirror-editor b/plugins/codemirror-editor -Subproject 26cc68d3c5b1210abe6f99fec0f2635d4bcbc89 +Subproject aa2edb431337cc935659ab69d95ca7555cbc787 diff --git a/tools/bzl/js.bzl b/tools/bzl/js.bzl index 04bacaf583..c3186ab0e9 100644 --- a/tools/bzl/js.bzl +++ b/tools/bzl/js.bzl @@ -28,7 +28,7 @@ def _npm_binary_impl(ctx): else: fail("repository %s not in {%s,%s}" % (repository, GERRIT, NPMJS)) - python = ctx.which("python") + python = ctx.which("python3") script = ctx.path(ctx.attr._download_script) args = [python, script, "-o", dest, "-u", url, "-v", sha1] @@ -51,7 +51,7 @@ ComponentInfo = provider() # for use in repo rules. def _run_npm_binary_str(ctx, tarball, args): - python_bin = ctx.which("python") + python_bin = ctx.which("python3") return " ".join([ str(python_bin), str(ctx.path(ctx.attr._run_npm)), @@ -65,7 +65,7 @@ def _bower_archive(ctx): version_name = "%s__version.json" % ctx.name cmd = [ - ctx.which("python"), + ctx.which("python3"), ctx.path(ctx.attr._download_bower), "-b", "%s" % _run_npm_binary_str(ctx, ctx.attr._bower_archive, []), @@ -320,7 +320,7 @@ def _bundle_impl(ctx): app_path = app_path[app_path.index(pkg_dir) + len(pkg_dir):] hermetic_npm_binary = " ".join([ - "python", + "python3", "$p/" + ctx.file._run_npm.path, "$p/" + ctx.file._bundler_archive.path, "--inline-scripts", @@ -371,7 +371,7 @@ def _bundle_impl(ctx): if ctx.attr.split: hermetic_npm_command = "export PATH && " + " ".join([ - "python", + "python3", ctx.file._run_npm.path, ctx.file._crisper_archive.path, "--script-in-head=false", diff --git a/tools/bzl/license-map.py b/tools/bzl/license-map.py index 221ae2f212..555aa1729f 100644 --- a/tools/bzl/license-map.py +++ b/tools/bzl/license-map.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # reads bazel query XML files, to join target names with their licenses. diff --git a/tools/bzl/license.bzl b/tools/bzl/license.bzl index cdb13d074e..7b1375a9ca 100644 --- a/tools/bzl/license.bzl +++ b/tools/bzl/license.bzl @@ -50,7 +50,7 @@ def license_map(name, targets = [], opts = [], json_maps = [], **kwargs): # post process the XML into our favorite format. native.genrule( name = "gen_license_txt_" + name, - cmd = "python $(location //tools/bzl:license-map.py) %s %s %s > $@" % (" ".join(opts), " ".join(json_maps_locations), " ".join(xmls)), + cmd = "python3 $(location //tools/bzl:license-map.py) %s %s %s > $@" % (" ".join(opts), " ".join(json_maps_locations), " ".join(xmls)), outs = [name + ".gen.txt"], tools = tools, **kwargs diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl index d96ffc2692..adea89e6e2 100644 --- a/tools/bzl/maven_jar.bzl +++ b/tools/bzl/maven_jar.bzl @@ -141,7 +141,7 @@ def _maven_jar_impl(ctx): binjar_path = ctx.path("/".join(["jar", binjar])) binurl = url + ".jar" - python = ctx.which("python") + python = ctx.which("python3") script = ctx.path(ctx.attr._download_script) args = [python, script, "-o", binjar_path, "-u", binurl] diff --git a/tools/download_file.py b/tools/download_file.py index 936bcef32c..2af2c0722c 100755 --- a/tools/download_file.py +++ b/tools/download_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2013 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py index c7398a879f..ef20ace618 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/js/download_bower.py b/tools/js/download_bower.py index d541b565a9..2a75fc16ed 100755 --- a/tools/js/download_bower.py +++ b/tools/js/download_bower.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/js/npm_pack.py b/tools/js/npm_pack.py index 57f31661c5..33b38a0280 100755 --- a/tools/js/npm_pack.py +++ b/tools/js/npm_pack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/js/run_npm_binary.py b/tools/js/run_npm_binary.py index bdee5ab489..31f8a54113 100644 --- a/tools/js/run_npm_binary.py +++ b/tools/js/run_npm_binary.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/maven/mvn.py b/tools/maven/mvn.py index 60e9f15608..4ed5bf95d5 100755 --- a/tools/maven/mvn.py +++ b/tools/maven/mvn.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2013 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/util_test.py b/tools/util_test.py index 1a389f552c..ab1133b22e 100644 --- a/tools/util_test.py +++ b/tools/util_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2013 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/version.py b/tools/version.py index 2326757a05..d02fc26c76 100755 --- a/tools/version.py +++ b/tools/version.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2014 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/workspace_status.py b/tools/workspace_status.py index 443c2f05b2..bedc051f28 100644 --- a/tools/workspace_status.py +++ b/tools/workspace_status.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This script will be run by bazel when the build process starts to # generate key-value information that represents the status of the diff --git a/tools/workspace_status_release.py b/tools/workspace_status_release.py index 36535fb70f..b3e72ff76a 100644 --- a/tools/workspace_status_release.py +++ b/tools/workspace_status_release.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This is a variant of the `workspace_status.py` script that in addition to # plain `git describe` implements a few heuristics to arrive at more to the @@ -9,7 +9,7 @@ # # To use it, simply add # -# --workspace_status_command="python ./tools/workspace_status_release.py" +# --workspace_status_command="python3 ./tools/workspace_status_release.py" # # to your bazel command. So for example instead of # @@ -17,11 +17,11 @@ # # use # -# bazel build --workspace_status_command="python ./tools/workspace_status_release.py" release.war +# bazel build --workspace_status_command="python3 ./tools/workspace_status_release.py" release.war # # Alternatively, you can add # -# build --workspace_status_command="python ./tools/workspace_status_release.py" +# build --workspace_status_command="python3 ./tools/workspace_status_release.py" # # to `.bazelrc` in your home directory. # @@ -150,7 +150,7 @@ def print_stamps_for_cwd(name, template): 'tools', 'workspace_status_release.py') if os.path.isfile(workspace_status_script): # directory has own workspace_status_command, so we use stamps from that - for line in run(["python", workspace_status_script]).split('\n'): + for line in run(["python3", workspace_status_script]).split('\n'): if re.search("^STABLE_[a-zA-Z0-9().:@/_ -]*$", line): print(line) else: |