Add tests to the Python build, wheel, and Mypyc packages.

Create shared tests to be used for both unit and integration
testing, and increase the coverage of unit tests to 100%. Additionally,
before publishing the pre-release, run the shared tests against the
build version for each OS supported by the code.

The intention here is to ensure that all build packages are tested
and function correctly for all supported features.

Resolves: #577

.github/workflows/pre_release.yml

@@ -155,6 +155,14 @@ jobs:
     steps:
       - name: Checkout source at ${{ matrix.platform }}
         uses: actions/checkout@v4
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Prepare build
+        run: |
+          pip install -U pip tomlkit
+          python bin/cibw-before-build.py
       - name: Build wheels
         uses: pypa/[email protected]
         with:

.gitignore

@@ -89,6 +89,7 @@ parts/
 sdist/
 var/
 wheels/
+wheelhouse/
 share/python-wheels/
 *.egg-info/
 .installed.cfg

Dockerfile.it

@@ -16,7 +16,7 @@ WORKDIR /svc
 COPY requirements/tests.txt /svc/
 RUN pip install pip setuptools wheel --upgrade \
     && pip wheel --wheel-dir=/svc/wheels -r tests.txt \
-        poetry-core>=1.0.0
+    && pip install poetry-core>=1.0.0
 
 FROM python:3.12-alpine
 
@@ -57,6 +57,7 @@ ARG VERSION=1
 RUN echo "Version: ${VERSION}"
 
 COPY .docker/* requirements/tests.txt tests/integration/*.py tests/integration/*.ini /app/
+COPY tests/integration/shared/*.py tests/shared/ /app/shared/
 
 RUN pip install pip setuptools wheel --upgrade \
     && pip install --no-index --find-links=/svc/wheels -r tests.txt \
@@ -74,4 +75,4 @@ RUN pip install pip setuptools wheel --upgrade \
 
 USER flask_user
 
-CMD ./wait-for.sh ${SITE_DOMAIN}:${SITE_PORT} -t 600 -- pytest --junitxml=test-results/junit.xml
+CMD ./wait-for.sh ${SITE_DOMAIN}:${SITE_PORT} -t 600 -- pytest -n auto --junitxml=test-results/junit.xml

Dockerfile.local

@@ -77,6 +77,4 @@ USER flask_user
 ARG VERSION=1
 RUN echo "Version: ${VERSION}"
 
-COPY .docker/* /app/
-COPY tests/test_apps/app/__init__.py /app/app.py
-COPY tests/test_apps/async_app/__init__.py /app/async_app.py
+COPY .docker/* tests/test_apps/ /app/

Dockerfile.py310.test

@@ -18,7 +18,7 @@ RUN set -ex \
     && pip install -r requirements/base.txt \
     && pip install -r requirements/style.txt \
     && pip install -r requirements/tests.txt \
-        poetry-core>=1.0.0 \
+    && pip install poetry-core>=1.0.0 \
     && apk del .build-deps \
     && addgroup -S kuchulu \
     && adduser \

Dockerfile.py311.test

@@ -18,7 +18,7 @@ RUN set -ex \
     && pip install -r requirements/base.txt \
     && pip install -r requirements/style.txt \
     && pip install -r requirements/tests.txt \
-        poetry-core>=1.0.0 \
+    && pip install poetry-core>=1.0.0 \
     && apk del .build-deps \
     && addgroup -S kuchulu \
     && adduser \

Dockerfile.py312.test

@@ -18,7 +18,7 @@ RUN set -ex \
     && pip install -r requirements/base.txt \
     && pip install -r requirements/style.txt \
     && pip install -r requirements/tests.txt \
-        poetry-core>=1.0.0 \
+    && pip install poetry-core>=1.0.0 \
     && apk del .build-deps \
     && addgroup -S kuchulu \
     && adduser \

Dockerfile.py38.test

@@ -18,7 +18,7 @@ RUN set -ex \
     && pip install -r requirements/base.txt \
     && pip install -r requirements/style.txt \
     && pip install -r requirements/tests.txt \
-        poetry-core>=1.0.0 \
+    && pip install poetry-core>=1.0.0 \
     && apk del .build-deps \
     && addgroup -S kuchulu \
     && adduser \

Dockerfile.py39.test

@@ -18,7 +18,7 @@ RUN set -ex \
     && pip install -r requirements/base.txt \
     && pip install -r requirements/style.txt \
     && pip install -r requirements/tests.txt \
-        poetry-core>=1.0.0 \
+    && pip install poetry-core>=1.0.0 \
     && apk del .build-deps \
     && addgroup -S kuchulu \
     && adduser \

MANIFEST.in

@@ -11,4 +11,4 @@ graft docs
 prune docs/_build
 graft examples
 graft tests
-global-exclude *~ *.py[cod] *.so *.swp *.editorconfig __pycache__
+global-exclude *~ *.py[cod] *.so *.swp *.editorconfig __pycache__ .tox **/.tox venv .venv .venv.* **/venv **/.venv **/.venv.*

