New upstream version 8.1.3.upstream/8.1.3

5 files changed, 13 insertions, 25 deletions

diff --git a/scripts/baseline.sh b/scripts/baseline.sh
index d4bf2ba..8fb13e8 100755
--- a/scripts/baseline.sh
+++ b/scripts/baseline.sh
@@ -1,18 +1,16 @@
 #!/bin/bash
 PYVER=$(scripts/getpyver.py short)
-if [[ $PYVER == '3.8' ]]; then
-    if [[ "$1" == "check" ]]; then
-        echo -e "\033[36m>> Downloading baseline for $PYVER...\033[0m"
-        # we only support 3.8
-        wget https://github.com/getnikola/invariant-builds/archive/v$PYVER'.zip'
-        unzip -q 'v'$PYVER'.zip'
-        rm -rf baseline$PYVER
-        mv invariant-builds-$PYVER baseline
-        rm 'v'$PYVER'.zip'
+if [[ "$1" == "check" ]]; then
+    echo -e "\033[36m>> Downloading baseline for $PYVER...\033[0m"
+    wget https://github.com/getnikola/invariant-builds/archive/v$PYVER'.zip'
+    if [[ $? != 0 ]]; then
+        echo -e "\033[31;1m>> Cannot download baseline for $PYVER.\033[0m"
+        exit 1
     fi
-else
-    echo -e "\033[35m>> Version $PYVER does not support baseline testing.\033[0m"
-    exit 0
+    unzip -q 'v'$PYVER'.zip'
+    rm -rf baseline$PYVER
+    mv invariant-builds-$PYVER baseline
+    rm 'v'$PYVER'.zip'
 fi
 nikola init -qd nikola-baseline-build
 cd nikola-baseline-build
diff --git a/scripts/codacy_coverage.sh b/scripts/codacy_coverage.sh
deleted file mode 100755
index 3ba43ee..0000000
--- a/scripts/codacy_coverage.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-PYVER=$(scripts/getpyver.py short)
-if [[ $PYVER == '3.6' ]]; then
-    if [[ "x$CODACY_PROJECT_TOKEN" == "x" ]]; then
-        echo "Warning: Codacy token not available (PR from non-member), unable to send coverage info."
-        exit 0
-    fi
-    coverage xml
-    python-codacy-coverage -r coverage.xml
-fi
diff --git a/scripts/debug_rebuilds/README.md b/scripts/debug_rebuilds/README.md
index 05305a9..58e89db 100644
--- a/scripts/debug_rebuilds/README.md
+++ b/scripts/debug_rebuilds/README.md
@@ -6,6 +6,6 @@ To debug unexpected Nikola rebuilds:
 4. Run `python step2_analyze_py_files.py | tee analysis.txt`. It will compare the two .py files, using `cc_debug.sqlite3` and `{first,second}_dump.py`.
 5. Compare the produced dictionaries. Note that you will probably need a character-level diff tool, <https://prettydiff.com/> is pretty good as long as you change CSS for `li.replace` to `word-break: break-all; white-space: pre-wrap;`
 
-Copyright © 2019-2020, Chris Warrick.
+Copyright © 2019-2021, Chris Warrick.
 Portions Copyright © Eduardo Nafuel Schettino and Doit Contributors.
 License of .py files is MIT (same as Nikola)
diff --git a/scripts/release b/scripts/release
index e7b1aaa..852fa30 100755
--- a/scripts/release
+++ b/scripts/release
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 # The Release Script
 # Based on Python Project Template by Chris Warrick
-# Copyright © 2013-2020, Chris Warrick.
+# Copyright © 2013-2021, Chris Warrick.
 # All rights reserved.
 
 # Permission is hereby granted, free of charge, to any
diff --git a/scripts/update-npm-assets.sh b/scripts/update-npm-assets.sh
index b7da0a5..40b3506 100755
--- a/scripts/update-npm-assets.sh
+++ b/scripts/update-npm-assets.sh
@@ -31,7 +31,7 @@ pushd nikola/data/themes/base/assets/js
 ln -sf ../../../../../../npm_assets/node_modules/luxon/build/global/luxon.min.js .
 ln -sf ../../../../../../npm_assets/node_modules/html5shiv/dist/html5shiv-printshiv.min.js .
 ln -sf ../../../../../../npm_assets/node_modules/html5shiv/dist/html5shiv-printshiv.min.js html5.js
-git add moment-with-locales.min.js html5.js html5shiv-printshiv.min.js
+git add luxon.min.js html5.js html5shiv-printshiv.min.js
 popd
 
 # Link jQuery to bootstrap theme