Merge branch 'master' into ankiaddon-filetype-handling

.github/workflows/contrib.yml

@@ -0,0 +1,13 @@
+name: Author in CONTRIBUTORS
+
+on: [pull_request]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Check
+        run: |
+          headAuthor=$(git log -1 --pretty=format:'%ae')
+          git log --pretty=format:'%ae' CONTRIBUTORS | grep -q "$headAuthor"

CONTRIBUTORS

@@ -19,6 +19,7 @@ support site, it would be great if you could add your name below as well.
 ********************
 
 Erez Volk <erez.volk@gmail.com>
+Aristotelis P. <glutanimate.com/contact>
 AMBOSS MD Inc. <https://www.amboss.com/>
 
 ********************

build

@@ -11,7 +11,4 @@ for dir in $DEVEL; do
   (cd $dir && make build BUILDFLAGS="$BUILDFLAGS")
 done
 
-# add build hash to outputs
-ver=$(cat meta/version)
-hash=$(cat meta/buildhash)
-(cd dist && rename "s/$ver/${ver}+$hash/" *.whl)
+helpers/rename-with-buildhash

helpers/rename-with-buildhash

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# add buildhash to output files
+top=$(dirname $0)/..
+ver=$(cat $top/meta/version)
+hash=$(cat $top/meta/buildhash)
+rename "s/-${ver}-/-${ver}+${hash}-/" $top/dist/*
+
+

pylib/anki/storage.py

@@ -23,7 +23,7 @@ from anki.utils import intTime, isWin
 
 
 class ServerData:
-    minutes_west: Optional[int]
+    minutes_west: Optional[int] = None
 
 
 def Collection(

scripts.inc

@@ -13,7 +13,7 @@ fi
 
 # activate venv
 if [ ! -d pyenv ]; then
-    python -m venv pyenv
+    python3 -m venv pyenv
     . pyenv/bin/activate
     pip install --upgrade pip setuptools
 else