Merge pull request #12 from aosingh/v1.0.3

v1.1.0

Author: aosingh

.github/workflows/sqlite_build.yaml

@@ -3,27 +3,27 @@ on: push
 
 jobs:
   unittests:
-    name: 
+    name: sqlite-rx unitests
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9, '3.10.0-beta.3', 'pypy3']
+        python-version: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
 
     steps:
     - name: Checkout
       uses: actions/checkout@v2
 
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install Dependencies
       run: |
-        python3 -m pip install --upgrade pip
-        pip install click pytest coverage
+        python3 -m pip install --upgrade pip setuptools
+        pip install pytest coverage
         pip install -e .
         pip install coverage
     

.gitignore

@@ -14,4 +14,5 @@ venv/
 start_server.py
 run_client.py
 curve_client.py
+.pypy3venv/
 

Dockerfile

@@ -1,19 +1,16 @@
-FROM python:3-alpine as base
+FROM python:3.10.1-slim as base
 
 COPY . /sqlite_rx
 
 WORKDIR /svc
 
-RUN apk update && apk add build-base libzmq musl-dev zeromq-dev
-
 RUN pip install --upgrade pip
 RUN pip install Cython
-RUN pip install wheel && pip wheel --wheel-dir=/svc/wheels /sqlite_rx
+RUN pip install wheel && pip wheel --wheel-dir=/svc/wheels /sqlite_rx[cli]
 RUN rm -rf /sqlite_rx
 
 
-FROM python:3-alpine
-RUN apk update && apk add libzmq
+FROM python:3.10.1-slim
 
 COPY --from=base /svc /svc
 WORKDIR /svc

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Abhishek Singh & Contributors
+Copyright (c) 2022 Abhishek Singh & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

requirements.txt

@@ -1,4 +1,5 @@
-click
-msgpack
-pyzmq
-tornado
+billiard==4.0.0
+click==8.1.3
+msgpack==1.0.4
+pyzmq==23.2.0
+tornado==6.2

requirements_dev.txt

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

setup.cfg

@@ -1,14 +1,67 @@
-[nosetests]
-detailed-errors = 1
-with-coverage = 0
-verbosity = 2
-cover-package = sqlite_rx
-cover-html = 1
-tests = sqlite_rx/tests
+[metadata]
+name = sqlite_rx
+version = 1.1.0
+description = Python SQLite Client and Server
+long_description = file: README.md
+long_description_content_type = text/markdown
+keywords = sqlite, client, server, fast, secure
+url = https://aosingh.github.io/sqlite_rx/
+classifiers =
+    Topic :: Database :: Database Engines/Servers
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Education
+    Intended Audience :: Developers
+    Intended Audience :: Science/Research
+    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
+    Operating System :: POSIX :: Linux
+    Operating System :: Unix
+    Operating System :: Microsoft :: Windows
+    Operating System :: MacOS
+author = Abhishek Singh
+author_email = abhishek.singh20141@gmail.com
+maintainer = Abhishek Singh
+maintainer_email = abhishek.singh20141@gmail.com
+
+[options]
+zip_safe = False
+packages = find:
+package_dir =
+    sqlite_rx=sqlite_rx
+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
+test_require =
+    pytest==7.1.1
+    coverage==6.3.2
+python_requires = >=3.7
+
+[options.packages.find]
+where = sqlite_rx
+exclude = tests
+
+[options.entry_points]
+console_scripts =
+    sqlite-server = sqlite_rx.cli.server:main
+    sqlite-client = sqlite_rx.cli.client:main
+
+[options.extras_require]
+cli =
+    click==8.0.4
+    rich==12.0.1
+    pygments==2.11.2
 
 [coverage:run]
 branch = True
 concurrency = multiprocessing
 parallel = True
 source = sqlite_rx
-[easy_install]

setup.py

@@ -11,33 +11,41 @@
 
 VERSION = __version__
 DISTNAME = 'sqlite_rx'
-LICENSE = 'GNU GPLv3'
+LICENSE = 'MIT License'
 AUTHOR = 'Abhishek Singh'
 MAINTAINER = 'Abhishek Singh'
-MAINTAINER_EMAIL = 'aosingh@asu.edu'
-DESCRIPTION = ('Python SQLite Client and Server')
+MAINTAINER_EMAIL = 'abhishek.singh20141@gmail.com'
+DESCRIPTION = 'Python SQLite Client and Server'
 URL = 'https://github.com/aosingh/sqlite_rx'
 
 PACKAGES = ['sqlite_rx']
 
