Skip to content

Commit

Permalink
Merge pull request #4 from hiwakaba/pr1
Browse files Browse the repository at this point in the history
Updates the CI settings
  • Loading branch information
hiwakaba authored Sep 28, 2023
2 parents 01e1f3d + d7d1b98 commit b629aea
Show file tree
Hide file tree
Showing 19 changed files with 1,230 additions and 1,179 deletions.
4 changes: 1 addition & 3 deletions .github/scripts/lint_with_pylint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ else
fi

echo "[OK] HOSTNAME=${HOSTNAME} OS_NAME=${OS_NAME} OS_VERSION=${OS_VERSION}"
cd src

pylint k2hash --py3k -r n
pylint src/k2hash

exit $?

Expand Down
62 changes: 0 additions & 62 deletions .github/scripts/test_with_unittest.sh

This file was deleted.

20 changes: 14 additions & 6 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,33 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.x", "3.10", "3.9", "3.8", "3.7"]

python-version: ["3.11", "3.10", "3.9", "3.8"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: "x64"
- name: Install dependencies
run: |
./.github/scripts/install_dependencies.sh
shell: sh
- name: Install dependencies in GHA
run: |
python -m pip install --upgrade pip
pip install pylint pytest
- name: Lint with pylint
run: |
./.github/scripts/lint_with_pylint.sh
shell: sh
- name: Test with unittest
run: |
./.github/scripts/test_with_unittest.sh
python -I -m pip install 'setuptools>=42' wheel
pip install -q build
python -m build
pip3 install dist/k2hash-*.whl
pytest
shell: sh
- name: Install dependencies for upload pypi package
if: startsWith(github.ref, 'refs/tags')
Expand All @@ -60,7 +68,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags')
run: python -m build
- name: Publish distribution to PyPI
if: ${{ matrix.python-version == '3.x' && startsWith(github.ref, 'refs/tags') }}
if: ${{ matrix.python-version == '3.11' && startsWith(github.ref, 'refs/tags') }}
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.PYPI_API_TOKEN }}
5 changes: 5 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
History
=======

1.0.1 (2023-09-26)
-------------------

* Updates the CI settings.

1.0.0 (2022-02-07)
-------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
author = 'Hirotaka Wakabayashi, Takeshi Nakatani'

# The full version, including alpha/beta/rc tags
release = '1.0.0'
release = '1.0.1'


# -- General configuration ---------------------------------------------------
Expand Down
18 changes: 11 additions & 7 deletions docs/locales/ja/LC_MESSAGES/history.po
Original file line number Diff line number Diff line change
@@ -1,39 +1,43 @@
# -*- coding: utf-8 -*-
#
# K2hash Python Driver under MIT License
#
# Copyright (c) 2022 Yahoo Japan Corporation
#
# For the full copyright and license information, please view
# the license file that was distributed with this source code.
#
# AUTHOR: Hirotaka Wakabayashi
# CREATE: Tue Feb 08 2022
# REVISION:
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: k2hash \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-07 07:26+0000\n"
"POT-Creation-Date: 2023-09-26 14:11+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.9.1\n"
"Generated-By: Babel 2.12.1\n"

#: ../../../HISTORY.rst:3
msgid "History"
msgstr "歴史"

#: ../../../HISTORY.rst:6
msgid "1.0.0 (2022-02-07)"
msgid "1.0.1 (2023-09-26)"
msgstr ""

#: ../../../HISTORY.rst:8
msgid "Updates the CI settings."
msgstr "CIの設定を更新"

#: ../../../HISTORY.rst:11
msgid "1.0.0 (2022-02-07)"
msgstr ""

#: ../../../HISTORY.rst:13
msgid "First release on PyPI."
msgstr "最初のリリース"

49 changes: 32 additions & 17 deletions docs/locales/ja/LC_MESSAGES/k2hash.po
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
# -*- coding: utf-8 -*-
#
# K2hash Python Driver under MIT License
#
# Copyright (c) 2022 Yahoo Japan Corporation
#
# For the full copyright and license information, please view
# the license file that was distributed with this source code.
#
# AUTHOR: Hirotaka Wakabayashi
# CREATE: Tue Feb 08 2022
# REVISION:
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: k2hash \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-01 19:15+0900\n"
"POT-Creation-Date: 2023-09-26 14:11+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Hirotaka Wakabayashi <[email protected]>\n"
"Language-Team: Antpickax <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.9.1\n"
"Generated-By: Babel 2.12.1\n"

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

#: ../../k2hash.rst:8
msgid "k2hash.k2hash モジュール"
msgstr ""
msgid "k2hash.k2hash module"
msgstr "k2hashモジュール"

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

#: k2hash.k2hash.K2hash:1 k2hash.k2hash.K2hashIterator:1
#: k2hash.keyqueue.KeyQueue:1 k2hash.queue.Queue:1 of
#: k2hash.basequeue.BaseQueue:1 k2hash.k2hash.K2hash:1
#: k2hash.k2hash.K2hashIterator:1 of
msgid "Bases: :py:class:`object`"
msgstr ""

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

#: k2hash.K2hash.handle:1 k2hash.KeyQueue.handle:1 k2hash.Queue.handle:1
#: k2hash.k2hash.K2hash.handle:1 k2hash.keyqueue.KeyQueue.handle:1
#: k2hash.queue.Queue.handle:1 of
#: k2hash.BaseQueue.handle:1 k2hash.K2hash.handle:1
#: k2hash.k2hash.K2hash.handle:1 of
msgid "Returns a Queue handle."
msgstr "キューハンドルを返します。"

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

#: k2hash.k2hash.K2hash.remove_subkeys:1 of
msgid "Removes subkeys from the key."
msgstr "サブキーを削除します
msgstr "サブキーを削除します"

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

#: k2hash.keyqueue.KeyQueue:1 k2hash.queue.Queue:1 of
msgid "Bases: :py:class:`~k2hash.basequeue.BaseQueue`"
msgstr ""

#: k2hash.keyqueue.KeyQueue:1 of
msgid ""
"KeyQueue class provides methods to handle key/value pairs in k2hash hash "
Expand Down Expand Up @@ -247,7 +246,7 @@ msgstr "キューから要素を削除します。"

#: ../../k2hash.rst:24
msgid "k2hash.queue module"
msgstr ""
msgstr "k2hash.queue モジュール"

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

#: k2hash.AttrPack:1 k2hash.KeyPack:1 of
msgid "Bases: :py:class:`_ctypes.Structure`"
msgid "Bases: :py:class:`~_ctypes.Structure`"
msgstr ""

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

#: k2hash.basequeue.BaseQueue:1 of
#, fuzzy
msgid ""
"Baseueue class provides methods to handle key/value pairs in k2hash hash "
"database."
msgstr "Queueクラスは、キュー操作メソッドを提供します。"

#: k2hash.DumpLevel:1 k2hash.LogLevel:1 k2hash.OpenFlag:1 k2hash.TimeUnit:1 of
msgid "Bases: :py:class:`enum.Enum`"
msgid "Bases: :py:class:`~enum.Enum`"
msgstr ""

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

#~ msgid "k2hash.k2hash モジュール"
#~ msgstr ""

#~ msgid "Bases: :py:class:`_ctypes.Structure`"
#~ msgstr ""

#~ msgid "Bases: :py:class:`enum.Enum`"
#~ msgstr ""

Loading

0 comments on commit b629aea

Please sign in to comment.