Merge branch 'master' into mh-improve-format-script

check/mypy

@@ -8,8 +8,8 @@
 ################################################################################
 
 # Get the working directory to the repo root.
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$(git rev-parse --show-toplevel)"
+cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" || exit 1
+cd "$(git rev-parse --show-toplevel)" || exit 1
 
 echo -e -n "\033[31m"
 mypy --config-file=dev_tools/conf/mypy.ini "$@" .

check/pylint

@@ -8,7 +8,7 @@
 ################################################################################
 
 # Get the working directory to the repo root.
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$(git rev-parse --show-toplevel)"
+cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" || exit 1
+cd "$(git rev-parse --show-toplevel)" || exit 1
 
-pylint --rcfile=dev_tools/conf/.pylintrc $@ src dev_tools
+pylint --rcfile=dev_tools/conf/.pylintrc "$@" src dev_tools

check/pytest

@@ -4,7 +4,7 @@
 # Runs pytest on the repository.
 #
 # Usage:
-#     check/pytest [--actually-quiet] [--flags for pytest] [file-paths-relative-to-repo-root]
+#  check/pytest [--actually-quiet] [--flags for pytest] [paths-relative-to-root]
 #
 # The --actually-quiet argument filters out any progress output from pytest.
 #
@@ -14,8 +14,8 @@
 ################################################################################
 
 # Get the working directory to the repo root.
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$(git rev-parse --show-toplevel)"
+cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" || exit 1
+cd "$(git rev-parse --show-toplevel)" || exit 1
 
 rootdir=$(pwd)
 
@@ -30,10 +30,11 @@ for arg in "$@"; do
 done
 
 if [ -z "${ACTUALLY_QUIET}" ]; then
-    pytest -c dev_tools/conf/pytest.ini --rootdir=$rootdir "${PYTEST_ARGS[@]}"
+    pytest -c dev_tools/conf/pytest.ini --rootdir="$rootdir" "${PYTEST_ARGS[@]}"
 else
     # Filter out lines like "...F....x...      [ 42%]", with coloring.
-    pytest -c dev_tools/conf/pytest.ini --rootdir=$rootdir -q --color=yes "${PYTEST_ARGS[@]}" |
+    pytest -c dev_tools/conf/pytest.ini \
+           --rootdir="$rootdir" -q --color=yes "${PYTEST_ARGS[@]}" |
         grep -Pv '^(.\[0m)?[\.FEsx]+(.\[36m)?\s+\[\s*\d+%\](.\[0m)?$'
     exit "${PIPESTATUS[0]}"
 fi

check/pytest-and-incremental-coverage

@@ -27,8 +27,8 @@ cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
 # Figure out which revision to compare against.
-if [ ! -z "$1" ] && [[ $1 != -* ]]; then
-    if [ "$(git cat-file -t $1 2> /dev/null)" != "commit" ]; then
+if [[ -n "$1" && $1 != -* ]]; then
+    if [[ "$(git cat-file -t "$1" 2> /dev/null)" != "commit" ]]; then
         echo -e "\033[31mNo revision '$1'.\033[0m" >&2
         exit 1
     fi
@@ -43,7 +43,9 @@ else
     echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
     exit 1
 fi
+# shellcheck disable=SC2086
 base="$(git merge-base ${rev} HEAD)"
+# shellcheck disable=SC2086
 if [ "$(git rev-parse ${rev})" == "${base}" ]; then
     echo -e "Comparing against revision '${rev}'." >&2
 else

dev_tools/packaging/produce-package.sh

@@ -68,14 +68,15 @@ function confirm() {
 if [ -n "$(git status --short)" ]; then
     echo -e "${RED}WARNING: There are uncommitted git changes."
     echo -e "They won't be included in the package.${RESET}"
+    # shellcheck disable=SC2310
     if ! confirm "${YELLOW}Proceed anyway?${RESET}"; then
         echo "Stopping."
         exit 1
     fi
 fi
 
 tmp_git_dir=$(mktemp -d "/tmp/produce-package-git.XXXXXXXXXXXXXXXX")
-trap "{ rm -rf $tmp_git_dir; }" EXIT
+trap '{ rm -rf "$tmp_git_dir"; }' EXIT
 
 cd "$tmp_git_dir"
 git init --quiet

dev_tools/packaging/publish-dev-package.sh

@@ -56,7 +56,7 @@ if [[ "${EXPECTED_VERSION}" != *dev* ]]; then
   echo -e "\e[31mExpected version must include 'dev'.\e[0m"
   exit 1
 fi
-ACTUAL_VERSION_LINE=$(cat "src/${PROJECT_NAME}/_version.py" | tail -n 1)
+ACTUAL_VERSION_LINE=$(tail -n 1 "src/${PROJECT_NAME}/_version.py")
 if [ "${ACTUAL_VERSION_LINE}" != '__version__ = "'"${EXPECTED_VERSION}"'"' ]; then
   echo -e "\e[31mExpected version (${EXPECTED_VERSION}) didn't match the one in ${PROJECT_NAME}/_version.py (${ACTUAL_VERSION_LINE}).\e[0m"
   exit 1
@@ -103,7 +103,7 @@ cd "$(git rev-parse --show-toplevel)"
 
 # Temporary workspace.
 tmp_package_dir=$(mktemp -d "/tmp/publish-dev-package_package.XXXXXXXXXXXXXXXX")
-trap "{ rm -rf ${tmp_package_dir}; }" EXIT
+trap '{ rm -rf "${tmp_package_dir}"; }' EXIT
 
 # Produce packages.
 dev_tools/packaging/produce-package.sh "${tmp_package_dir}" "${UPLOAD_VERSION}"

dev_tools/packaging/verify-published-package.sh

@@ -57,7 +57,7 @@ REPO_ROOT="$(git rev-parse --show-toplevel)"
 # Temporary workspace.
 tmp_dir=$(mktemp -d "/tmp/verify-published-package.XXXXXXXXXXXXXXXX")
 cd "${tmp_dir}"
-trap "{ rm -rf ${tmp_dir}; }" EXIT
+trap '{ rm -rf "$tmp_dir"; }' EXIT
 
 # Prepare.
 PYTHON_VERSION=python3