Changes to dependency writers

.github/workflows/test_docker.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['24.04']
+        version: ['26.04']
     container:
       image: ubuntu:${{ matrix.version }}
     steps:

MANIFEST.in

@@ -1,6 +1,5 @@
-include ACKNOWLEDGEMENTS AUTHORS LICENSE README
+include ACKNOWLEDGEMENTS AUTHORS LICENSE README.md
 include dependencies.ini run_tests.py
-include requirements.txt test_requirements.txt
 exclude .gitignore
 exclude *.pyc
 recursive-include config *
@@ -10,6 +9,5 @@ recursive-include tools *.py
 recursive-exclude tools *.pyc
 recursive-include test_data *
 # The test scripts are not required in a binary distribution package they
-# are considered source distribution files and excluded in find_package()
-# in setup.py.
+# are considered source distribution files and excluded by find_package().
 recursive-include tests *.py

appveyor.yml

@@ -1,31 +1,31 @@
 environment:
   matrix:
-  - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.12"
+  - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.14"
     MACHINE_TYPE: "x86"
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    PYTHON: "C:\\Python312"
-    PYTHON_VERSION: "3.12"
+    PYTHON: "C:\\Python314"
+    PYTHON_VERSION: "3.14"
     L2TBINARIES_TRACK: "dev"
     TARGET: tests
-  - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.12"
+  - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.14"
     MACHINE_TYPE: "amd64"
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    PYTHON: "C:\\Python312-x64"
-    PYTHON_VERSION: "3.12"
+    PYTHON: "C:\\Python314-x64"
+    PYTHON_VERSION: "3.14"
     L2TBINARIES_TRACK: "dev"
     TARGET: tests
-  - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.12"
+  - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.14"
     MACHINE_TYPE: "amd64"
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    PYTHON: "C:\\Python312-x64"
-    PYTHON_VERSION: "3.12"
+    PYTHON: "C:\\Python314-x64"
+    PYTHON_VERSION: "3.14"
     L2TBINARIES_TRACK: "dev"
     TARGET: wheel
-  - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.12"
+  - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.14"
     MACHINE_TYPE: "amd64"
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    PYTHON: "C:\\Python312-x64"
-    PYTHON_VERSION: "3.12"
+    PYTHON: "C:\\Python314-x64"
+    PYTHON_VERSION: "3.14"
     L2TBINARIES_TRACK: "dev"
     TARGET: wheel
   - DESCRIPTION: "Run tests on Mac OS with Python 3.14"

config/docker/build_dpkg.sh

@@ -5,24 +5,36 @@
 # Fail on error.
 set -e
 
-GID=$(id -g);
+GID=$(id -g)
 
-L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds";
-GNUPG_DIRECTORY="${HOME}/Projects/l2tbuilds-gnupg";
+L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds"
+GNUPG_DIRECTORY="${HOME}/Projects/l2tbuilds-gnupg"
 
-cd config/docker;
+cd config/docker
 
-mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg";
-mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg-source";
+mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg"
+mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg-source"
 
 # Build the l2tbuilds Ubuntu Docker image.
-docker build -f l2tbuilds_ubuntu.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_ubuntu . ;
+docker build \
+	-f l2tbuilds_ubuntu.Dockerfile \
+	--force-rm \
+	--no-cache \
+	-t log2timeline/l2tbuilds_ubuntu .
 
-if test -d "${GNUPG_DIRECTORY}";
+if test -d "${GNUPG_DIRECTORY}"
 then
 	# Run the container in interactive mode ("run -it") to use gpg-agent to sign the builds
-	docker run -it -u ${UID}:${GID} -v "${GNUPG_DIRECTORY}:/home/ubuntu/.gnupg:z" -v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu
+	docker run \
+		-it \
+		-u ${UID}:${GID} \
+		-v "${GNUPG_DIRECTORY}:/home/ubuntu/.gnupg:z" \
+		-v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" \
+		log2timeline/l2tbuilds_ubuntu
 else
-	docker run -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu /bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
+	docker run \
+		-u ${UID}:${GID} \
+		-v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" \
+		log2timeline/l2tbuilds_ubuntu \
+		/bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
 fi
-

config/docker/build_rpm.sh

@@ -5,17 +5,34 @@
 # Fail on error.
 set -e
 
-GID=$(id -g);
+GID=$(id -g)
 
-L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds";
+L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds"
 
-cd config/docker;
+cd config/docker
 
-mkdir -p "${L2TBUILDS_DIRECTORY}/rpm";
-mkdir -p "${L2TBUILDS_DIRECTORY}/srpm";
+mkdir -p "${L2TBUILDS_DIRECTORY}/rpm"
+mkdir -p "${L2TBUILDS_DIRECTORY}/srpm"
 
 # Build the l2tbuilds Fedora Docker image.
-docker build -f l2tbuilds_fedora.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_fedora . ;
-docker run -it -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" log2timeline/l2tbuilds_fedora /bin/bash
+docker build \
+	--build-arg GID=${GID} \
+	--build-arg UID=${UID} \
+	-f l2tbuilds_fedora.Dockerfile \
+	--force-rm \
+	--no-cache \
+	-t log2timeline/l2tbuilds_fedora \
+	.
 
-# docker run -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" log2timeline/l2tbuilds_fedora /bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
+docker run \
+	-it \
+	-u ${UID}:${GID} \
+	-v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" \
+	log2timeline/l2tbuilds_fedora \
+	/bin/bash
+
+# docker run \
+# 	-u ${UID}:${GID}
+# 	-v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z"
+# 	log2timeline/l2tbuilds_fedora
+# 	/bin/bash -c "(cd l2tdevtools && ./utils/build_rpm.sh --preset plaso)"

