From 46d66c095786619e7b85b55766e347adc7292197 Mon Sep 17 00:00:00 2001
From: NAKAZATO Hajime <hajime@kaoriha.org>
Date: Tue, 25 Jul 2023 09:23:09 +0900
Subject: [PATCH] Now Python 3.11 ready.

---
 CHANGELOG.md             |  4 ++++
 pykle_serial/__init__.py |  2 +-
 pykle_serial/serial.py   |  4 ++--
 pyproject.toml           | 34 ++++++++++++++++++++++++++++++++++
 setup.cfg                | 38 --------------------------------------
 setup.py                 |  2 --
 6 files changed, 41 insertions(+), 43 deletions(-)
 create mode 100644 pyproject.toml
 delete mode 100644 setup.cfg
 delete mode 100644 setup.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 045667d..91b7889 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,3 +17,7 @@ is ported from [commit #913a6f4 on Aug 19, 2019](https://github.com/kevin-wells/
 ## Release: Version 0.0.4 : 2023/5/11
 
 Bug fix: Blank profile '' was ignored.
+
+## Release: Version 0.0.5 : 2023/7/12
+
+Now Python 3.11 ready. Drops 3.7 support. (but it still works I guess)
diff --git a/pykle_serial/__init__.py b/pykle_serial/__init__.py
index 3a4b875..3dbd43d 100644
--- a/pykle_serial/__init__.py
+++ b/pykle_serial/__init__.py
@@ -1,4 +1,4 @@
 from .serial import Key, Keyboard, KeyboardMetadata, deserialize, parse, UB_LABEL_MAP
 
-__version_info__ = (0, 0, 4)
+__version_info__ = (0, 0, 5)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/pykle_serial/serial.py b/pykle_serial/serial.py
index 82bbc18..3d79b54 100644
--- a/pykle_serial/serial.py
+++ b/pykle_serial/serial.py
@@ -28,7 +28,7 @@ class Key:
     labels: List[str] = _dcf_list()
     textColor: List[Optional[str]] = dcf(default_factory=_default_factory_list_factory(UB_LABEL_MAP))
     textSize: List[Optional[int]] = dcf(default_factory=_default_factory_list_factory(UB_LABEL_MAP))
-    default: _inner_Key_default = _inner_Key_default()
+    default: _inner_Key_default = dcf(default_factory=_inner_Key_default)
     x: float = 0.
     y: float = 0.
     width: float = 1.
@@ -71,7 +71,7 @@ class KeyboardMetadata:
 
 @dataclass
 class Keyboard:
-    meta: KeyboardMetadata = KeyboardMetadata()
+    meta: KeyboardMetadata = dcf(default_factory=KeyboardMetadata)
     keys: List[Key] = _dcf_list()
 
 
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..4563b1b
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,34 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pykle_serial"
+dynamic = ["version"]
+description = "A Python library for parsing the serialized format used on keyboard-layout-editor.com (KLE)."
+authors = [{name = "Hajime Nakazato", email = "hajime@kaoriha.org"},
+]
+license ={text = "MIT License"}
+readme = "README.md"
+requires-python = ">=3.8"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+dependencies = [
+    "json5 >= 0.9.5",
+]
+
+[project.urls]
+Bug_Tracker = "https://github.com/hajimen/pykle_serial/issues"
+Changelog = "https://github.com/hajimen/pykle_serial/blob/master/CHANGELOG.md"
+
+[tool.setuptools.dynamic]
+version = {attr = "pykle_serial.__version__"}
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index dab5487..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-[metadata]
-name = pykle_serial
-version = attr: pykle_serial.__version__
-author = Hajime Nakazato
-author-email = hajime@kaoriha.org
-home-page = https://github.com/hajimen/pykle_serial
-description = A Python library for parsing the serialized format used on keyboard-layout-editor.com (KLE).
-long-description = file: README.md
-long_description_content_type = text/markdown
-license = MIT
-license-file = LICENSE
-platform = any
-keywords =
-    keyboard-layout-editor.com
-    KLE
-classifiers =
-    Development Status :: 3 - Alpha
-    Intended Audience :: Developers
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-    Programming Language :: Python
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Topic :: Software Development :: Libraries :: Python Modules
-project_urls = 
-    Bug Tracker = https://github.com/hajimen/pykle_serial/issues
-    Changelog = https://github.com/hajimen/pykle_serial/blob/master/CHANGELOG.md
-
-[options]
-python_requires = >= 3.7
-packages = pykle_serial
-test_suite = tests
-setup_requires =
-    setuptools >=38.3.0     # version with most `setup.cfg` bugfixes
-install_requires =
-    json5 >= 0.9.5
-# tests_require =
-#     {tests_require}
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 8bf1ba9..0000000
--- a/setup.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from setuptools import setup
-setup()