diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml new file mode 100644 index 000000000..45bb0f646 --- /dev/null +++ b/.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" diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 094492b7f..a08766288 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -19,6 +19,7 @@ support site, it would be great if you could add your name below as well. ******************** Erez Volk +Aristotelis P. AMBOSS MD Inc. ******************** diff --git a/build b/build index af2421d4a..17d2f5ccd 100755 --- a/build +++ b/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 diff --git a/helpers/rename-with-buildhash b/helpers/rename-with-buildhash new file mode 100755 index 000000000..20663e129 --- /dev/null +++ b/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/* + + diff --git a/pylib/anki/storage.py b/pylib/anki/storage.py index 7556298fb..f95722cfd 100644 --- a/pylib/anki/storage.py +++ b/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( diff --git a/scripts.inc b/scripts.inc index f04e28148..58e96718b 100644 --- a/scripts.inc +++ b/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