From 7a45bf234a504d1f3a19ef47b844df2645454a4a Mon Sep 17 00:00:00 2001 From: Hirotaka Wakabayashi Date: Mon, 21 Oct 2024 11:08:56 +0000 Subject: [PATCH] Updates the supported versions --- .github/workflows/python-package.yml | 10 ++++------ pyproject.toml | 4 ++-- setup.cfg | 2 +- src/k2hash/basequeue.py | 2 +- src/k2hash/k2hash.py | 8 ++++---- src/k2hash/keyqueue.py | 2 +- src/k2hash/queue.py | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7cdcaee..383a937 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.11", "3.10", "3.9", "3.8"] + python-version: ["3.13", "3.12", "3.11", "3.10", "3.9"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -53,7 +53,7 @@ jobs: shell: sh - name: Test with unittest run: | - python -I -m pip install 'setuptools>=42' wheel + python -I -m pip install setuptools wheel pip install -q build python -m build pip3 install dist/k2hash-*.whl @@ -68,7 +68,5 @@ jobs: if: startsWith(github.ref, 'refs/tags') run: python -m build - name: Publish distribution to PyPI - if: ${{ matrix.python-version == '3.11' && startsWith(github.ref, 'refs/tags') }} - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{ secrets.PYPI_API_TOKEN }} + if: ${{ matrix.python-version == '3.12' && startsWith(github.ref, 'refs/tags') }} + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/pyproject.toml b/pyproject.toml index 9a0f2fa..8483d52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ # [build-system] requires = [ - "setuptools>=42", + "setuptools", "wheel" ] build-backend = "setuptools.build_meta" @@ -22,7 +22,7 @@ build-backend = "setuptools.build_meta" legacy_tox_ini = """ [tox] requires = tox>=4 - env_list = lint, type, py{38,39,310,311} + env_list = lint, type, py{39,310,311,312,313} skip_missing_interpreters = True [testenv] diff --git a/setup.cfg b/setup.cfg index 745b235..9c75664 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,7 @@ classifiers = package_dir = = src packages = find: -python_requires = >=3.6 +python_requires = >=3.9 [options.packages.find] where = src diff --git a/src/k2hash/basequeue.py b/src/k2hash/basequeue.py index a7c4cab..94ce42b 100644 --- a/src/k2hash/basequeue.py +++ b/src/k2hash/basequeue.py @@ -26,7 +26,7 @@ class BaseQueue: # noqa: pylint: disable=too-many-instance-attributes Baseueue class provides methods to handle key/value pairs in k2hash hash database. """ - def __init__( # noqa: pylint: disable=too-many-arguments + def __init__( # noqa: pylint: disable=too-many-arguments,too-many-positional-arguments self, k2h, fifo=True, prefix=None, password=None, expire_duration=None ): """ diff --git a/src/k2hash/k2hash.py b/src/k2hash/k2hash.py index 8f3b23a..5da974f 100644 --- a/src/k2hash/k2hash.py +++ b/src/k2hash/k2hash.py @@ -154,7 +154,7 @@ def _set_k2h_handle(self): raise RuntimeError("handle should not be K2H_INVALID_HANDLE") self._handle = handle - def __init__( # noqa: pylint: disable=too-many-branches,too-many-arguments + def __init__( # noqa: pylint: disable=too-many-branches,too-many-arguments,too-many-positional-arguments self, k2hfile="", flag=None, @@ -233,7 +233,7 @@ def libc(self): """returns libc handle""" return self._libc - def set( # noqa: pylint: disable=too-many-arguments + def set( # noqa: pylint: disable=too-many-arguments,too-many-positional-arguments self, key, val, password=None, expire_duration=None, time_unit=TimeUnit.SECONDS ): """Sets a key/value pair""" @@ -316,7 +316,7 @@ def add_decryption_password(self, password): LOG.error("error in k2h_add_attr_crypt_pass") return res - def add_subkey( # noqa: pylint: disable=too-many-arguments + def add_subkey( # noqa: pylint: disable=too-many-arguments,too-many-positional-arguments self, key, subkey, @@ -777,7 +777,7 @@ def set_log_level(self, level=LogLevel.INFO): "level should be either SILENT, ERROR, WARN, INFO or DEBUG" ) - def set_subkeys( # noqa: pylint: disable=too-many-branches,too-many-arguments + def set_subkeys( # noqa: pylint: disable=too-many-branches,too-many-arguments,too-many-positional-arguments self, key, subkeys, diff --git a/src/k2hash/keyqueue.py b/src/k2hash/keyqueue.py index 4e62f84..387589d 100644 --- a/src/k2hash/keyqueue.py +++ b/src/k2hash/keyqueue.py @@ -27,7 +27,7 @@ class KeyQueue(BaseQueue): # noqa: pylint: disable=too-many-instance-attributes KeyQueue class provides methods to handle key/value pairs in k2hash hash database. """ - def __init__( # noqa: pylint: disable=too-many-arguments + def __init__( # noqa: pylint: disable=too-many-arguments,too-many-positional-arguments self, k2h, fifo=True, prefix=None, password=None, expire_duration=None ): """ diff --git a/src/k2hash/queue.py b/src/k2hash/queue.py index b8d21d3..9b7f301 100644 --- a/src/k2hash/queue.py +++ b/src/k2hash/queue.py @@ -29,7 +29,7 @@ class Queue(BaseQueue): # noqa: pylint:disable=too-many-instance-attributes Queue class provides methods to handle key/value pairs in k2hash hash database. """ - def __init__( # noqa: pylint: disable=too-many-arguments + def __init__( # noqa: pylint: disable=too-many-arguments,too-many-positional-arguments self, k2h, fifo=True, prefix=None, password=None, expire_duration=None ): """