update

Author: hsz1273327

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.2
+
+1. 修复bug
+2. 更新jupyter相关依赖项
+
 # 0.0.1
 
 1. 增加类型注释

README.md

@@ -19,9 +19,9 @@ keywords: jupyter,jupyter-kernel,postgresql,sql
 1. 加入常用可视化功能
 2. 改用魔术命令配置连接信息
 
-<!-- ## 安装
+## 安装
 
-`pip install postgresql_kernel` -->
+`pip install postgresql_kernel`
 
 ## 使用
 

postgresql_kernel/__init__.py

@@ -1,6 +1,6 @@
 """An PG kernel for Jupyter"""
 
-__version__ = '0.0.1'
+__version__ = '0.0.2'
 
 from .kernel import PostgreSQLKernel
 

postgresql_kernel/kernel.py

@@ -7,17 +7,17 @@
 from pathlib import Path
 from select import select
 
-from traitlets import Dict
+from traitlets import Dict as tDict
 from metakernel import MetaKernel, ExceptionWrapper
 # from IPython.display import Image, SVG
 
 from tabulate import tabulate
 import psycopg2
 from psycopg2 import Error, OperationalError
 from psycopg2.extensions import (
-    QueryCanceledError, POLL_OK, POLL_READ, POLL_WRITE, STATUS_BEGIN, Union
+    QueryCanceledError, POLL_OK, POLL_READ, POLL_WRITE, STATUS_BEGIN
 )
-from typing import Any, List, Optional, TypedDict, Iterable, Sequence, Mapping, Union, Tuple
+from typing import Any, List, Optional, TypedDict, Iterable, Sequence, Mapping, Union, Tuple, Dict
 from . import __version__
 
 KernelDictType = TypedDict(
@@ -79,7 +79,7 @@ def get_kernel_json() -> KernelDictType:
     return data
 
 
-def wait_select_inter(conn: psycopg2.connection) -> None:
+def wait_select_inter(conn: "psycopg2.connection") -> None:
     """等待连接建立.
 
     Args:
@@ -111,7 +111,7 @@ class MissingConnection(Exception):
 
 
 class RowsDisplay:
-    def __init__(self, header: Union[str, Mapping[str, str], Sequence[str]], rows: Union[Mapping[str, Iterable], Iterable[Iterable]]) -> None:
+    def __init__(self, header: Union[str, Dict[str, str], Sequence[str]], rows: Union[Mapping[str, Iterable], Iterable[Iterable]]) -> None:
         self.header = header
         self.rows = rows
 
@@ -132,13 +132,13 @@ class PostgreSQLKernel(MetaKernel):
     implementation_version: str = __version__
     language: str = 'sql'
     help_links: List[HelpLinkDictType] = HELP_LINKS
-    kernel_json: Dict = Dict(get_kernel_json()).tag(config=True)
+    kernel_json: tDict = tDict(get_kernel_json()).tag(config=True)
     _language_version: Optional[str] = None
     _banner: Optional[str] = None
 
     _conn_string: str
     _autocommit: bool
-    _conn: Optional[psycopg2.connection]
+    _conn: Optional["psycopg2.connection"]
 
     @property
     def language_version(self) -> str:
@@ -160,7 +160,7 @@ def banner(self) -> Optional[str]:
             if self._conn is None:
                 return 'not yet connected to a database'
             res = self.fetchone('SELECT VERSION();')
-            if res and len(res) >= 1:
+            if res and len(res) >= 1 and isinstance(res[0], str):
                 self._banner = res[0]
         return self._banner
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = postgresql_kernel
-version = 0.0.1
+version = 0.0.2
 author = hsz
 author_email = hsz1273327@gmail.com
 description = metakernel for postgres_kernel
@@ -33,11 +33,11 @@ setup_requires =
 	wheel >= 0.36.2
 	setuptools >= 47.1.0
 install_requires = 
-	metakernel >=0.24.0
+	metakernel >= 0.24.0
 	psycopg2-binary >= 2.9.3
 	tabulate >= 0.8.9
-	jupyter_client >=4.3.0
-	ipykernel >= 6.0.1
+	jupyter_client >= 7.1.1
+	ipykernel >= 6.7.0
 
 [options.packages.find]
 include =