Makefile

@@ -7,7 +7,7 @@ all: clean test
 
 clean:
 	@find {src,examples,tests} -regex ".*\.\(so\|pyc\)" | xargs rm -rf
-	@find {src,examples,tests} -name "__pycache__" -o -name ".coverage" -o -name ".tox"  -o -name ".pytest_cache" -o -name ".ruff_cache"  -o -name ".pkg" -o -name ".tmp" | xargs rm -rf
+	@find {src,examples,tests} -name "__pycache__" -o -name ".coverage" -o -name "junit" -o -name "coverage.lcov" -o -name "htmlcov" -o -name ".tox"  -o -name ".pytest_cache" -o -name ".ruff_cache"  -o -name ".pkg" -o -name ".tmp" | xargs rm -rf
 	@rm -rf .coverage coverage.* .eggs/ .mypy_cache/ .pytype/ .ruff_cache/ .pytest_cache/ .tox/ src/*.egg-info/ htmlcov/ junit/ htmldoc/ build/ dist/ wheelhouse/
 
 style:
@@ -33,6 +33,7 @@ release: test
 	@python -m pip install --upgrade -r requirements/cbuild.txt
 	@python -m build
 	@MYPYC_ENABLE=1 python setup.py bdist_wheel
+	@cibuildwheel --config-file pyproject.mypyc.toml
 
 publish-test: release
 	@python -m pip install --upgrade twine

bin/cibw-before-build.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# Copyright (c) 2024-2024, Cenobit Technologies, Inc. http://cenobit.es/
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# * Neither the name of the Cenobit Technologies nor the names of
+#    its contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+import tomllib
+
+from tomlkit import dumps
+
+with open('pyproject.toml', 'rb') as fp:
+    pyproject = tomllib.load(fp)
+
+pyproject['build-system']['requires'] = ['setuptools>=61.0', 'wheel>=0.42', 'mypy', 'pydantic']
+pyproject['build-backend'] = 'setuptools.build_meta'
+
+with open('pyproject.toml', 'wb') as fp:
+    fp.write(dumps(pyproject))

docker-compose.it.yml

@@ -27,7 +27,7 @@ services:
       - FLASK_SERVER_NAME=app:5000
     user: ${UID:-0}:${GID:-0}
     command: >
-      python app.py
+      python -m app
     ports:
       - '5000:5000'
     networks:
@@ -45,6 +45,8 @@ services:
       - API_URL=https://async-app.flask-jsonrpc.cenobit.es/api
       - BROWSABLE_API_URL=https://async-app.flask-jsonrpc.cenobit.es/api/browse
     user: ${UID:-0}:${GID:-0}
+    command: >
+      ./wait-for.sh async-app.flask-jsonrpc.cenobit.es:80 -t 600 -- pytest -n auto --junitxml=test-results/junit.xml test_async_app.py
     volumes:
       - .pytest_cache/test-results/async-app:/app/test-results
       - .pytest_cache/screnshots/async-app:/app/.pytest_cache/screnshots
@@ -63,7 +65,7 @@ services:
       - FLASK_SERVER_NAME=async-app:5000
     user: ${UID:-0}:${GID:-0}
     command: >
-      python async-app.py
+      python -m async_app
     ports:
       - '5001:5000'
     networks:
@@ -99,7 +101,7 @@ services:
       - FLASK_SERVER_NAME=mypyc-app:5000
     user: ${UID:-0}:${GID:-0}
     command: >
-      python app.py
+      python -m app
     ports:
       - '5002:5000'
     networks:

examples/javascript/tox.ini

@@ -11,7 +11,11 @@ envtmpdir = {toxworkdir}/tmp/{envname}
 constrain_package_deps = true
 use_frozen_constraints = true
 deps = 
-    pytest
+    pytest==8.3.3
+    pytest-cov==5.0.0
+    pytest-xdist==3.6.1
+    pytest-sugar==1.0.0
+    pytest-env==1.1.5
     async: Flask[async]>=3.0.0,<4.0
 commands =
-    pytest -vv --tb=short --basetemp={envtmpdir} {posargs}
+    pytest -n auto -vv --tb=short --basetemp={envtmpdir} {posargs}

examples/minimal-async/tests/test_app.py

@@ -166,7 +166,7 @@ def test_multi_decorators(client: 'FlaskClient') -> None:
         'id': 1,
         'jsonrpc': '2.0',
         'result': {
-            'headers': 'User-Agent: Werkzeug/3.0.4\r\n'
+            'headers': 'User-Agent: Werkzeug/3.0.6\r\n'
             'Host: localhost\r\n'
             'Content-Type: application/json\r\n'
             'Content-Length: 78\r\n'

examples/minimal-async/tox.ini

@@ -11,7 +11,11 @@ envtmpdir = {toxworkdir}/tmp/{envname}
 constrain_package_deps = true
 use_frozen_constraints = true
 deps = 
-    pytest
+    pytest==8.3.3
+    pytest-cov==5.0.0
+    pytest-xdist==3.6.1
+    pytest-sugar==1.0.0
+    pytest-env==1.1.5
     async: Flask[async]>=3.0.0,<4.0
 commands =
-    pytest -vv --tb=short --basetemp={envtmpdir} {posargs}
+    pytest -n auto -vv --tb=short --basetemp={envtmpdir} {posargs}

examples/minimal/tests/test_app.py

@@ -166,7 +166,7 @@ def test_multi_decorators(client: 'FlaskClient') -> None:
         'id': 1,
         'jsonrpc': '2.0',
         'result': {
-            'headers': 'User-Agent: Werkzeug/3.0.4\r\n'
+            'headers': 'User-Agent: Werkzeug/3.0.6\r\n'
             'Host: localhost\r\n'
             'Content-Type: application/json\r\n'
             'Content-Length: 78\r\n'

examples/minimal/tox.ini

@@ -11,7 +11,11 @@ envtmpdir = {toxworkdir}/tmp/{envname}
 constrain_package_deps = true
 use_frozen_constraints = true
 deps = 
-    pytest
+    pytest==8.3.3
+    pytest-cov==5.0.0
+    pytest-xdist==3.6.1
+    pytest-sugar==1.0.0
+    pytest-env==1.1.5
     async: Flask[async]>=3.0.0,<4.0
 commands =
-    pytest -vv --tb=short --basetemp={envtmpdir} {posargs}
+    pytest -n auto -vv --tb=short --basetemp={envtmpdir} {posargs}

examples/modular/tox.ini

@@ -11,7 +11,11 @@ envtmpdir = {toxworkdir}/tmp/{envname}
 constrain_package_deps = true
 use_frozen_constraints = true
 deps = 
-    pytest
+    pytest==8.3.3
+    pytest-cov==5.0.0
+    pytest-xdist==3.6.1
+    pytest-sugar==1.0.0
+    pytest-env==1.1.5
     async: Flask[async]>=3.0.0,<4.0
 commands =
-    pytest -vv --tb=short --basetemp={envtmpdir} {posargs}
+    pytest -n auto -vv --tb=short --basetemp={envtmpdir} {posargs}

examples/multiplesite/tests/test_app.py

@@ -26,6 +26,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 import typing as t
 
+import pytest
+from multiplesite.app import UnauthorizedError
+
 if t.TYPE_CHECKING:
     from flask.testing import FlaskClient
 
@@ -46,6 +49,15 @@ def test_index_v2(client: 'FlaskClient') -> None:
     assert rv.status_code == 200
 
 
+def test_index_v2_with_invalid_auth(client: 'FlaskClient') -> None:
+    with pytest.raises(UnauthorizedError):
+        client.post(
+            '/api/v2',
+            json={'id': 1, 'jsonrpc': '2.0', 'method': 'App.index'},
+            headers={'X-Username': 'username', 'X-Password': 'invalid'},
+        )
+
+
 def test_rpc_describe_v1(client: 'FlaskClient') -> None:
     rv = client.post('/api/v1', json={'id': 1, 'jsonrpc': '2.0', 'method': 'rpc.describe'})
     data = rv.get_json()

examples/multiplesite/tox.ini

@@ -11,7 +11,11 @@ envtmpdir = {toxworkdir}/tmp/{envname}
 constrain_package_deps = true
 use_frozen_constraints = true
 deps = 
-    pytest
+    pytest==8.3.3
+    pytest-cov==5.0.0
+    pytest-xdist==3.6.1
+    pytest-sugar==1.0.0
+    pytest-env==1.1.5
     async: Flask[async]>=3.0.0,<4.0
 commands =
-    pytest -vv --tb=short --basetemp={envtmpdir} {posargs}
+    pytest -n auto -vv --tb=short --basetemp={envtmpdir} {posargs}

examples/openrpc/tox.ini

@@ -11,7 +11,11 @@ envtmpdir = {toxworkdir}/tmp/{envname}
 constrain_package_deps = true
 use_frozen_constraints = true
 deps = 
-    pytest
+    pytest==8.3.3
+    pytest-cov==5.0.0
+    pytest-xdist==3.6.1
+    pytest-sugar==1.0.0
+    pytest-env==1.1.5
     async: Flask[async]>=3.0.0,<4.0
 commands =
-    pytest -vv --tb=short --basetemp={envtmpdir} {posargs}
+    pytest -n auto -vv --tb=short --basetemp={envtmpdir} {posargs}