Skip to content

Commit b629aea

Browse files
authored
Merge pull request #4 from hiwakaba/pr1
Updates the CI settings
2 parents 01e1f3d + d7d1b98 commit b629aea

19 files changed

Lines changed: 1230 additions & 1179 deletions

.github/scripts/lint_with_pylint.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ else
2828
fi
2929

3030
echo "[OK] HOSTNAME=${HOSTNAME} OS_NAME=${OS_NAME} OS_VERSION=${OS_VERSION}"
31-
cd src
32-
33-
pylint k2hash --py3k -r n
31+
pylint src/k2hash
3432

3533
exit $?
3634

.github/scripts/test_with_unittest.sh

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/python-package.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,33 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
python-version: ["3.x", "3.10", "3.9", "3.8", "3.7"]
35-
34+
python-version: ["3.11", "3.10", "3.9", "3.8"]
3635
steps:
37-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v4
3837
- name: Set up Python ${{ matrix.python-version }}
39-
uses: actions/setup-python@v2
38+
uses: actions/setup-python@v4
4039
with:
4140
python-version: ${{ matrix.python-version }}
41+
architecture: "x64"
4242
- name: Install dependencies
4343
run: |
4444
./.github/scripts/install_dependencies.sh
4545
shell: sh
46+
- name: Install dependencies in GHA
47+
run: |
48+
python -m pip install --upgrade pip
49+
pip install pylint pytest
4650
- name: Lint with pylint
4751
run: |
4852
./.github/scripts/lint_with_pylint.sh
4953
shell: sh
5054
- name: Test with unittest
5155
run: |
52-
./.github/scripts/test_with_unittest.sh
56+
python -I -m pip install 'setuptools>=42' wheel
57+
pip install -q build
58+
python -m build
59+
pip3 install dist/k2hash-*.whl
60+
pytest
5361
shell: sh
5462
- name: Install dependencies for upload pypi package
5563
if: startsWith(github.ref, 'refs/tags')
@@ -60,7 +68,7 @@ jobs:
6068
if: startsWith(github.ref, 'refs/tags')
6169
run: python -m build
6270
- name: Publish distribution to PyPI
63-
if: ${{ matrix.python-version == '3.x' && startsWith(github.ref, 'refs/tags') }}
71+
if: ${{ matrix.python-version == '3.11' && startsWith(github.ref, 'refs/tags') }}
6472
uses: pypa/gh-action-pypi-publish@master
6573
with:
6674
password: ${{ secrets.PYPI_API_TOKEN }}

HISTORY.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
History
33
=======
44

5+
1.0.1 (2023-09-26)
6+
-------------------
7+
8+
* Updates the CI settings.
9+
510
1.0.0 (2022-02-07)
611
-------------------
712

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
author = 'Hirotaka Wakabayashi, Takeshi Nakatani'
3737

3838
# The full version, including alpha/beta/rc tags
39-
release = '1.0.0'
39+
release = '1.0.1'
4040

4141

4242
# -- General configuration ---------------------------------------------------
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
11
# -*- coding: utf-8 -*-
22
#
33
# K2hash Python Driver under MIT License
4-
#
54
# Copyright (c) 2022 Yahoo Japan Corporation
6-
#
75
# For the full copyright and license information, please view
86
# the license file that was distributed with this source code.
9-
#
107
# AUTHOR: Hirotaka Wakabayashi
118
# CREATE: Tue Feb 08 2022
129
# REVISION:
13-
#
1410
#, fuzzy
1511
msgid ""
1612
msgstr ""
1713
"Project-Id-Version: k2hash \n"
1814
"Report-Msgid-Bugs-To: \n"
19-
"POT-Creation-Date: 2022-02-07 07:26+0000\n"
15+
"POT-Creation-Date: 2023-09-26 14:11+0900\n"
2016
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
2117
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2218
"Language-Team: LANGUAGE <LL@li.org>\n"
2319
"MIME-Version: 1.0\n"
2420
"Content-Type: text/plain; charset=utf-8\n"
2521
"Content-Transfer-Encoding: 8bit\n"
26-
"Generated-By: Babel 2.9.1\n"
22+
"Generated-By: Babel 2.12.1\n"
2723

2824
#: ../../../HISTORY.rst:3
2925
msgid "History"
3026
msgstr "歴史"
3127

3228
#: ../../../HISTORY.rst:6
33-
msgid "1.0.0 (2022-02-07)"
29+
msgid "1.0.1 (2023-09-26)"
3430
msgstr ""
3531

3632
#: ../../../HISTORY.rst:8
33+
msgid "Updates the CI settings."
34+
msgstr "CIの設定を更新"
35+
36+
#: ../../../HISTORY.rst:11
37+
msgid "1.0.0 (2022-02-07)"
38+
msgstr ""
39+
40+
#: ../../../HISTORY.rst:13
3741
msgid "First release on PyPI."
3842
msgstr "最初のリリース"
3943

docs/locales/ja/LC_MESSAGES/k2hash.po

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
# -*- coding: utf-8 -*-
22
#
33
# K2hash Python Driver under MIT License
4-
#
54
# Copyright (c) 2022 Yahoo Japan Corporation
6-
#
75
# For the full copyright and license information, please view
86
# the license file that was distributed with this source code.
9-
#
107
# AUTHOR: Hirotaka Wakabayashi
118
# CREATE: Tue Feb 08 2022
129
# REVISION:
13-
#
1410
#, fuzzy
1511
msgid ""
1612
msgstr ""
1713
"Project-Id-Version: k2hash \n"
1814
"Report-Msgid-Bugs-To: \n"
19-
"POT-Creation-Date: 2022-03-01 19:15+0900\n"
15+
"POT-Creation-Date: 2023-09-26 14:11+0900\n"
2016
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
2117
"Last-Translator: Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp>\n"
2218
"Language-Team: Antpickax <antpickax-support@mail.yahoo.co.jp>\n"
2319
"MIME-Version: 1.0\n"
2420
"Content-Type: text/plain; charset=utf-8\n"
2521
"Content-Transfer-Encoding: 8bit\n"
26-
"Generated-By: Babel 2.9.1\n"
22+
"Generated-By: Babel 2.12.1\n"
2723

