diff options
| author | Arun <engineerarun@gmail.com> | 2024-04-28 22:27:55 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-28 22:27:55 +0530 |
| commit | 228dd8dbc29a0ef2dcd43d7f64dc535dff4ac7c2 (patch) | |
| tree | 985f1c052a0c8b84ba62522c4e97416432e31330 | |
| parent | aa24d6d1e4e06c46ef04986ea0ee0db815aeca9b (diff) | |
| parent | 00b514ba343b90dd61623be13869ce4902084d2a (diff) | |
Merge pull request #731 from chenrui333/add-py3.12
ci: add py3.12 support
| -rw-r--r-- | .circleci/config.yml | 9 | ||||
| -rw-r--r-- | bukuserver/api.py | 2 | ||||
| -rw-r--r-- | bukuserver/views.py | 2 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | tox.ini | 15 |
5 files changed, 20 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index c818976..9a1140d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ lint-template: &lint-template jobs: lint: docker: - - image: python:3.11-slim + - image: python:3.12-slim <<: *lint-template py38: @@ -66,6 +66,11 @@ jobs: - image: python:3.11-slim <<: *test-template + py312: + docker: + - image: python:3.12-slim + <<: *test-template + # package-and-publish: # machine: true # working_directory: ~/Buku @@ -125,6 +130,7 @@ workflows: - py39 - py310 - py311 + - py312 nightly: triggers: @@ -161,4 +167,3 @@ workflows: only: /^v.*/ branches: ignore: /.*/ - diff --git a/bukuserver/api.py b/bukuserver/api.py index b36e30a..afe9684 100644 --- a/bukuserver/api.py +++ b/bukuserver/api.py @@ -228,7 +228,7 @@ class ApiBookmarkSearchView(MethodView): def get(self): arg_obj = request.args - keywords = arg_obj.getlist('keywords') + keywords = arg_obj.getlist('keywords') # pylint: disable=E1101 all_keywords = arg_obj.get('all_keywords') deep = arg_obj.get('deep') regex = arg_obj.get('regex') diff --git a/bukuserver/views.py b/bukuserver/views.py index 8f46da1..0d9cdf1 100644 --- a/bukuserver/views.py +++ b/bukuserver/views.py @@ -68,7 +68,7 @@ def last_page(self): view_args.search, view_args.filters, page_size=page_size) args = request.args.copy() - args.setlist('page', [max(0, (count - 1) // page_size)]) + args.setlist('page', [max(0, (count - 1) // page_size)]) # pylint: disable=E1101 return redirect(url_for('.index_view', **args)) @@ -107,6 +107,7 @@ setup( 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Internet :: WWW/HTTP :: Indexing/Search', 'Topic :: Utilities' ] @@ -1,5 +1,5 @@ [tox] -envlist = py38,py39,py310,py311,pylint,flake8 +envlist = py38,py39,py310,py311,py312,pylint,flake8 [flake8] max-line-length = 139 @@ -61,26 +61,31 @@ extras = tests commands = pytest --cov buku -vv -m "not non_tox" {posargs} +[testenv:py312] +extras = tests +commands = + pytest --cov buku -vv -m "not non_tox" {posargs} + [testenv:quick] -basepython = {env:BASEPYTHON:py311} +basepython = {env:BASEPYTHON:py312} extras = tests commands = pytest --cov buku -vv -m "not non_tox and not slow" {posargs} [testenv:nogui] -basepython = {env:BASEPYTHON:py311} +basepython = {env:BASEPYTHON:py312} extras = tests commands = pytest --cov buku -vv -m "not non_tox and not gui" {posargs} [testenv:pylint] -basepython = {env:BASEPYTHON:py311} +basepython = {env:BASEPYTHON:py312} deps = pylint commands = pylint . --rc-file tests/.pylintrc --recursive yes --ignore-paths .tox/,build/,venv/ [testenv:flake8] -basepython = {env:BASEPYTHON:py311} +basepython = {env:BASEPYTHON:py312} deps = flake8 commands = python -m flake8 |