Merge pull request #1 from hiwakaba/main

Release 1.0.2

HISTORY.rst

@@ -2,6 +2,16 @@
 History
 =======
 
+1.0.2 (2024-09-26)
+-------------------
+
+* Fixes lint errors
+
+1.0.1 (2024-09-25)
+-------------------
+
+* Fixes resource API bugs
+
 1.0.0 (2024-08-28)
 -------------------
 

MANIFEST.in

@@ -5,7 +5,6 @@ include LICENSE
 include README.rst
 
 recursive-include k2hr3client *
-recursive-include tests *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 

Makefile

@@ -138,13 +138,12 @@ dist: clean version ## builds source and wheel package
 	@echo 'source  ' ${SOURCE_VERSION}
 	@echo 'history ' ${HISTORY_VERSION}
 	@if test "${SOURCE_VERSION}" = "${HISTORY_VERSION}" ; then \
-		python3 setup.py sdist ; \
-		python3 setup.py bdist_wheel ; \
+		python3 -m build ; \
 		ls -l dist ; \
 	fi
 
 install: clean ## install the package to the active Python's site-packages
-	python3 setup.py install
+	python3 -m pip install .
 
 #
 # Local variables:

docs/locale/ja/LC_MESSAGES/history.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: k2hr3client \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-01 13:58+0900\n"
+"POT-Creation-Date: 2024-09-26 10:42+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: ja\n"
@@ -26,18 +26,34 @@ msgid "History"
 msgstr "歴史"
 
 #: ../../../HISTORY.rst:6
-msgid "1.0.0 (2024-08-28)"
+msgid "1.0.2 (2024-09-26)"
 msgstr ""
 
 #: ../../../HISTORY.rst:8
+msgid "Fixes lint errors"
+msgstr "静的解析ツールのエラーを修正"
+
+#: ../../../HISTORY.rst:11
+msgid "1.0.1 (2024-09-25)"
+msgstr ""
+
+#: ../../../HISTORY.rst:13
+msgid "Fixes resource API bugs"
+msgstr "Resource APIの不具合を修正"
+
+#: ../../../HISTORY.rst:16
+msgid "1.0.0 (2024-08-28)"
+msgstr ""
+
+#: ../../../HISTORY.rst:18
 msgid "Supports the other APIs"
 msgstr "他のAPIをサポート"
 
-#: ../../../HISTORY.rst:11
+#: ../../../HISTORY.rst:21
 msgid "0.0.1 (2020-08-28)"
 msgstr ""
 
-#: ../../../HISTORY.rst:13
+#: ../../../HISTORY.rst:23
 msgid "Supports Token, Resource, Policy and Role API"
 msgstr "トークン、リソース、ポリシーおよびロールAPIをサポート"
 

docs/locale/ja/LC_MESSAGES/k2hr3client.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: k2hr3client \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-01 13:58+0900\n"
+"POT-Creation-Date: 2024-09-26 10:42+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: ja\n"
@@ -217,7 +217,8 @@ msgid "K2hr3Http sends a http/https request to the K2hr3 WebAPI."
 msgstr "K2HR3 WebAPIにHTTP/HTTPSリクエストを送信する"
 
 #: k2hr3client.http.K2hr3Http:3 of
-msgid "Most oif the members are set by setter methods only one time."
+#, fuzzy
+msgid "Most of the members are set by setter methods only one time."
 msgstr "ほとんどのメンバーは一度だけセットされます"
 
 #: k2hr3client.http.K2hr3Http.DELETE:1 of
@@ -654,3 +655,22 @@ msgstr ""
 msgid "Module contents"
 msgstr ""
 
+#: k2hr3client.get_version:1 of
+#, fuzzy
+msgid "Return a version of the package."
+msgstr "APIバージョン文字列を返す"
+
+#: ../../k2hr3client.rst
+#, fuzzy
+msgid "Returns"
+msgstr "データを返す"
+
+#: k2hr3client.get_version:3 of
+msgid "version"
+msgstr "バージョン"
+
+#: ../../k2hr3client.rst
+#, fuzzy
+msgid "Return type"
+msgstr "データを返す"
+

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = [ "setuptools>=61.0", "wheel" ]
+requires = [ "setuptools" ]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -37,6 +37,16 @@ Repository = "https://github.com/yahoojapan/k2hr3client_python.git"
 "Bug Tracker" = "https://github.com/yahoojapan/k2hr3client_python/issues"
 Changelog = "https://github.com/yahoojapan/k2hr3client_python/blob/master/HISTORY.rst"
 
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+"*" = ["*.txt"]
+
+[tool.setuptools.packages.find]
+exclude = ["tests*"]
+where = ["src"]
+
 [tool.tox]
 legacy_tox_ini = """
     [tox]

src/k2hr3client/__init__.py

@@ -22,7 +22,7 @@
 """K2HR3 Python Client of Token API."""
 
 __author__ = 'Hirotaka Wakabayashi <[email protected]>'
-__version__ = '1.0.0'
+__version__ = '1.0.2'
 
 import sys
 

src/k2hr3client/acr.py

@@ -115,7 +115,7 @@ def show_credential_details(self):
         self.api_id = 2
         return self
 
-    def get_available_resources(self,
+    def get_available_resources(self,  # pylint: disable=R0917
                                 cip: Optional[str] = None,
                                 cport: Optional[str] = None,
                                 crole: Optional[str] = None,

src/k2hr3client/api.py

@@ -155,9 +155,9 @@ class K2hr3Api(abc.ABC):  # pylint: disable=too-many-instance-attributes
 
     DEFAULT_VERSION = "v1"
 
-    def __init__(self, basepath: str, params: Optional[str] = None,
+    def __init__(self, basepath: str, params: Optional[str] = None,  # pylint: disable=R0917 # noqa
                  hdrs: Optional[dict] = None, body: Optional[str] = None,
-                 version: str = DEFAULT_VERSION) -> None: # noqa
+                 version: str = DEFAULT_VERSION) -> None:  # noqa
         """Init the K2hr3 API members.
 
         :raise K2hr3Exception: if the val is invalid.