Merge pull request #15 from aosingh/dev/1.2.0

dev/1.2.0

Author: aosingh

.github/workflows/sqlite_build.yaml

@@ -8,12 +8,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
-        python-version: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
+        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']
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

README.md

@@ -2,16 +2,18 @@
 [![PyPI version](https://badge.fury.io/py/sqlite-rx.svg)](https://pypi.python.org/pypi/sqlite-rx) [![sqlite-rx](https://github.com/aosingh/sqlite_rx/actions/workflows/sqlite_build.yaml/badge.svg)](https://github.com/aosingh/sqlite_rx/actions) [![Downloads](https://pepy.tech/badge/sqlite-rx)](https://pepy.tech/project/sqlite-rx)
 
 
-[![Python 3.7](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/downloads/release/python-370/) 
 [![Python 3.8](https://img.shields.io/badge/python-3.8-blue.svg)](https://www.python.org/downloads/release/python-380/)
 [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)]((https://www.python.org/downloads/release/python-390/))
 [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3100/)
-[![PyPy3.7](https://img.shields.io/badge/python-PyPy3.7-blue.svg)](https://www.pypy.org/download.html)
+[![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3110/)
+[![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3120/)
+
+
 [![PyPy3.8](https://img.shields.io/badge/python-PyPy3.8-blue.svg)](https://www.pypy.org/download.html)
 [![PyPy3.9](https://img.shields.io/badge/python-PyPy3.9-blue.svg)](https://www.pypy.org/download.html)
 
 
-#### Official Documentation -> [https://aosingh.github.io/sqlite_rx/](https://aosingh.github.io/sqlite_rx/)
+#### For documentation, usage and examples refer [https://aosingh.github.io/sqlite_rx/](https://aosingh.github.io/sqlite_rx/)
 
 # Introduction
 

requirements.txt

@@ -1,5 +1,5 @@
-billiard==4.0.2
-click==8.1.3
-msgpack==1.0.4
-pyzmq==23.2.0
-tornado==6.2
+billiard==4.2.0
+click==8.1.7
+msgpack==1.0.7
+pyzmq==25.1.1
+tornado==6.3.3

requirements_dev.txt

@@ -1,5 +1,5 @@
-coverage==6.3.2
+coverage==7.3.2
 pip
-pytest==7.1.1
+pytest==7.4.3
 setuptools
 twine

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sqlite_rx
-version = 1.1.2
+version = 1.2.0
 description = Python SQLite Client and Server
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -16,9 +16,11 @@ classifiers =
     Intended Audience :: System Administrators
     License :: OSI Approved :: MIT License
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Operating System :: POSIX :: Linux
     Operating System :: Unix
     Operating System :: Microsoft :: Windows
@@ -45,14 +47,14 @@ include_package_data = True
 scripts =
     bin/curve-keygen
 install_requires =
-    billiard==4.0.2
-    msgpack==1.0.4
-    pyzmq==23.2.0
-    tornado==6.2
+    billiard==4.2.0
+    msgpack==1.0.7
+    pyzmq==25.1.1
+    tornado==6.3.3
 test_require =
-    pytest==7.1.1
-    coverage==6.3.2
-python_requires = >=3.7
+    pytest==7.4.3
+    coverage==7.3.2
+python_requires = >=3.8
 
 [options.packages.find]
 where = sqlite_rx

setup.py

@@ -1,14 +1,20 @@
+import sys
 from os import path
 
 from setuptools import find_packages, setup
 
 
+if sys.version_info < (3, 8):
+    print("Error: sqlite-rx does not support this version of Python.")
+    print("Please upgrade to Python 3.8 or higher.")
+    sys.exit(1)
+
 this_directory = path.abspath(path.dirname(__file__))
 
 with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
-VERSION = '1.1.2'
+VERSION = '1.2.0'
 DISTNAME = 'sqlite_rx'
 LICENSE = 'MIT License'
 AUTHOR = 'Abhishek Singh'
@@ -19,15 +25,15 @@
 
 PACKAGES = ['sqlite_rx']
 
-INSTALL_REQUIRES = ['msgpack==1.0.4',
-                    'pyzmq==23.2.0',
-                    'tornado==6.2',
-                    'billiard==4.0.2']
+INSTALL_REQUIRES = ['msgpack==1.0.7',
+                    'pyzmq==25.1.1',
+                    'tornado==6.3.3',
+                    'billiard==4.2.0']
 
-CLI_REQUIRES = ['click==8.1.3', 'rich==12.0.1', 'pygments==2.11.2']
+CLI_REQUIRES = ['click==8.1.7', 'rich==13.6.0', 'pygments==2.16.1']
 
-TEST_REQUIRE = ['pytest==7.1.1',
-                'coverage==6.3.2']
+TEST_REQUIRE = ['pytest==7.4.3',
+                'coverage==7.3.2']
 
 classifiers = [
     'Topic :: Database :: Database Engines/Servers',
@@ -38,18 +44,19 @@
     'Intended Audience :: System Administrators',
     'License :: OSI Approved :: MIT License',
     'Programming Language :: Python :: 3 :: Only',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Operating System :: POSIX :: Linux',
     'Operating System :: Unix',
     'Operating System :: Microsoft :: Windows',
     'Operating System :: MacOS'
 ]
 keywords = 'sqlite client server fast secure'
 
-project_urls = {"Documentation" : "https://aosingh.github.io/sqlite_rx/",
+project_urls = {"Documentation": "https://aosingh.github.io/sqlite_rx/",
                 "Source":  "https://github.com/aosingh/sqlite_rx",
                 "Bug Tracker": "https://github.com/aosingh/sqlite_rx/issues",
                 "CI": "https://github.com/aosingh/sqlite_rx/actions",
@@ -87,5 +94,5 @@
     include_package_data=True,
     classifiers=classifiers,
     keywords=keywords,
-    python_requires='>=3.7'
+    python_requires='>=3.8'
 )

sqlite_rx/backup.py

@@ -10,8 +10,6 @@
 
 
 def is_backup_supported():
-    if not (sys.version_info.major == 3 and sys.version_info.minor >= 7):
-        return False
 
     if sys.platform.startswith('win'):
         return False

sqlite_rx/server.py

@@ -15,11 +15,11 @@
 import zmq
 from sqlite_rx import get_version
 from sqlite_rx.auth import Authorizer, KeyMonkey
-from sqlite_rx.backup import SQLiteBackUp, RecurringTimer
+from sqlite_rx.backup import SQLiteBackUp, RecurringTimer, is_backup_supported
 from sqlite_rx.exception import SQLiteRxBackUpError
 from sqlite_rx.exception import SQLiteRxZAPSetupError
 from tornado import ioloop, version
-from zmq.auth.ioloop import IOLoopAuthenticator
+from zmq.auth.asyncio import AsyncioAuthenticator
 from zmq.eventloop import zmqstream
 
 
@@ -93,7 +93,7 @@ def stream(self,
                 if not use_encryption:
                     raise SQLiteRxZAPSetupError("ZAP requires CurveZMQ(use_encryption = True) to be enabled. Exiting")
 
-                self.auth = IOLoopAuthenticator(self.context)
+                self.auth = AsyncioAuthenticator(self.context)
                 LOG.info("ZAP enabled. \n Authorizing clients in %s.", keymonkey.authorized_clients_dir)
                 self.auth.configure_curve(domain="*", location=keymonkey.authorized_clients_dir)
                 self.auth.start()
@@ -143,18 +143,9 @@ def __init__(self,
         self.back_up_recurring_thread = None
 
         if backup_database is not None:
-            if not (sys.version_info.major == 3 and sys.version_info.minor >= 7):
-                LOG.warning("Backup requires Python 3.7 or higher")
-                raise SQLiteRxBackUpError("SQLite backup requires Python 3.7 or higher")
-
-            if sys.platform.startswith('win'):
-                LOG.warning("Backup is not supported on Windows")
-                raise SQLiteRxBackUpError("SQLite backup is not supported on Windows")
-
-            if platform.python_implementation().lower() == 'pypy':
-                LOG.warning("Backup is not supported on PyPy python implementation")
-                raise SQLiteRxBackUpError("SQLite backup is not supported on MacOS for PyPy python implementation")
-            
+            if not is_backup_supported():
+                raise SQLiteRxBackUpError(f"SQLite backup is not supported on {sys.platform} or {platform.python_implementation()}")
+
             sqlite_backup = SQLiteBackUp(src=database, target=backup_database)
             self.back_up_recurring_thread = RecurringTimer(function=sqlite_backup, interval=backup_interval)
             self.back_up_recurring_thread.daemon = True
@@ -187,7 +178,7 @@ def handle_signal(self, signum, frame):
 
         if self.back_up_recurring_thread:
             self.back_up_recurring_thread.cancel()
-        os._exit(os.EX_OK)
+        raise SystemExit()
 
     def run(self):
         LOG.info("Setting up signal handlers")