nonebot-plugin-bililive 2.1.0__tar.gz → 2.1.1__tar.gz

{nonebot_plugin_bililive-2.1.0 → nonebot_plugin_bililive-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-bililive
-Version: 2.1.0
+Version: 2.1.1
 Summary: Push bilibili dynamics and live notifications to QQ with NoneBot2.
 Keywords: nonebot,nonebot2,nonebot-plugin,bilibili,onebot,onebot-v11
 Author-Email: Akiyy_Lab <2806578374@qq.com>

nonebot_plugin_bililive-2.1.1/nonebot-plugin-bililive/__init__.py

@@ -0,0 +1,3 @@
+from nonebot_plugin_bililive import VERSION, __plugin_meta__, __version__, plugin_config
+
+__all__ = ["__plugin_meta__", "__version__", "VERSION", "plugin_config"]

{nonebot_plugin_bililive-2.1.0 → nonebot_plugin_bililive-2.1.1}/nonebot_plugin_bililive/__init__.py

@@ -1,9 +1,13 @@
+from nonebot import require
 from nonebot.plugin import PluginMetadata
 from nonebot.plugin.manager import PluginLoader
 
 from .config import Config, plugin_config
 from .version import VERSION, __version__
 
+require("nonebot_plugin_localstore")
+require("nonebot_plugin_apscheduler")
+
 
 def bootstrap_plugin(force: bool = False):
     if force or isinstance(globals()["__loader__"], PluginLoader):

{nonebot_plugin_bililive-2.1.0 → nonebot_plugin_bililive-2.1.1}/nonebot_plugin_bililive/utils/__init__.py

@@ -7,7 +7,8 @@ from typing import Annotated
 
 import httpx
 import nonebot
-from nonebot import logger, require
+import nonebot_plugin_localstore as store
+from nonebot import logger
 from nonebot import on_command as _on_command
 from nonebot.adapters.onebot.v11 import (
     ActionFailed,
@@ -27,9 +28,6 @@ from nonebot.rule import Rule
 
 from ..config import plugin_config
 
-require("nonebot_plugin_localstore")
-import nonebot_plugin_localstore as store
-
 
 def get_data_dir():
     """获取插件数据目录。"""
@@ -303,8 +301,6 @@ def on_startup():
 def on_command(cmd, *args, **kwargs):
     return _on_command(plugin_config.bililive_command_prefix + cmd, *args, **kwargs)
 
-
-require("nonebot_plugin_apscheduler")
 from nonebot_plugin_apscheduler import scheduler  # noqa
 
 from .browser import (  # noqa

{nonebot_plugin_bililive-2.1.0 → nonebot_plugin_bililive-2.1.1}/nonebot_plugin_bililive/version.py

@@ -1,4 +1,4 @@
 from packaging.version import Version
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 VERSION = Version(__version__)

{nonebot_plugin_bililive-2.1.0 → nonebot_plugin_bililive-2.1.1}/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "msvc-runtime>=14.34.31931; sys_platform == \"win32\"",
 ]
 dynamic = []
-version = "2.1.0"
+version = "2.1.1"
 
 [project.license]
 text = "AGPL-3.0-or-later"
@@ -51,6 +51,7 @@ Documentation = "https://github.com/Akiyy-dev/nonebot-plugin-bililive#readme"
 Issues = "https://github.com/Akiyy-dev/nonebot-plugin-bililive/issues"
 
 [project.entry-points."nonebot.plugin"]
+nonebot-plugin-bililive = "nonebot_plugin_bililive"
 nonebot_plugin_bililive = "nonebot_plugin_bililive"
 
 [project.scripts]
@@ -76,6 +77,7 @@ path = "nonebot_plugin_bililive/version.py"
 [tool.pdm.build]
 includes = [
     "nonebot_plugin_bililive",
+    "nonebot-plugin-bililive",
 ]
 
 [tool.pdm.dev-dependencies]

{nonebot_plugin_bililive-2.1.0 → nonebot_plugin_bililive-2.1.1}/tests/test_maintenance.py

@@ -56,6 +56,7 @@ with patch("nonebot.get_driver", return_value=DummyDriver()), patch(
     db_module = import_module("nonebot_plugin_bililive.database.db")
     web_dynamic = import_module("nonebot_plugin_bililive.libs.dynamic.web")
     plugin_entry = import_module("nonebot_plugin_bililive")
+    hyphen_plugin_entry = import_module("nonebot-plugin-bililive")
     DB = db_module.DB
     models = import_module("nonebot_plugin_bililive.database.models")
     Group = models.Group
@@ -102,6 +103,7 @@ class PluginEntryTests(unittest.TestCase):
         self.assertEqual(plugin_entry.__plugin_meta__.config, Config)
         self.assertEqual(plugin_entry.__plugin_meta__.extra["author"], "Akiyy_Lab")
         self.assertEqual(plugin_entry.__version__, core_version.__version__)
+        self.assertIs(hyphen_plugin_entry.__plugin_meta__, plugin_entry.__plugin_meta__)
 
     def test_default_data_dir_uses_localstore(self):
         expected = _get_plugin_data_dir() / "data.sqlite3"
@@ -111,12 +113,19 @@ class PluginEntryTests(unittest.TestCase):
     def test_pyproject_uses_direct_plugin_entrypoint(self):
         pyproject = Path("pyproject.toml").read_text(encoding="utf-8")
 
+        self.assertIn(
+            'nonebot-plugin-bililive = "nonebot_plugin_bililive"',
+            pyproject,
+        )
         self.assertIn(
             'nonebot_plugin_bililive = "nonebot_plugin_bililive"',
             pyproject,
         )
-        self.assertNotIn('nonebot-plugin-bililive = "nonebot_plugin_bililive"', pyproject)
         self.assertIn('bililive = "nonebot_plugin_bililive.__main__:main"', pyproject)
+        self.assertIn(
+            'includes = ["nonebot_plugin_bililive", "nonebot-plugin-bililive"]',
+            pyproject,
+        )
         self.assertNotIn('nonebot2[fastapi]>=', pyproject)
         self.assertNotIn('bilireq>=', pyproject)