diff --git a/examples/research/mpv_render.py b/examples/research/mpv_render.py index b287c15563..764b85508f 100644 --- a/examples/research/mpv_render.py +++ b/examples/research/mpv_render.py @@ -5,7 +5,7 @@ # HELP: currently, we need import GL module,otherwise it will raise seg fault on Linux(Ubuntu 18.04) # from OpenGL import GL # noqa -from mpv import MPV, OpenGlCbGetProcAddrFn, MpvRenderContext +from feeluown.mpv import MPV, OpenGlCbGetProcAddrFn, MpvRenderContext def get_proc_addr(_, name): diff --git a/feeluown/gui/widgets/mpv_.py b/feeluown/gui/widgets/mpv_.py index b96625c9e4..976232dc2d 100644 --- a/feeluown/gui/widgets/mpv_.py +++ b/feeluown/gui/widgets/mpv_.py @@ -4,7 +4,9 @@ from PyQt5.QtCore import QMetaObject, pyqtSlot, QSize from PyQt5.QtOpenGL import QGLContext -from mpv import MpvRenderContext, OpenGlCbGetProcAddrFn, _mpv_set_property_string +from feeluown.mpv import ( + MpvRenderContext, OpenGlCbGetProcAddrFn, _mpv_set_property_string +) from feeluown.gui.widgets.video import VideoOpenGLWidget from feeluown.gui.helpers import IS_MACOS diff --git a/mpv.py b/feeluown/mpv.py similarity index 100% rename from mpv.py rename to feeluown/mpv.py diff --git a/feeluown/player/mpvplayer.py b/feeluown/player/mpvplayer.py index 5f61767685..b1e4379b5b 100644 --- a/feeluown/player/mpvplayer.py +++ b/feeluown/player/mpvplayer.py @@ -4,7 +4,7 @@ import math import os -from mpv import ( # type: ignore +from feeluown.mpv import ( # type: ignore MPV, MpvEventID, MpvEventEndFile, diff --git a/setup.cfg b/setup.cfg index cc7c96d56d..faa5729ea8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,6 +9,7 @@ ignore = E402 [flake8] max-line-length = 89 +exclude = feeluown/mpv.py [yapf] column_limit = 89 @@ -36,5 +37,5 @@ addopts = -q --cov-report= --cov=feeluown --doctest-modules -[mypy-mpv] +[mypy-feeluown.mpv] ignore_errors = True diff --git a/setup.py b/setup.py index bf1b491fa8..522076c23f 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,6 @@ author='feeluown', author_email='yinshaowen241@gmail.com', packages=find_packages(exclude=('tests*',)), - py_modules=['mpv'], package_data={ '': ['nowplaying/linux/*.xml', 'gui/assets/icons/*.png',