Changes for release and deployment

joachimmetz · joachimmetz · commit 154dcc1b23b2 · 2025-11-24T13:31:13.000+01:00
diff --git a/config/dpkg/changelog b/config/dpkg/changelog
@@ -1,5 +1,5 @@
-sqlite-kb (20240211-1) unstable; urgency=low
+sqlite-kb (20251124-1) unstable; urgency=low
 
   * Auto-generated
 
- -- Joachim Metz <joachim.metz@gmail.com>  Sun, 11 Feb 2024 14:27:21 +0100
+ -- Joachim Metz <joachim.metz@gmail.com>  Mon, 24 Nov 2025 13:30:53 +0100
diff --git a/docs/sources/api/sqliterc.rst b/docs/sources/api/sqliterc.rst
@@ -9,29 +9,29 @@ sqliterc.resources module
 
 .. automodule:: sqliterc.resources
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 sqliterc.schema\_extractor module
 ---------------------------------
 
 .. automodule:: sqliterc.schema_extractor
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 sqliterc.yaml\_definitions\_file module
 ---------------------------------------
 
 .. automodule:: sqliterc.yaml_definitions_file
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 Module contents
 ---------------
 
 .. automodule:: sqliterc
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,10 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
-
-[tool.docformatter]
-black = false
-non-cap = ["dfDateTime", "dfImageTools", "dfVFS", "dfWinReg", "dtFabric", "iMessage", "iOS", "iPod", "mDNS"]
-non-strict = false
-wrap-summaries = 80
-wrap-descriptions = 80
diff --git a/run_tests.py b/run_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Script to run the tests."""
 
diff --git a/scripts/extract.py b/scripts/extract.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Script to extract the schema of SQLite database files."""
 
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = sqliterc
-version = 20251121
+version = 20251124
 description = SQLite database resources (sqliterc)
 long_description = sqliterc is a Python module part of sqlite-kb to allow reuse of SQLite database resources.
 long_description_content_type = text/plain
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Installation and deployment script."""
 
diff --git a/sqliterc/__init__.py b/sqliterc/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """SQLite Database resources (sqliterc)."""
 
-__version__ = '20240211'
+__version__ = '20251124'
diff --git a/tests/resources.py b/tests/resources.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the SQLite database resources."""
 
diff --git a/tests/schema_extractor.py b/tests/schema_extractor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the SQLite database file schema extractor."""
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{10,11,12,13,14},coverage,docformatter,docs,lint,wheel
+envlist = py3{10,11,12,13,14},coverage,docs,lint,wheel
 
 [testenv]
 allowlist_externals = ./run_tests.py
@@ -25,13 +25,6 @@ commands =
   coverage: coverage xml
   wheel: python -m build --no-isolation --wheel
 
-[testenv:docformatter]
-usedevelop = True
-deps =
-  docformatter
-commands =
-  docformatter --in-place --recursive sqliterc tests
-
 [testenv:docs]
 usedevelop = True
 deps =
@@ -52,14 +45,11 @@ setenv =
 deps =
   -rrequirements.txt
   -rtest_requirements.txt
-  docformatter
   pylint >= 3.3.0, < 3.4.0
-  setuptools
+  setuptools >= 65
   yamllint >= 1.26.0
 commands =
-  docformatter --version
   pylint --version
   yamllint -v
-  docformatter --check --diff --recursive scripts setup.py sqliterc tests
   pylint --rcfile=.pylintrc scripts setup.py sqliterc tests
   yamllint -c .yamllint.yaml sqliterc test_data
diff --git a/utils/check_dependencies.py b/utils/check_dependencies.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Script to check for the availability and version of dependencies."""
 
diff --git a/utils/update_release.sh b/utils/update_release.sh
@@ -6,16 +6,20 @@
 EXIT_FAILURE=1;
 EXIT_SUCCESS=0;
 
-VERSION=`date -u +"%Y%m%d"`
-DPKG_DATE=`date -R`
+VERSION=$(date -u +"%Y%m%d")
 
 # Update the Python module version.
 sed "s/__version__ = '[0-9]*'/__version__ = '${VERSION}'/" -i sqliterc/__init__.py
 
 # Update the version in the setuptools configuration.
 sed "s/version = [0-9]*/version = ${VERSION}/" -i setup.cfg
 
+# Ensure shebangs of Python scripts are consistent.
+find . -name \*.py -exec sed '1s?^#!.*$?#!/usr/bin/env python3?' -i {} \;
+
 # Update the version in the dpkg configuration files.
+DPKG_DATE=$(date -R)
+
 cat > config/dpkg/changelog << EOT
 sqlite-kb (${VERSION}-1) unstable; urgency=low
 
@@ -25,7 +29,7 @@ sqlite-kb (${VERSION}-1) unstable; urgency=low
 EOT
 
 # Regenerate the API documentation.
-tox -edocformatter,docs
+tox -edocs
 
 exit ${EXIT_SUCCESS};
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`	`# -- coding: utf-8 --`
`3`	`3`	`"""Script to run the tests."""`
`4`	`4`