Changes for release and deployment (#296)

joachimmetz · web-flow · commit b5865d97b961 · 2025-11-24T16:08:44.000+01:00
diff --git a/config/dpkg/changelog b/config/dpkg/changelog
@@ -1,5 +1,5 @@
-dfdatetime (20251018-1) unstable; urgency=low
+dfdatetime (20251124-1) unstable; urgency=low
 
   * Auto-generated
 
- -- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com>  Sat, 18 Oct 2025 13:07:39 +0200
+ -- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com>  Mon, 24 Nov 2025 13:07:20 +0100
diff --git a/dfdatetime/__init__.py b/dfdatetime/__init__.py
@@ -25,4 +25,4 @@
 from dfdatetime import webkit_time
 
 
-__version__ = '20251018'
+__version__ = '20251124'
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/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = dfdatetime
-version = 20251120
+version = 20251124
 description = Digital Forensics date and time (dfDateTime).
 long_description = dfDateTime, or Digital Forensics date and time, provides date and time objects to preserve accuracy and precision.
 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/tests/apfs_time.py b/tests/apfs_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the APFS timestamp implementation."""
 
diff --git a/tests/cocoa_time.py b/tests/cocoa_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the Cocoa time implementation."""
 
diff --git a/tests/delphi_date_time.py b/tests/delphi_date_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the Delphi TDateTime implementation."""
 
diff --git a/tests/dotnet_datetime.py b/tests/dotnet_datetime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the .NET DateTime implementation."""
 
diff --git a/tests/factory.py b/tests/factory.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the date and time values factory."""
 
diff --git a/tests/fake_time.py b/tests/fake_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the fake time implementation."""
 
diff --git a/tests/fat_date_time.py b/tests/fat_date_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the FAT date time implementation."""
 
diff --git a/tests/filetime.py b/tests/filetime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the FILETIME timestamp implementation."""
 
diff --git a/tests/hfs_time.py b/tests/hfs_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the HFS time implementation."""
 
diff --git a/tests/interface.py b/tests/interface.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the date and time interfaces."""
 
diff --git a/tests/java_time.py b/tests/java_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the Java java.util.Date timestamp implementation."""
 
diff --git a/tests/ole_automation_date.py b/tests/ole_automation_date.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the OLE Automation date implementation."""
 
diff --git a/tests/posix_time.py b/tests/posix_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the POSIX time implementation."""
 
diff --git a/tests/precisions.py b/tests/precisions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for date and time precision helpers."""
 
diff --git a/tests/rfc2579_date_time.py b/tests/rfc2579_date_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the RFC2579 date-time implementation."""
 
diff --git a/tests/semantic_time.py b/tests/semantic_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the semantic time implementation."""
 
diff --git a/tests/systemtime.py b/tests/systemtime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the SYSTEMTIME structure implementation."""
 
diff --git a/tests/time_elements.py b/tests/time_elements.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the time elements implementation."""
 
diff --git a/tests/uuid_time.py b/tests/uuid_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the UUID version 1 time implementation."""
 
diff --git a/tests/webkit_time.py b/tests/webkit_time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Tests for the WebKit time implementation."""
 
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 dfdatetime tests
-
 [testenv:docs]
 usedevelop = True
 deps =
@@ -52,11 +45,8 @@ setenv =
 deps =
   -rrequirements.txt
   -rtest_requirements.txt
-  docformatter
   pylint >= 3.3.0, < 3.4.0
-  setuptools
+  setuptools >= 65
 commands =
-  docformatter --version
   pylint --version
-  docformatter --check --diff --recursive dfdatetime setup.py tests
   pylint --rcfile=.pylintrc dfdatetime setup.py tests
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 dfdatetime/__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
 dfdatetime (${VERSION}-1) unstable; urgency=low
 
@@ -25,7 +29,7 @@ dfdatetime (${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
`@@ -25,4 +25,4 @@`
`25`	`25`	`from dfdatetime import webkit_time`
`26`	`26`
`27`	`27`
`28`		`-__version__ = '20251018'`
	`28`	`+__version__ = '20251124'`
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`