xbot.plugins.pgsql 0.1.0__tar.gz → 0.2.0__tar.gz

{xbot_plugins_pgsql-0.1.0/xbot.plugins.pgsql.egg-info → xbot_plugins_pgsql-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xbot.plugins.pgsql
-Version: 0.1.0
+Version: 0.2.0
 Summary: PostgreSQL library for xbot.framework
 Author-email: zhaowcheng <zhaowcheng@163.com>
 License-Expression: BSD-2-Clause
@@ -21,14 +21,10 @@ Requires-Dist: cli_helpers
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Dynamic: description
+Dynamic: description-content-type
 Dynamic: license-file
 
-<p align="center">
-  <br>English | <a href="README.zh.md">中文</a>
-</p>
-
----
-
 # xbot.plugins.pgsql
 
 PostgreSQL library for xbot.framework.
@@ -78,11 +74,11 @@ with db.transaction():
 db.disconnect()
 ```
 
-<p align="center">
-  <br>中文 | <a href="README.md">English</a>
-</p>
+## Demo Project
+
+Here is a [demo](https://github.com/zhaowcheng/xbot.plugins.pgsql/tree/v0.2.0/demo) project showing how to use `xbot.plugins.pgsql` in a test project.
 
----
+***
 
 # xbot.plugins.pgsql
 
@@ -132,3 +128,7 @@ with db.transaction():
 
 db.disconnect()
 ```
+
+## 示例项目
+
+展示如何在一个测试项目中使用本插件的示例：[demo](https://github.com/zhaowcheng/xbot.plugins.pgsql/tree/v0.2.0/demo)

{xbot_plugins_pgsql-0.1.0 → xbot_plugins_pgsql-0.2.0}/README.md

@@ -52,3 +52,7 @@ with db.transaction():
 
 db.disconnect()
 ```
+
+## Demo Project
+
+Here is a [demo](https://github.com/zhaowcheng/xbot.plugins.pgsql/tree/master/demo) project showing how to use `xbot.plugins.pgsql` in a test project.

{xbot_plugins_pgsql-0.1.0 → xbot_plugins_pgsql-0.2.0}/README.zh.md

@@ -52,3 +52,7 @@ with db.transaction():
 
 db.disconnect()
 ```
+
+## 示例项目
+
+展示如何在一个测试项目中使用本插件的示例：[demo](https://github.com/zhaowcheng/xbot.plugins.pgsql/tree/master/demo)

{xbot_plugins_pgsql-0.1.0 → xbot_plugins_pgsql-0.2.0}/pyproject.toml

@@ -37,7 +37,6 @@ Homepage = "https://github.com/zhaowcheng/xbot.plugins.pgsql"
 Issues = "https://github.com/zhaowcheng/xbot.plugins.pgsql/issues"
 
 [tool.setuptools.dynamic]
-readme = { file = ["README.md", "README.zh.md"], content-type = "text/markdown" }
 version = { attr = "xbot.plugins.pgsql.version.__version__" }
 
 [tool.setuptools.packages.find]

{xbot_plugins_pgsql-0.1.0 → xbot_plugins_pgsql-0.2.0}/setup.py

@@ -1,21 +1,20 @@
 # Build hook: generate long_description from README files,
 # stripping language-switcher headers.
 # All other metadata lives in pyproject.toml.
-import re
 
 from setuptools import setup
 
 
 def _build_long_description() -> str:
-    desc = ""
+    import re
+    parts = []
     for readme in ("README.md", "README.zh.md"):
-        if desc:
-            desc += "\n***\n\n"
         with open(readme, encoding="utf8") as f:
-            desc += "".join(f.readlines()[6:])
-    with open("pyproject.toml", encoding="utf8") as f:
-        m = re.search(r'''^version\s*=\s*["']([^"']+)''', f.read(), re.M)
-        version = m.group(1) if m else ""
+            parts.append("".join(f.readlines()[6:]))
+    desc = "\n***\n\n".join(parts)
+    with open("xbot/plugins/pgsql/version.py", encoding="utf8") as f:
+        m = re.search(r"__version__[^'\"\\]+['\"]([^'\"]+)", f.read())
+        version = m.group(1) if m else "0.1.0"
     desc = desc.replace("/tree/master/", f"/tree/v{version}/")
     return desc
 

{xbot_plugins_pgsql-0.1.0 → xbot_plugins_pgsql-0.2.0}/xbot/plugins/pgsql/pgsql.py

@@ -195,7 +195,7 @@ class PGSQLConnection(object):
                 rc=getattr(e, 'sqlstate', None),
                 cmd=cmd,
             )
-        extra['hook']['more'] = result
+        extra["hook"]["more"] = str(result)
         if expect != None and result.rc != expect.value:
             msg = textwrap.dedent(f"""\
             Expections not met:

xbot_plugins_pgsql-0.2.0/xbot/plugins/pgsql/version.py

@@ -0,0 +1,5 @@
+"""
+Package version.
+"""
+
+__version__: str = '0.2.0'

{xbot_plugins_pgsql-0.1.0 → xbot_plugins_pgsql-0.2.0/xbot.plugins.pgsql.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xbot.plugins.pgsql
-Version: 0.1.0
+Version: 0.2.0
 Summary: PostgreSQL library for xbot.framework
 Author-email: zhaowcheng <zhaowcheng@163.com>
 License-Expression: BSD-2-Clause
@@ -21,14 +21,10 @@ Requires-Dist: cli_helpers
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Dynamic: description
+Dynamic: description-content-type
 Dynamic: license-file
 
-<p align="center">
-  <br>English | <a href="README.zh.md">中文</a>
-</p>
-
----
-
 # xbot.plugins.pgsql
 
 PostgreSQL library for xbot.framework.
@@ -78,11 +74,11 @@ with db.transaction():
 db.disconnect()
 ```
 
-<p align="center">
-  <br>中文 | <a href="README.md">English</a>
-</p>
+## Demo Project
+
+Here is a [demo](https://github.com/zhaowcheng/xbot.plugins.pgsql/tree/v0.2.0/demo) project showing how to use `xbot.plugins.pgsql` in a test project.
 
----
+***
 
 # xbot.plugins.pgsql
 
@@ -132,3 +128,7 @@ with db.transaction():
 
 db.disconnect()
 ```
+
+## 示例项目
+
+展示如何在一个测试项目中使用本插件的示例：[demo](https://github.com/zhaowcheng/xbot.plugins.pgsql/tree/v0.2.0/demo)

xbot_plugins_pgsql-0.1.0/xbot/plugins/pgsql/version.py

@@ -1,5 +0,0 @@
-"""
-Package version.
-"""
-
-__version__: str = '0.1.0'