config/docker/l2tbuilds_fedora.Dockerfile

@@ -1,8 +1,11 @@
-FROM fedora:42
+FROM fedora:43
 
 # Create container with:
 # docker build -f l2tbuilds_fedora.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_fedora .
 
+ARG UID=1000
+ARG GID=1000
+
 RUN dnf install -y \
 	@development-tools \
 	autoconf \
@@ -22,6 +25,12 @@ RUN dnf install -y \
 	python3-setuptools \
 	python3-wheel
 
+RUN groupadd --gid ${GID} build && \
+    useradd --create-home --gid ${GID} --shell /bin/bash --uid ${UID} build
+
 # Set up the l2tdevtools source and build directories
-WORKDIR /home/build/
+WORKDIR /home/build
+
+USER build
+
 RUN git clone https://github.com/log2timeline/l2tdevtools.git

config/docker/l2tbuilds_ubuntu.Dockerfile

@@ -11,6 +11,9 @@ RUN apt-get -y update && \
     apt-get -y install apt-transport-https apt-utils && \
     apt-get -y install libterm-readline-gnu-perl software-properties-common && \
     apt-get -y upgrade && \
+    apt-get -y install \
+        locales \
+        pinentry-tty && \
     apt-get -y install --no-install-recommends \
         autoconf \
         automake \
@@ -38,9 +41,7 @@ RUN apt-get -y update && \
 	libssl-dev \
         libtool \
 	libyaml-dev \
-        locales \
         pkg-config \
-	pinentry-tty \
 	pybuild-plugin-pyproject \
         python3-all \
         python3-all-dev \
@@ -63,16 +64,16 @@ RUN apt-get -y update && \
         tox-current-env && \
     apt-get clean && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
 
-# Set terminal to UTF-8 by default
-RUN locale-gen en_US.UTF-8
-RUN update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+# Set terminal to UTF-8 by default and changes pinentry to use TTY
+RUN locale-gen en_US.UTF-8 && \
+    update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 && \
+    update-alternatives --set pinentry /usr/bin/pinentry-tty
 ENV LANG=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
 
-# Changes pinentry to use TTY
-RUN update-alternatives --set pinentry /usr/bin/pinentry-tty
-
 # Set up the l2tdevtools source and build directories
-USER ubuntu
 WORKDIR /home/ubuntu
+
+USER ubuntu
+
 RUN git clone https://github.com/log2timeline/l2tdevtools.git

data/pyinstaller/make_release.ps1

@@ -191,7 +191,7 @@ New-Item -ItemType "directory" -Path "${DistPath}\licenses"
 Copy-Item -Force ACKNOWLEDGEMENTS "${DistPath}"
 Copy-Item -Force AUTHORS "${DistPath}"
 Copy-Item -Force LICENSE "${DistPath}"
-Copy-Item -Force README "${DistPath}"
+Copy-Item -Force README.md "${DistPath}"
 
 Copy-Item -Force -Recurse "dist\image_export\*" "${DistPath}"
 Copy-Item -Force -Recurse "dist\log2timeline\*" "${DistPath}"

data/rpm_templates/artifacts.spec

@@ -62,12 +62,12 @@ rm -rf %{{buildroot}}
 
 %files -n %{{name}}-data
 %license LICENSE
-%doc ACKNOWLEDGEMENTS AUTHORS README
+%doc ACKNOWLEDGEMENTS AUTHORS README.md
 %{{_datadir}}/%{{name}}/*
 
 %files -n python3-%{{name}}
 %license LICENSE
-%doc README
+%doc README.md
 %{{python3_sitelib}}/artifacts
 %{{python3_sitelib}}/artifacts*.egg-info
 

data/rpm_templates/plaso.spec

@@ -62,12 +62,12 @@ rm -rf %{{buildroot}}
 
 %files -n %{{name}}-data
 %license LICENSE
-%doc ACKNOWLEDGEMENTS AUTHORS README
+%doc ACKNOWLEDGEMENTS AUTHORS README.md
 %{{_datadir}}/%{{name}}/*
 
 %files -n python3-%{{name}}
 %license LICENSE
-%doc README
+%doc README.md
 %{{python3_sitelib}}/plaso
 %{{python3_sitelib}}/plaso*.egg-info
 

data/templates/check_dependencies-with_url.py

@@ -1,4 +1,4 @@
-${shebang}
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Script to check for the availability and version of dependencies."""
 

data/templates/check_dependencies.py

@@ -1,4 +1,4 @@
-${shebang}
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Script to check for the availability and version of dependencies."""
 

data/templates/github_actions/test_docker.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['24.04']
+        version: ['26.04']
     container:
       image: ubuntu:$${{ matrix.version }}
     steps:

data/templates/pyproject.toml/header.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"

data/templates/pyproject.toml/project.toml

@@ -0,0 +1,16 @@
+
+[project]
+name = "${python_module_name}"
+version = "${version}"
+description = "${description_short}"
+maintainers = [
+    { name = "${maintainer_name}", email = "${maintainer_email}" },
+]
+license = "Apache-2.0"
+license-files = ["ACKNOWLEDGEMENTS", "AUTHORS", "LICENSE"]
+readme = "${readme_file}"
+classifiers = [
+    "${development_status}",
+    "Programming Language :: Python",
+]
+requires-python = ">=3.10"

data/templates/pyproject.toml/setuptools.packages.toml

@@ -0,0 +1,5 @@
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["${python_module_name}"]
+exclude = ["docs", "tests", "tests.*", "utils"]