2824
#: ../../k2hash.rst:2 k2hash:1 of
2925
msgid "k2hash package"
@@ -34,15 +30,15 @@ msgid "Submodules"
3430
msgstr "サブモジュール"
3531

3632
#: ../../k2hash.rst:8
37-
msgid "k2hash.k2hash モジュール"
38-
msgstr ""
33+
msgid "k2hash.k2hash module"
34+
msgstr "k2hashモジュール"
3935

4036
#: k2hash.k2hash:1 k2hash.keyqueue:1 k2hash.queue:1 of
4137
msgid "K2hash Python Driver under MIT License"
4238
msgstr ""
4339

44-
#: k2hash.k2hash.K2hash:1 k2hash.k2hash.K2hashIterator:1
45-
#: k2hash.keyqueue.KeyQueue:1 k2hash.queue.Queue:1 of
40+
#: k2hash.basequeue.BaseQueue:1 k2hash.k2hash.K2hash:1
41+
#: k2hash.k2hash.K2hashIterator:1 of
4642
msgid "Bases: :py:class:`object`"
4743
msgstr ""
4844

@@ -116,9 +112,8 @@ msgstr "トランザクションログファイル記述子を取得します。
116112
msgid "Gets the number of transaction thread pool."
117113
msgstr "トランザクション用スレッド数を取得します。"
118114

119-
#: k2hash.K2hash.handle:1 k2hash.KeyQueue.handle:1 k2hash.Queue.handle:1
120-
#: k2hash.k2hash.K2hash.handle:1 k2hash.keyqueue.KeyQueue.handle:1
121-
#: k2hash.queue.Queue.handle:1 of
115+
#: k2hash.BaseQueue.handle:1 k2hash.K2hash.handle:1
116+
#: k2hash.k2hash.K2hash.handle:1 of
122117
msgid "Returns a Queue handle."
123118
msgstr "キューハンドルを返します。"
124119

@@ -156,7 +151,7 @@ msgstr "キーを削除します。"
156151

157152
#: k2hash.k2hash.K2hash.remove_subkeys:1 of
158153
msgid "Removes subkeys from the key."
159-
msgstr "サブキーを削除します
154+
msgstr "サブキーを削除します"
160155

161156
#: k2hash.k2hash.K2hash.rename:1 of
162157
msgid "Renames a key with a new key."
@@ -206,6 +201,10 @@ msgstr "k2hashのiteratorを実装しています。"
206201
msgid "k2hash.keyqueue module"
207202
msgstr ""
208203

204+
#: k2hash.keyqueue.KeyQueue:1 k2hash.queue.Queue:1 of
205+
msgid "Bases: :py:class:`~k2hash.basequeue.BaseQueue`"
206+
msgstr ""
207+
209208
#: k2hash.keyqueue.KeyQueue:1 of
210209
msgid ""
211210
"KeyQueue class provides methods to handle key/value pairs in k2hash hash "
@@ -247,7 +246,7 @@ msgstr "キューから要素を削除します。"
247246

248247
#: ../../k2hash.rst:24
249248
msgid "k2hash.queue module"
250-
msgstr ""
249+
msgstr "k2hash.queue モジュール"
251250

252251
#: k2hash.queue.Queue:1 of
253252
msgid ""
@@ -260,7 +259,7 @@ msgid "Module contents"
260259
msgstr "モジュール"
261260

262261
#: k2hash.AttrPack:1 k2hash.KeyPack:1 of
263-
msgid "Bases: :py:class:`_ctypes.Structure`"
262+
msgid "Bases: :py:class:`~_ctypes.Structure`"
264263
msgstr ""
265264

266265
#: k2hash.AttrPack:1 of
@@ -273,8 +272,15 @@ msgstr "Attr構造体"
273272
msgid "Structure/Union member"
274273
msgstr "構造体のメンバー"
275274

275+
#: k2hash.basequeue.BaseQueue:1 of
276+
#, fuzzy
277+
msgid ""
278+
"Baseueue class provides methods to handle key/value pairs in k2hash hash "
279+
"database."
280+
msgstr "Queueクラスは、キュー操作メソッドを提供します。"
281+
276282
#: k2hash.DumpLevel:1 k2hash.LogLevel:1 k2hash.OpenFlag:1 k2hash.TimeUnit:1 of
277-
msgid "Bases: :py:class:`enum.Enum`"
283+
msgid "Bases: :py:class:`~enum.Enum`"
278284
msgstr ""
279285

280286
#: k2hash.DumpLevel:1 of
@@ -297,3 +303,12 @@ msgstr "ファイルオープン用フラグ"
297303
msgid "k2hash time units"
298304
msgstr "時間単位"
299305

306+
#~ msgid "k2hash.k2hash モジュール"
307+
#~ msgstr ""
308+
309+
#~ msgid "Bases: :py:class:`_ctypes.Structure`"
310+
#~ msgstr ""
311+
312+
#~ msgid "Bases: :py:class:`enum.Enum`"
313+
#~ msgstr ""
314+

0 commit comments

Comments
 (0)