-DEPENDENCIES = ['msgpack', 'pyzmq', 'tornado', 'click', 'billiard']
+INSTALL_REQUIRES = ['msgpack==1.0.4',
+                    'pyzmq==23.2.0',
+                    'tornado==6.2',
+                    'billiard==4.0.2']
+
+CLI_REQUIRES = ['click==8.1.3', 'rich==12.0.1', 'pygments==2.11.2']
+
+TEST_REQUIRE = ['pytest==7.1.1',
+                'coverage==6.3.2']
 
 classifiers = [
+    'Topic :: Database :: Database Engines/Servers',
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Education',
     'Intended Audience :: Developers',
     'Intended Audience :: Science/Research',
     'Intended Audience :: System Administrators',
-    'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+    'License :: OSI Approved :: MIT License',
     'Programming Language :: Python :: 3 :: Only',
-    'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
     'Operating System :: POSIX :: Linux',
     'Operating System :: Unix',
     'Operating System :: Microsoft :: Windows',
-    'Topic :: Database :: Database Engines/Servers',
     'Operating System :: MacOS'
 ]
 keywords = 'sqlite client server fast secure'
@@ -56,15 +64,21 @@
     url=URL,
     version=VERSION,
     scripts=['bin/curve-keygen'],
-    entry_points = {
+    entry_points={
       'console_scripts': [
-          'sqlite-server=sqlite_rx.cli:main'
+          'sqlite-server=sqlite_rx.cli.server:main',
+          'sqlite-client=sqlite_rx.cli.client:main'
       ]
     },
+    extras_require={
+      'cli': CLI_REQUIRES
+    },
     packages=find_packages(exclude=("tests",)),
     package_dir={'sqlite_rx': 'sqlite_rx'},
-    install_requires=DEPENDENCIES,
+    install_requires=INSTALL_REQUIRES,
+    test_require=TEST_REQUIRE,
     include_package_data=True,
     classifiers=classifiers,
     keywords=keywords,
+    python_requires='>=3.7'
 )

sqlite_rx/__init__.py

@@ -1,10 +1,9 @@
-__version__ = "1.0.2"
+__version__ = "1.1.0"
 __author__ = "Abhishek Singh"
-__authoremail__ = "aosingh@asu.edu"
+__authoremail__ = "abhishek.singh20141@gmail.com"
 
 
 def get_default_logger_settings(level: str = "DEBUG"):
-
     return {
         'version': 1,
         'disable_existing_loggers': False,
@@ -43,4 +42,4 @@ def get_default_logger_settings(level: str = "DEBUG"):
 
 
 def get_version():
-    return __version__
+    return __version__

sqlite_rx/auth.py

@@ -199,16 +199,10 @@ def __init__(self,
         """
 
         self.my_id = key_id
-        self.curvedir = destination_dir if destination_dir else os.path.join(
-            os.path.expanduser("~"), ".curve")
-        self.public_key = os.path.join(
-            self.curvedir, "{}.key".format(self.my_id))
-        self.private_key = os.path.join(
-            self.curvedir,
-            "{}.key_secret".format(
-                self.my_id))
-        self.authorized_clients_dir = os.path.join(
-            self.curvedir, "authorized_clients")
+        self.curvedir = destination_dir if destination_dir else os.path.join(os.path.expanduser("~"), ".curve")
+        self.public_key = os.path.join(self.curvedir, "{}.key".format(self.my_id))
+        self.private_key = os.path.join(self.curvedir, "{}.key_secret".format(self.my_id))
+        self.authorized_clients_dir = os.path.join(self.curvedir, "authorized_clients")
 
     def setup_secure_server(self,
                             server,
@@ -225,9 +219,7 @@ def setup_secure_server(self,
 
         """
         try:
-            foo, bar = zmq.auth.load_certificate(self.private_key)
-            server.curve_publickey = foo
-            server.curve_secretkey = bar
+            server.curve_publickey, server.curve_secretkey = zmq.auth.load_certificate(self.private_key)
             server.curve_server = True
             LOG.info("Secure setup completed using on %s using curve key %s", bind_address, self.my_id)
             return server
@@ -259,17 +251,14 @@ def setup_secure_client(self,
 
         """
         try:
-            foo, bar = zmq.auth.load_certificate(self.private_key)
-            client.curve_publickey = foo
-            client.curve_secretkey = bar
+            client.curve_publickey, client.curve_secretkey = zmq.auth.load_certificate(self.private_key)
         except IOError:
             LOG.exception("Couldn't load the client private key: %s", self.private_key)
             raise
         else:
             # Clients need server's public key for encryption
             try:
-                foo, _ = zmq.auth.load_certificate(os.path.join(self.curvedir, f"{servername}.key"))
-                client.curve_serverkey = foo
+                client.curve_serverkey, _ = zmq.auth.load_certificate(os.path.join(self.curvedir, f"{servername}.key"))
             except IOError:
                 LOG.exception(
                     "Couldn't load the server public key %s ", os.path.join(self.curvedir, f"{servername}.key"))