From 11b41c098e0165c901258737763757679892a8bd Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 10 May 2024 23:19:47 +0200 Subject: [PATCH 1/3] Dependencies: Update to `responder 3.0.0.dev0` --- CHANGES.rst | 1 + setup.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1cbbc26..92d2403 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,7 @@ Changelog in progress =========== +- Dependencies: Updated to ``responder 3.0.0`` 2024-05-10 0.7.1 ================ diff --git a/setup.py b/setup.py index f0158ec..e02ed9e 100644 --- a/setup.py +++ b/setup.py @@ -72,8 +72,7 @@ 'twine<7', ], 'service': [ - 'responder @ git+https://github.com/kennethreitz/responder.git@e9613500daf', - 'typesystem<0.3', + 'responder>=3.0.0.dev0', ], 'test': [ 'httpx<0.29', From 52961062cb5482c8ca706820c45a01e583bea433 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Sun, 19 Jan 2025 03:00:31 +0100 Subject: [PATCH 2/3] Verify support for Python 3.13 --- .github/workflows/main.yml | 2 +- CHANGES.rst | 1 + setup.py | 1 + tests/test_cli.py | 2 +- vasuki/api.py | 5 +++-- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69c3018..d2c9108 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest"] - python-version: ["3.8", "3.11", "3.12"] + python-version: ["3.8", "3.13"] env: OS: ${{ matrix.os }} diff --git a/CHANGES.rst b/CHANGES.rst index 92d2403..02252e2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,6 +6,7 @@ Changelog in progress =========== - Dependencies: Updated to ``responder 3.0.0`` +- Verified support for Python 3.13 2024-05-10 0.7.1 ================ diff --git a/setup.py b/setup.py index e02ed9e..9b331cc 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,7 @@ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "License :: OSI Approved :: MIT License", "Development Status :: 4 - Beta", "Environment :: Console", diff --git a/tests/test_cli.py b/tests/test_cli.py index 35a1ad9..ba64592 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -21,7 +21,7 @@ def test_cli_failure(): run() # Verify output. - assert ex.match("Usage:\n vasuki") + assert ex.match("Usage:\n.*vasuki") def test_uuid(capsys): diff --git a/vasuki/api.py b/vasuki/api.py index e9630f5..9394cc3 100644 --- a/vasuki/api.py +++ b/vasuki/api.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- # (c) 2019 Andreas Motl import importlib.metadata +import importlib.resources import logging import responder from munch import DefaultMunch, munchify -from pkg_resources import resource_filename from vasuki.core import VasukiCommand -templates_dir = resource_filename('vasuki', 'templates') +with importlib.resources.path('vasuki', 'templates') as vasuki_templates: + templates_dir = vasuki_templates api = responder.API(static_dir=templates_dir, templates_dir=templates_dir) From d39734dc0b076f816dacd8b623e66f9b97508e77 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Sun, 19 Jan 2025 03:04:12 +0100 Subject: [PATCH 3/3] Dependencies: Update to `docopt-ng` --- CHANGES.rst | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 02252e2..43d29aa 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,6 +6,7 @@ Changelog in progress =========== - Dependencies: Updated to ``responder 3.0.0`` +- Dependencies: Updated to ``docopt-ng`` - Verified support for Python 3.13 2024-05-10 0.7.1 diff --git a/setup.py b/setup.py index 9b331cc..b35903a 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ zip_safe=False, test_suite='vasuki.test', install_requires=[ - 'docopt<1', + 'docopt-ng<0.10', 'munch<5', 'ulid-py<1.2', 'hashids<1.4',