Merge pull request #125 from palewire/pytest

Switch to using `pytest` for unit testing

.github/workflows/continuous-deployment.yml

@@ -62,15 +62,15 @@ jobs:
 
       - id: install-python-dependencies
         name: Install Python dependencies
-        run: pip install requests click python-dateutil pandas
+        run: pip install requests click python-dateutil pandas pytest pytest-cov pytest-xdist
 
       - id: download-data
         name: Download data
         run: python -c 'import cpi'
 
       - id: tests
         name: Run tests
-        run: python tests.py
+        run: pytest -n auto --cov=cpi --cov-report term-missing tests
 
       - id: update
         name: Update data
@@ -96,15 +96,15 @@ jobs:
         name: Install Python dependencies
         run: |
           $CONDA/bin/conda create -n cpi python=${{ matrix.python }}
-          $CONDA/bin/conda install -n cpi requests click python-dateutil pandas
+          $CONDA/bin/conda install -n cpi requests click python-dateutil pandas pytest pytest-cov pytest-xdist
 
       - id: download-data
         name: Download data
         run: $CONDA/bin/conda run -n cpi python -c 'import cpi'
 
       - id: tests
         name: Run tests
-        run: $CONDA/bin/conda run -n cpi python tests.py
+        run: $CONDA/bin/conda run -n cpi pytest -n auto --cov=cpi --cov-report term-missing tests
 
       - id: update
         name: Update data
@@ -113,7 +113,7 @@ jobs:
   test-build:
     name: Build Python package
     runs-on: ubuntu-latest
-    needs: [test-python, test-conda]
+    needs: [test-python, test-conda, lint-python, mypy-python]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -123,28 +123,28 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
-          cache: 'pipenv'
-
-      - name: Install pipenv
-        run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
 
       - id: install-python-dependencies
         name: Install Python dependencies
-        run: pipenv install --dev --python `which python`
+        run: pip install requests click python-dateutil pandas twine setuptools-scm wheel
+        shell: bash
+
+      - id: create-db
+        name: Create database
+        run: python -c 'import cpi'
         shell: bash
 
       - id: build
         name: Build release
         run: |
-          pipenv run python -c 'import cpi'
-          pipenv run python setup.py sdist
-          pipenv run python setup.py bdist_wheel
+          python setup.py sdist
+          python setup.py bdist_wheel
           ls -l dist
         shell: bash
 
       - id: check
         name: Check release
-        run: pipenv run twine check dist/*
+        run: twine check dist/*
         shell: bash
 
       - id: save

Pipfile

@@ -8,6 +8,7 @@ requests = "*"
 click = "*"
 python-dateutil = "*"
 pandas = "*"
+numpy = "*"
 
 [dev-packages]
 jupyterlab = "*"
@@ -20,6 +21,9 @@ sphinx = "*"
 sphinx-autobuild = "*"
 sphinx-palewire-theme = "*"
 myst-parser = "*"
+pytest = "*"
+pytest-cov = "*"
+pytest-xdist = "*"
 
 [requires]
 python_version = "3.11"

cpi/models.py

@@ -52,7 +52,7 @@ def query(sql: str, params: list | tuple | None = None) -> list[dict]:
     return result_list
 
 
-def queryone(sql: str, params: list | tuple) -> dict:
+def queryone(sql: str, params: list | tuple | None = None) -> dict:
     """Query the cpi.db database and return a single result.
 
     Args:

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+pythonpath = .