diff --git a/INSTALL.md b/INSTALL.md index 6ac51855..3884ebd4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -259,16 +259,12 @@ clone the repository, install the python dependencies, compile and install: git clone --recursive https://github.com/mirukana/mirage cd mirage pip3 install --user -Ur requirements.txt -pip3 install --user -U uvloop==0.14.0 qmake mirage.pro make sudo make install ``` -`uvloop` brings performance improvements, but can be skipped -if you have trouble installing it. - If everything went fine, run `mirage` to start. diff --git a/TODO.md b/TODO.md index 6916d2a9..e1c78905 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,7 @@ # TODO +- highlight messages being responded to +- highlight messages with mention - add room members loading indicator - fix main pane appearance when collapsed diff --git a/packaging/appimage/build.sh b/packaging/appimage/build.sh index 9d2a3392..daa471ee 100755 --- a/packaging/appimage/build.sh +++ b/packaging/appimage/build.sh @@ -131,7 +131,7 @@ get_app_and_pip_dependencies() { cd mirage pip3 install --user -Ur requirements.txt - pip3 install --user -U uvloop==0.14.0 certifi + pip3 install --user -U certifi } diff --git a/packaging/flatpak/mirage.flatpak.yaml b/packaging/flatpak/mirage.flatpak.yaml index 8be86ce4..25a9354d 100644 --- a/packaging/flatpak/mirage.flatpak.yaml +++ b/packaging/flatpak/mirage.flatpak.yaml @@ -656,15 +656,6 @@ modules: - type: file url: https://files.pythonhosted.org/packages/96/da/2ebf30d2fdf0f4dc949b4935e408aaa9cca948963e55ea3c99730b1f74c0/unpaddedbase64-1.1.0-py2.py3-none-any.whl sha256: 81cb4eaaa28cc6a282dd3f2c3855eaa1fbaafa736b5ee64df69889e20540a339 -- name: python3-uvloop - buildsystem: simple - build-commands: - - pip3 install --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST} - uvloop==0.14.0 - sources: - - type: file - url: https://files.pythonhosted.org/packages/84/2e/462e7a25b787d2b40cf6c9864a9e702f358349fc9cfb77e83c38acb73048/uvloop-0.14.0.tar.gz - sha256: 123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e - name: python3-webencodings buildsystem: simple build-commands: diff --git a/packaging/flatpak/requirements.flatpak.txt b/packaging/flatpak/requirements.flatpak.txt index 07199972..0ed08d33 100644 --- a/packaging/flatpak/requirements.flatpak.txt +++ b/packaging/flatpak/requirements.flatpak.txt @@ -1,5 +1,4 @@ multidict == 4.5.2 -uvloop == 0.14.0 pytest-runner setuptools-scm diff --git a/src/backend/qml_bridge.py b/src/backend/qml_bridge.py index ee311fd2..0efe026b 100644 --- a/src/backend/qml_bridge.py +++ b/src/backend/qml_bridge.py @@ -1,7 +1,5 @@ # SPDX-License-Identifier: LGPL-3.0-or-later -"""Install `uvloop` if possible and provide a `QMLBridge`.""" - # WARNING: make sure to not top-level import the media_cache module here, # directly or indirectly via another module import (e.g. backend). # See https://stackoverflow.com/a/55918049 @@ -18,13 +16,6 @@ from typing import Coroutine, Sequence from .pyotherside_events import CoroutineDone, LoopException -try: - import uvloop -except ModuleNotFoundError: - log.warning("uvloop module not found, using slower default asyncio loop") -else: - uvloop.install() - class QMLBridge: """Setup asyncio and provide synchronous methods to call coroutines.