Merge branch 'cryptfile-hack' into 'master'

Fix hack incompatibility with cryptfile keyring

See merge request !8
3 jobs for master in 2 minutes and 13 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #45484
docker
test

00:00:50

 
  Build
failed #45485
docker
build-linux

00:01:23

failed #45486
docker-build
build-windows

00:00:01

 
Name Stage Failure
failed
build-linux Build
Traceback (most recent call last):
File "site-packages/PyInstaller/loader/rthooks/pyi_rth_pkgres.py", line 13, in <module>
File "/usr/local/lib/python3.6/site-packages/PyInstaller/loader/pyimod03_importers.py", line 623, in exec_module
exec(bytecode, module.__dict__)
File "site-packages/pkg_resources/__init__.py", line 86, in <module>
ModuleNotFoundError: No module named 'pkg_resources.py2_warn'
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1
failed
build-windows Build
warning: failed to remove build/cli/PKG-00.toc
warning: failed to remove build/cli/PYZ-00.pyz
warning: failed to remove build/cli/EXE-00.toc
warning: failed to remove build/cli/cli.exe.manifest
warning: failed to remove build/cli/Analysis-00.toc
warning: failed to remove build/cli/PKG-00.pkg
warning: failed to remove funkwhale_cli/__pycache__/__main__.cpython-37.pyc
Uploading artifacts for failed job
ERROR: Job failed: exit status 1