From f113e8f55cc47f392f69e8d30c6a5fca1b9b5833 Mon Sep 17 00:00:00 2001 From: Ruben van Eldik Date: Wed, 23 Oct 2024 14:50:04 +0200 Subject: [PATCH 1/4] Add typing --- .gitignore | 1 + logtail/compat.py | 2 +- mypy.ini | 2 ++ py.typed | 0 test-requirements.txt | 3 +++ tox.ini | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mypy.ini create mode 100644 py.typed diff --git a/.gitignore b/.gitignore index f2ee7f9..384189a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ __pycache__ htmlcov .coverage .tox +.idea *.egg-info build/* dist/* diff --git a/logtail/compat.py b/logtail/compat.py index 1a4f794..4ff47e8 100644 --- a/logtail/compat.py +++ b/logtail/compat.py @@ -4,4 +4,4 @@ try: import queue except ImportError: - import Queue as queue + import Queue as queue # type: ignore[import-not-found, no-redef] diff --git a/mypy.ini b/mypy.ini new file mode 100644 index 0000000..515be77 --- /dev/null +++ b/mypy.ini @@ -0,0 +1,2 @@ +[mypy] +files = logtail diff --git a/py.typed b/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/test-requirements.txt b/test-requirements.txt index bcd0654..4f75388 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,3 +2,6 @@ coverage>=3.7.1 httpretty>=0.9.4 nose-py3 mock>=1.0.1 +mypy>=1.13.0 +types-setuptools>=75.2.0.20241019 +msgpack-types>=0.5.0 \ No newline at end of file diff --git a/tox.ini b/tox.ini index fe5ded1..5ed0402 100644 --- a/tox.ini +++ b/tox.ini @@ -15,3 +15,4 @@ deps = -rrequirements.txt commands = nosetests --with-coverage --cover-branches --cover-package=logtail + mypy logtail From 20fe01c72b9aec00606138afc741ac841feebcb0 Mon Sep 17 00:00:00 2001 From: Ruben van Eldik Date: Wed, 23 Oct 2024 14:55:12 +0200 Subject: [PATCH 2/4] Add types-requests --- test-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 4f75388..035c9cb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,4 +4,5 @@ nose-py3 mock>=1.0.1 mypy>=1.13.0 types-setuptools>=75.2.0.20241019 -msgpack-types>=0.5.0 \ No newline at end of file +msgpack-types>=0.5.0 +types-requests>=2.32.0.20241016 From 9e62f7e8cadff3f4320acba237e8d151c814f37c Mon Sep 17 00:00:00 2001 From: Ruben van Eldik Date: Wed, 23 Oct 2024 15:03:59 +0200 Subject: [PATCH 3/4] Remove support for 3.7 --- .github/workflows/main.yml | 2 +- setup.py | 1 - tox.ini | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bfe1b2b..b8cf0c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index dd33b5e..57b979b 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,6 @@ 'License :: OSI Approved :: ISC License (ISCL)', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', diff --git a/tox.ini b/tox.ini index 5ed0402..bf147f6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] -envlist = py37, py38, py39, py310, py311 +envlist = py38, py39, py310, py311 [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 3.10: py310 From 7088e0215c3c4149fa67de46ebb9cd444b50cb4a Mon Sep 17 00:00:00 2001 From: Ruben van Eldik Date: Wed, 23 Oct 2024 15:06:16 +0200 Subject: [PATCH 4/4] Add support for Python 3.12 --- .github/workflows/main.yml | 2 +- setup.py | 1 + tox.ini | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8cf0c8..2e0a6b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index 57b979b..fb7f3a8 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries :: Python Modules', ], diff --git a/tox.ini b/tox.ini index bf147f6..b596bd8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38, py39, py310, py311 +envlist = py38, py39, py310, py311, py312 [gh-actions] python = @@ -7,6 +7,7 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [testenv] deps =