Upgrade python to v3.11

.pre-commit-config.yaml

@@ -3,4 +3,4 @@ repos:
     rev: 23.3.0
     hooks:
       - id: black
-        language_version: python3.10
+        language_version: python3.11

Dockerfile

@@ -49,8 +49,8 @@ RUN echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~apl/.bash_profile \
 # install python
 USER apl
 RUN . ~/.bash_profile \
- && pyenv install 3.10.4 \
- && pyenv global 3.10.4 \
+ && pyenv install 3.11.2 \
+ && pyenv global 3.11.2 \
  && pip install --upgrade pip
 
 # install poetry

README.md

@@ -20,7 +20,7 @@ English | [日本語](./README_JA.md)
 
 ## Dependencies
 
-- [Python3](https://www.python.org/downloads/release/python-3811/) - version 3.10
+- [Python3](https://www.python.org/downloads/release/python-3811/) - version 3.11
 - [PostgreSQL](https://www.postgresql.org/) - version 13
 - [GoQuorum](https://github.com/ConsenSys/quorum)
   - We support the official GoQuorum node of [ibet-Network](https://github.com/BoostryJP/ibet-Network).
@@ -50,7 +50,7 @@ English | [日本語](./README_JA.md)
 
 Install python packages with:
 ```bash
-$ poetry install --no-root --only main -E explorer
+$ poetry install --no-root --only main -E ibet-explorer
 ```
 
 ### Install pre-commit hook

README_JA.md

@@ -21,7 +21,7 @@
 
 ## 依存
 
-- [Python3](https://www.python.org/downloads/release/python-3811/) - バージョン 3.10
+- [Python3](https://www.python.org/downloads/release/python-3811/) - バージョン 3.11
 - [PostgreSQL](https://www.postgresql.org/) - バージョン 13
 - [GoQuorum](https://github.com/ConsenSys/quorum)
   - [ibet-Network](https://github.com/BoostryJP/ibet-Network) の公式の GoQuorum をサポートしています。
@@ -51,7 +51,7 @@
 
 以下のコマンドで Python パッケージをインストールします。
 ```bash
-$ poetry install --no-root --only main -E explorer
+$ poetry install --no-root --only main -E ibet-explorer
 ```
 
 ### pre-commit hookのインストール

app/routers/share.py

@@ -862,7 +862,7 @@ def list_redeem_history(
         query = query.limit(limit)
     if offset is not None:
         query = query.offset(offset)
-    _events: List[IDXIssueRedeem] = query.all()
+    _events: List[Type[IDXIssueRedeem]] = query.all()
 
     history = []
     for _event in _events:
@@ -1011,7 +1011,7 @@ def list_all_redeem_upload(
     if offset is not None:
         query = query.offset(offset)
 
-    _upload_list: list[BatchIssueRedeemUpload] = query.all()
+    _upload_list: list[Type[BatchIssueRedeemUpload]] = query.all()
 
     uploads = []
     for _upload in _upload_list:
@@ -1812,7 +1812,7 @@ def list_all_personal_info_batch_registration_uploads(
     if offset is not None:
         query = query.offset(offset)
 
-    _upload_list: list[BatchRegisterPersonalInfoUpload] = query.all()
+    _upload_list: list[Type[BatchRegisterPersonalInfoUpload]] = query.all()
 
     uploads = []
     for _upload in _upload_list:

cmd/explorer/pyproject.toml

@@ -9,20 +9,20 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "3.10.4"
+python = "3.11.2"
 
 [tool.poetry.scripts]
 ibet-explorer = "src.main:app"
 
 [tool.mypy]
-python_version = "3.10"
+python_version = "3.11"
 no_strict_optional = true
 ignore_missing_imports = true
 check_untyped_defs = true
 
 [tool.black]
 includes = "src"
-target-version = ['py310']
+target-version = ['py311']
 line-length = 120
 
 [build-system]

cmd/explorer/src/gui/consts.py

@@ -16,7 +16,7 @@
 
 SPDX-License-Identifier: Apache-2.0
 """
-from enum import Enum
+from enum import StrEnum
 
 UP = "\u2191"
 DOWN = "\u2193"
@@ -31,7 +31,7 @@
 INFO = "[blue]:information:[/]"
 
 
-class ID(str, Enum):
+class ID(StrEnum):
     BLOCK_CONNECTED = "block_connected"
     BLOCK_CURRENT_BLOCK_NUMBER = "block_current_block_number"
     BLOCK_IS_SYNCED = "block_is_synced"

cmd/explorer/src/gui/widget/menu.py

@@ -43,11 +43,11 @@ class Menu(TuiWidget):
 
     def compose(self) -> ComposeResult:
         yield Button(
-            Text.from_markup("\[t] Show Transactions :package:"),
+            Text.from_markup(r"\[t] Show Transactions :package:"),
             id=ID.MENU_SHOW_TX,
             classes="menubutton",
         )
-        yield Button("\[c] Cancel", id=ID.MENU_CANCEL, classes="menubutton")
+        yield Button(r"\[c] Cancel", id=ID.MENU_CANCEL, classes="menubutton")
 
     def show(self, ix: MenuInstruction):
         self.ix = ix

migrations/manage.py

@@ -33,7 +33,7 @@ def reset():
     meta.bind = engine
     table = Table("alembic_version", meta, schema=get_db_schema())
     if table.exists():
-        table.drop()
+        table.drop(bind=engine)
 
 
 argv = sys.argv

pyproject.toml

@@ -7,7 +7,7 @@ license = "Apache License, Version 2.0"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "3.10.4"
+python = "3.11.2"
 alembic = "~1.9.4"
 boto3 = "~1.26.82"
 coincurve = "~18.0.0"

tests/Dockerfile

@@ -49,8 +49,8 @@ RUN echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~apl/.bash_profile \
 # install python
 USER apl
 RUN . ~/.bash_profile \
- && pyenv install 3.10.4 \
- && pyenv global 3.10.4 \
+ && pyenv install 3.11.2 \
+ && pyenv global 3.11.2 \
  && pip install --upgrade pip
 
 # install poetry

tests/test_batch_processor_batch_issue_redeem.py

@@ -18,7 +18,7 @@
 """
 import logging
 import uuid
-from typing import List
+from typing import List, Type
 from unittest.mock import ANY, patch
 
 import pytest
@@ -823,29 +823,29 @@ def test_error_4(
             processor.process()
 
         # Assertion: DB
-        _upload_1_after: BatchIssueRedeemUpload = (
+        _upload_1_after: Type[BatchIssueRedeemUpload] = (
             db.query(BatchIssueRedeemUpload)
             .filter(BatchIssueRedeemUpload.upload_id == upload_1_id)
             .first()
         )
         assert _upload_1_after.processed == True
 
-        _upload_1_data_after: List[BatchIssueRedeem] = (
+        _upload_1_data_after: List[Type[BatchIssueRedeem]] = (
             db.query(BatchIssueRedeem)
             .filter(BatchIssueRedeem.upload_id == upload_1_id)
             .all()
         )
         assert len(_upload_1_data_after) == 1
         assert _upload_1_data_after[0].status == 2
 
-        _upload_2_after: BatchIssueRedeemUpload = (
+        _upload_2_after: Type[BatchIssueRedeemUpload] = (
             db.query(BatchIssueRedeemUpload)
             .filter(BatchIssueRedeemUpload.upload_id == upload_2_id)
             .first()
         )
         assert _upload_2_after.processed == True
 
-        _upload_2_data_after: List[BatchIssueRedeem] = (
+        _upload_2_data_after: List[Type[BatchIssueRedeem]] = (
             db.query(BatchIssueRedeem)
             .filter(BatchIssueRedeem.upload_id == upload_2_id)
             .all()