Merge pull request #20 from aosingh/dev/v1.3.0

v1.3.0

Author: aosingh

.coveragerc

@@ -5,7 +5,7 @@ source = sqlite_rx
 concurrency =
     thread
     multiprocessing
-debug = 
+debug =
     multiproc
 omit =
     /*/tests/*
@@ -14,8 +14,8 @@ omit =
     /home/travis/virtualenv/*
     ./sqlite_rx/run_client.py
     ./sqlite_rx/start_server.py
-# plugins = 
+# plugins =
 #   billiard_coverage_plugin
 
 [html]
-directory = htmlcov
+directory = htmlcov

.dockerignore

@@ -18,4 +18,3 @@ start_server.py
 run_client.py
 curve_client.py
 .github
-

.github/workflows/sqlite_build.yaml

@@ -9,14 +9,14 @@ 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', 'pypy3.10']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', 'pypy3.10', 'pypy3.11']
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -25,11 +25,9 @@ jobs:
         python3 -m pip install --upgrade pip setuptools
         pip install pytest coverage
         pip install -e .
-        pip install coverage
-    
+
     - name: Run Unittests
       run: |
         coverage run -m pytest --verbose sqlite_rx/tests
         coverage combine
         coverage report -m
-      

.gitignore

@@ -15,4 +15,3 @@ start_server.py
 run_client.py
 curve_client.py
 .pypy3venv/
-

.pre-commit-config.yaml

@@ -0,0 +1,18 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+        args: ['--maxkb=2000']
+-   repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.4.2
+    hooks:
+    -   id: black
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.291
+    hooks:
+    -   id: ruff
+        args: ["check", "--select", "I", "--fix"]

Dockerfile

@@ -1,5 +1,25 @@
-FROM python:3.10.5-slim as base
+FROM python:3-slim AS base
 
+ARG USERNAME=sqliteuser
+ARG UID=1001
+ARG GID=1001
+ARG HOME_DIR=/home/${USERNAME}
+
+# Upgrade OS packages
+RUN set -ex \
+    && apt-get update \
+    && apt-get upgrade -y \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create the group and user
+RUN groupadd --gid ${GID} ${USERNAME} \
+    && useradd -m -u ${UID} -g ${GID} -d ${HOME_DIR} -s /bin/bash ${USERNAME}
+
+RUN chown ${USER_NAME}:${USERNAME} ${HOME_DIR}
+
+FROM base AS builder
 COPY . /sqlite_rx
 
 WORKDIR /svc
@@ -10,10 +30,13 @@ RUN pip install wheel && pip wheel --wheel-dir=/svc/wheels /sqlite_rx[cli]
 RUN rm -rf /sqlite_rx
 
 
-FROM python:3.10.5-slim
+FROM base
 
-COPY --from=base /svc /svc
+COPY --from=builder /svc /svc
 WORKDIR /svc
 
 RUN pip install --upgrade pip
-RUN pip install --no-index /svc/wheels/*.whl
+RUN pip install --no-index /svc/wheels/*.whl
+
+USER ${USERNAME}
+WORKDIR ${HOME_DIR}

README.md

@@ -1,23 +1,22 @@
-# sqlite_rx 
+# sqlite_rx
 [![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.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/)
 [![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/)
+[![Python 3.13](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3130/)
+[![Python 3.14](https://img.shields.io/badge/python-3.14-blue.svg)](https://www.python.org/downloads/release/python-3140/)
 
-
-[![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)
+[![PyPy3.10](https://img.shields.io/badge/python-PyPy3.10-blue.svg)](https://www.pypy.org/download.html)
+[![PyPy3.11](https://img.shields.io/badge/python-PyPy3.11-blue.svg)](https://www.pypy.org/download.html)
 
 
 #### For documentation, usage and examples refer [https://aosingh.github.io/sqlite_rx/](https://aosingh.github.io/sqlite_rx/)
 
 # Introduction
 
-[SQLite](https://www.sqlite.org/index.html) is a lightweight database written in C. 
+[SQLite](https://www.sqlite.org/index.html) is a lightweight database written in C.
 Python has in-built support to interact with the database (locally) which is either stored on disk or in memory.
 
 With `sqlite_rx`, clients should be able to communicate with an `SQLiteServer` in a fast, simple and secure manner and execute queries remotely.
@@ -47,10 +46,10 @@ from sqlite_rx.server import SQLiteServer
 
 def main():
 
-    # database is a path-like object giving the pathname 
-    # of the database file to be opened. 
-    
-    # You can use ":memory:" to open a database connection to a database 
+    # database is a path-like object giving the pathname
+    # of the database file to be opened.
+
+    # You can use ":memory:" to open a database connection to a database
     # that resides in RAM instead of on disk
 
     server = SQLiteServer(database=":memory:",
@@ -85,4 +84,3 @@ with client:
 
 {'error': None, 'items': []}
 ```
-

docker-compose.yaml

@@ -10,4 +10,4 @@ services:
       - data:/data
 
 volumes:
-  data: {}
+  data: {}

docker_examples/docker-compose-curvezmq.yaml

@@ -11,4 +11,4 @@ services:
       - /Users/as/.curve:/root/.curve
 
 volumes:
-  data: {}
+  data: {}

docker_examples/docker-compose-ondisk.yaml

@@ -10,4 +10,4 @@ services:
       - data:/data
 
 volumes:
-  data: {}
+  data: {}