diff --git a/artifactsrc/__init__.py b/artifactsrc/__init__.py index 1f7fb5b..ef3647c 100644 --- a/artifactsrc/__init__.py +++ b/artifactsrc/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- """ForensicArtifacts.com Artifact Repository resources.""" -__version__ = '20240112' +__version__ = '20251124' diff --git a/pyproject.toml b/pyproject.toml index ee74093..9787c3b 100644 --- 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 index 34f39ac..801a888 100755 --- 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 index 0bdf4f8..c1ae205 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = artifactsrc -version = 20251121 +version = 20251124 description = Digital Forensics Artifact knowledge base long_description = Documentation accompanying the Digital Forensics Artifact Repository. long_description_content_type = text/plain diff --git a/setup.py b/setup.py index 888841c..232fc4f 100755 --- 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/resource_file.py b/tests/resource_file.py index 0d2a0da..8e03e46 100644 --- a/tests/resource_file.py +++ b/tests/resource_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """Tests for the Windows Message Resource (WRC) file class.""" diff --git a/tools/__init__.py b/tools/__init__.py index faa18be..56fafa5 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- diff --git a/tools/check_artifacts.py b/tools/check_artifacts.py index d7bc08d..d5e2eac 100755 --- a/tools/check_artifacts.py +++ b/tools/check_artifacts.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """Script to check artifact definitions on a storage media image.""" diff --git a/tools/generate_docs.py b/tools/generate_docs.py index a92baa6..255c6b7 100755 --- a/tools/generate_docs.py +++ b/tools/generate_docs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """Script to generate artifact definition documentation.""" diff --git a/tox.ini b/tox.ini index 98b65c9..0bfbf9c 100644 --- 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 artifactsrc 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 artifactsrc setup.py tests tools pylint --rcfile=.pylintrc artifactsrc setup.py tests tools yamllint -c .yamllint.yaml artifactsrc diff --git a/utils/check_dependencies.py b/utils/check_dependencies.py index 131738e..73c1ba4 100755 --- 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 index b7ec2c6..e08ede5 100755 --- a/utils/update_release.sh +++ b/utils/update_release.sh @@ -6,7 +6,7 @@ EXIT_FAILURE=1; EXIT_SUCCESS=0; -VERSION=`date -u +"%Y%m%d"` +VERSION=$(date -u +"%Y%m%d") # Update the Python module version. sed "s/__version__ = '[0-9]*'/__version__ = '${VERSION}'/" -i artifactsrc/__init__.py @@ -14,6 +14,9 @@ sed "s/__version__ = '[0-9]*'/__version__ = '${VERSION}'/" -i artifactsrc/__init # 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 {} \; + # Regenerate the API documentation. tox -edocs