Merge remote-tracking branch 'upstream/main' into beautify

2021-12-22 17:06:40 +03:00
parent b675085c75 c2b1543128
commit 46dcc993b1
2 changed files with 4 additions and 1 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -44,7 +44,7 @@ repos:
        types: [shell]

  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.1
+    rev: v0.8.0.2
    hooks:
      - id: shellcheck
        args: [-x]
--- a/build/bench/Dockerfile
+++ b/build/bench/Dockerfile
@@ -13,6 +13,9 @@ RUN apt-get update \
    postgresql-client \
    gettext-base \
    wget \
+    # for ERPNext v12
+    # TODO: Remove after v12 is deprecated
+    python2 \
    # for PDF
    libssl-dev \
    fonts-cantarell \