Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions .ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ shCiArtifactUploadCustom() {(set -e
git fetch origin artifact
git checkout origin/artifact "branch-$GITHUB_BRANCH0"
mv "branch-$GITHUB_BRANCH0"/* .
git add -f _sqlmath* sqlmath_wasm.*
git add -f sqlmath_wasm.*
# screenshot html
PID_LIST=""
shBrowserScreenshot \
Expand Down Expand Up @@ -110,11 +110,25 @@ process.stdout.write(
shCiTestNodejs
#
# upload artifact
if (shCiMatrixIsmainNodeversion) && ( \
[ "$GITHUB_BRANCH0" = alpha ] \
|| [ "$GITHUB_BRANCH0" = beta ] \
|| [ "$GITHUB_BRANCH0" = master ] \
)
if (shCiMatrixIsmainNodeversion) && \
( \
[ "$GITHUB_EVENT_NAME" = push ] || \
[ "$GITHUB_EVENT_NAME" = schedule ] || \
[ "$GITHUB_EVENT_NAME" = workflow_dispatch ] \
) && \
( \
[ "$GITHUB_BRANCH0" = alpha ] || \
[ "$GITHUB_BRANCH0" = beta ] || \
[ "$GITHUB_BRANCH0" = master ] \
)
then
shCiBaseCustomArtifactUpload
fi
)}

shCiBaseCustomArtifactUpload() {(set -e
# This function will upload build-artifacts to branch-gh-pages.
if [ ! "$GITHUB_UPLOAD_RETRY" ]
then
export GITHUB_UPLOAD_RETRY=0
while true
Expand All @@ -139,11 +153,8 @@ import moduleChildProcess from "child_process";
fi
sleep 5
done
return
fi
)}

shCiBaseCustomArtifactUpload() {(set -e
# This function will upload build-artifacts to branch-gh-pages.
COMMIT_MESSAGE="- upload artifact
- retry$GITHUB_UPLOAD_RETRY
- $GITHUB_BRANCH0
Expand Down Expand Up @@ -426,7 +437,8 @@ shCiPublishNpmCustom() {(set -e
git checkout origin/artifact \
branch-beta/_sqlmath* \
branch-beta/sqlmath_wasm*
cp -a branch-beta/_sqlmath* .
cp -a branch-beta/_sqlmath.napi* .
cp -a branch-beta/_sqlmath.shell* .
cp -a branch-beta/sqlmath_wasm.* .
# npm-publish
npm publish --access public
Expand Down
41 changes: 27 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# and upload build-artifacts to branch-gh-pages
name: ci
on:
pull_request:
branches:
- alpha
- beta
- master
push:
branches:
- alpha
Expand Down Expand Up @@ -37,8 +42,8 @@ jobs:
${{ matrix.architecture }}
${{ matrix.os }}
CI_MATRIX_NAME_MAIN: "node v24 x64 ubuntu-latest"
CI_MATRIX_NODE_VERSION: v${{ matrix.node_version }}
CI_MATRIX_NODE_VERSION_MAIN: v24
CI_MATRIX_NODE_VERSION: ${{ matrix.node_version }}
CI_MATRIX_NODE_VERSION_MAIN: "24"
CI_WORKFLOW_NAME: >
${{ github.workflow }}
- ${{ github.event_name }}
Expand All @@ -57,33 +62,41 @@ jobs:
echo "$(date -u +"%Y-%m-%d %TZ") - ${{ env.CI_WORKFLOW_NAME }}" # "
git config --global core.autocrlf false
# https://github.com/actions/checkout
- uses: actions/checkout@v4
- uses: actions/checkout@v5
# https://github.com/actions/cache
- uses: actions/cache@v5
with:
key: >
${{ hashFiles('./package.json') }}
${{ matrix.architecture }}
${{ matrix.node_version }}
${{ matrix.os }}
path: .github_cache/
# fetch jslint_ci.sh from trusted source
- run: |
git fetch origin alpha --depth=1
sh -c 'for FILE in .ci.sh .ci2.sh jslint_ci.sh myci2.sh; do
if [ -f "$FILE" ]; then git checkout origin/alpha "$FILE"; fi; done'
# pre-run .ci.sh
- run: sh jslint_ci.sh shCiPre
if: >
github.event_name == 'push' ||
github.event_name == 'schedule' ||
github.event_name == 'workflow_dispatch'
# https://github.com/actions/setup-node
- uses: actions/setup-node@v4
- uses: actions/setup-node@v5
with:
node-version: ${{ matrix.node_version }}
# https://github.com/actions/setup-python
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python_version }}
# https://github.com/actions/cache
- uses: actions/cache@v4
with:
key: >
${{ hashFiles('./package.json') }}
${{ matrix.architecture }}
${{ matrix.node_version }}
${{ matrix.os }}
path: .github_cache
# run nodejs coverages and tests
- run: sh jslint_ci.sh shCiBase
# upload build-artifacts to branch-gh-pages
- run: sh jslint_ci.sh shCiArtifactUpload
if: >
github.event_name == 'push' ||
github.event_name == 'schedule' ||
github.event_name == 'workflow_dispatch'
# base - .github/workflows/ci.yml - end
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
- sqlite - Add similar error-handling from builtin-sql-function PERCENTILE() into custom-sql-function QUANTILE().
- none

# v2026.3.2-beta
- ci - Update file .github/workflows/ci.yml with hook to run on pull-request.

# v2026.3.1
- sqlmath-python - bugfix - Fix 762-character-limit SQL-string-bug in python-function db_exec().
- jslint-ci - Update shell-function shLintPython().
Expand Down
10 changes: 5 additions & 5 deletions PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: sqlmath
Version: 2026.3.1
Version: 2026.3.2
Summary: sqlite for datascience
Author: Kai Zhu
Requires-Python: >=3.10
Expand Down Expand Up @@ -146,11 +146,11 @@ PORT=8080 sh jslint_ci.sh shHttpFileServer
```shell
python -m build
#
twine upload --repository testpypi dist/sqlmath-2026.3.1*
py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2026.3.1
twine upload --repository testpypi dist/sqlmath-2026.3.2*
py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2026.3.2
#
twine upload dist/sqlmath-2026.3.1*
pip install sqlmath==2026.3.1
twine upload dist/sqlmath-2026.3.2*
pip install sqlmath==2026.3.2
```


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ PORT=8080 sh jslint_ci.sh shHttpFileServer
```shell
python -m build
#
twine upload --repository testpypi dist/sqlmath-2026.3.1*
py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2026.3.1
twine upload --repository testpypi dist/sqlmath-2026.3.2*
py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2026.3.2
#
twine upload dist/sqlmath-2026.3.1*
pip install sqlmath==2026.3.1
twine upload dist/sqlmath-2026.3.2*
pip install sqlmath==2026.3.2
```


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
},
"shCiArtifactUpload": 1,
"shCiPublishNpm": 1,
"version": "2026.3.1"
"version": "2026.3.2-beta"
}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ backend-path = ["."]
# https://peps.python.org/pep-0621/#example
[project]
name = "sqlmath"
version = "2026.3.1"
version = "2026.3.2"
description = "sqlite for datascience"
authors = [{name = "Kai Zhu"}]
maintainers = []
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
python setup.py build_ext
"""

__version__ = "2026.3.1"
__version_info__ = ("2026", "3", "1")
__version__ = "2026.3.2"
__version_info__ = ("2026", "3", "2")

import asyncio
import base64
Expand Down
2 changes: 1 addition & 1 deletion sqlmath.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ let {
let sqlMessageDict = {}; // dict of web-worker-callbacks
let sqlMessageId = 0;
let sqlWorker;
let version = "v2026.3.1";
let version = "v2026.3.2-beta";

async function assertErrorThrownAsync(asyncFunc, regexp) {

Expand Down
4 changes: 2 additions & 2 deletions sqlmath/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

"""sqlmath.py."""

__version__ = "2026.3.1"
__version_info__ = ("2026", "3", "1")
__version__ = "2026.3.2"
__version_info__ = ("2026", "3", "2")

import csv
import io
Expand Down