From 146850a8df3d4dc5b95086aefb20b23ba36d31b7 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 27 Oct 2024 19:44:06 -0700 Subject: [PATCH 1/3] Preparing for v1.2.2 --- .github/workflows/sqlite_build.yaml | 2 +- requirements.txt | 6 +++--- requirements_dev.txt | 4 ++-- setup.cfg | 15 ++++++++------- setup.py | 15 ++++++++------- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/sqlite_build.yaml b/.github/workflows/sqlite_build.yaml index 231d7f5..eabd6c5 100644 --- a/.github/workflows/sqlite_build.yaml +++ b/.github/workflows/sqlite_build.yaml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: os: [macos-latest, windows-latest, ubuntu-latest] - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8', 'pypy-3.9', 'pypy3.10'] steps: - name: Checkout diff --git a/requirements.txt b/requirements.txt index 4364251..b8df0f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -billiard==4.2.0 +billiard==4.2.1 click==8.1.7 -msgpack==1.0.8 -pyzmq==26.0.3 +msgpack==1.1.0 +pyzmq==26.2.0 tornado==6.4.1 diff --git a/requirements_dev.txt b/requirements_dev.txt index 1f972cb..65512fa 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,7 +1,7 @@ -coverage==7.5.3 +coverage pip build wheel -pytest==8.2.2 +pytest setuptools twine diff --git a/setup.cfg b/setup.cfg index 5addfc7..f30cf40 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = sqlite_rx -version = 1.2.1 +version = 1.2.2 description = Python SQLite Client and Server long_description = file: README.md long_description_content_type = text/markdown @@ -21,6 +21,7 @@ classifiers = Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 Operating System :: POSIX :: Linux Operating System :: Unix Operating System :: Microsoft :: Windows @@ -47,13 +48,13 @@ include_package_data = True scripts = bin/curve-keygen install_requires = - billiard==4.2.0 - msgpack==1.0.8 - pyzmq==26.0.3 + billiard==4.2.1 + msgpack==1.1.0 + pyzmq==26.2.0 tornado==6.4.1 test_require = - pytest==8.2.2 - coverage==7.3.2 + pytest + coverage python_requires = >=3.8 [options.packages.find] @@ -68,7 +69,7 @@ console_scripts = [options.extras_require] cli = click==8.1.7 - rich==13.7.1 + rich==13.9.3 pygments==2.18.0 [coverage:run] diff --git a/setup.py b/setup.py index f0d690d..8964594 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: long_description = f.read() -VERSION = '1.2.1' +VERSION = '1.2.2' DISTNAME = 'sqlite_rx' LICENSE = 'MIT License' AUTHOR = 'Abhishek Singh' @@ -25,15 +25,15 @@ PACKAGES = ['sqlite_rx'] -INSTALL_REQUIRES = ['msgpack==1.0.8', - 'pyzmq==26.0.3', +INSTALL_REQUIRES = ['msgpack==1.1.0', + 'pyzmq==26.2.0', 'tornado==6.4.1', - 'billiard==4.2.0'] + 'billiard==4.2.1'] -CLI_REQUIRES = ['click==8.1.7', 'rich==13.7.1', 'pygments==2.18.0'] +CLI_REQUIRES = ['click==8.1.7', 'rich==13.9.3', 'pygments==2.18.0'] -TEST_REQUIRE = ['pytest==8.2.2', - 'coverage==7.5.3'] +TEST_REQUIRE = ['pytest', + 'coverage'] classifiers = [ 'Topic :: Database :: Database Engines/Servers', @@ -49,6 +49,7 @@ 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Operating System :: POSIX :: Linux', 'Operating System :: Unix', 'Operating System :: Microsoft :: Windows', From b17fbf3082a23c48d2e866ea203b87825b4c6865 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 24 Nov 2024 15:45:54 -0800 Subject: [PATCH 2/3] Upgraded tornado version --- .github/workflows/sqlite_build.yaml | 2 +- requirements.txt | 2 +- setup.cfg | 2 +- setup.py | 2 +- sqlite_rx/server.py | 5 ++++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sqlite_build.yaml b/.github/workflows/sqlite_build.yaml index eabd6c5..8153b3d 100644 --- a/.github/workflows/sqlite_build.yaml +++ b/.github/workflows/sqlite_build.yaml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: os: [macos-latest, windows-latest, ubuntu-latest] - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8', 'pypy-3.9', 'pypy3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9', 'pypy3.10'] steps: - name: Checkout diff --git a/requirements.txt b/requirements.txt index b8df0f8..759e0ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ billiard==4.2.1 click==8.1.7 msgpack==1.1.0 pyzmq==26.2.0 -tornado==6.4.1 +tornado==6.4.2 diff --git a/setup.cfg b/setup.cfg index f30cf40..c1c9de3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -51,7 +51,7 @@ install_requires = billiard==4.2.1 msgpack==1.1.0 pyzmq==26.2.0 - tornado==6.4.1 + tornado==6.4.2 test_require = pytest coverage diff --git a/setup.py b/setup.py index 8964594..0030574 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ INSTALL_REQUIRES = ['msgpack==1.1.0', 'pyzmq==26.2.0', - 'tornado==6.4.1', + 'tornado==6.4.2', 'billiard==4.2.1'] CLI_REQUIRES = ['click==8.1.7', 'rich==13.9.3', 'pygments==2.18.0'] diff --git a/sqlite_rx/server.py b/sqlite_rx/server.py index b7ef77a..c6b5282 100644 --- a/sqlite_rx/server.py +++ b/sqlite_rx/server.py @@ -4,6 +4,7 @@ import socket import sqlite3 import sys +import threading import traceback import zlib from signal import SIGTERM, SIGINT, signal @@ -190,8 +191,10 @@ def run(self): LOG.info("SQLiteServer version %s", get_version()) LOG.info("SQLiteServer (Tornado) i/o loop started..") + LOG.info("Backup thread %s", self.back_up_recurring_thread) + LOG.info("Backup thread is running %s", self.back_up_recurring_thread.is_alive()) - if self.back_up_recurring_thread: + if self.back_up_recurring_thread and not self.back_up_recurring_thread.is_alive(): self.back_up_recurring_thread.start() LOG.info("Ready to accept client connections on %s", self._bind_address) From fd306e6154019477338ec7050e86a9586a61a31e Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 24 Nov 2024 17:13:20 -0800 Subject: [PATCH 3/3] Fixed thread=None --- sqlite_rx/server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sqlite_rx/server.py b/sqlite_rx/server.py index c6b5282..7e0e814 100644 --- a/sqlite_rx/server.py +++ b/sqlite_rx/server.py @@ -192,7 +192,6 @@ def run(self): LOG.info("SQLiteServer version %s", get_version()) LOG.info("SQLiteServer (Tornado) i/o loop started..") LOG.info("Backup thread %s", self.back_up_recurring_thread) - LOG.info("Backup thread is running %s", self.back_up_recurring_thread.is_alive()) if self.back_up_recurring_thread and not self.back_up_recurring_thread.is_alive(): self.back_up_recurring_thread.start()