Changes for building dpkg and rpms (#1241)

joachimmetz · web-flow · commit 7c9607869f89 · 2025-07-31T05:28:41.000+02:00
diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['39', '40']
+        version: ['41']
     container:
       image: registry.fedoraproject.org/fedora:${{ matrix.version }}
     steps:
diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml
@@ -14,8 +14,6 @@ jobs:
     strategy:
       matrix:
         include:
-        - python-version: '3.8'
-          toxenv: 'py38,wheel'
         - python-version: '3.9'
           toxenv: 'py39,wheel'
         - python-version: '3.10'
diff --git a/.pylintrc b/.pylintrc
@@ -470,6 +470,7 @@ disable=assignment-from-none,
         too-many-lines,
         too-many-locals,
         too-many-nested-blocks,
+        too-many-positional-arguments,
         too-many-public-methods,
         too-many-return-statements,
         too-many-statements,
diff --git a/config/appveyor/install.sh b/config/appveyor/install.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+brew untap homebrew/homebrew-cask-versions
 brew update -q
 brew install -q gettext gnu-sed python@3.13 tox || true
 
diff --git a/config/docker/build_rpm.sh b/config/docker/build_rpm.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Script to build RPM packages with Docker.
+
+# Fail on error.
+set -e
+
+GID=$(id -g);
+
+L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds";
+
+cd config/docker;
+
+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 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)"
diff --git a/config/docker/l2tbuilds_fedora.Dockerfile b/config/docker/l2tbuilds_fedora.Dockerfile
@@ -0,0 +1,11 @@
+FROM fedora:42
+MAINTAINER Log2Timeline <log2timeline-dev@googlegroups.com>
+
+# Create container with:
+# docker build -f l2tbuilds_fedora.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_fedora .
+
+RUN dnf install -y @development-tools autoconf automake byacc dnf-plugins-core flex gcc-c++ gettext-devel git langpacks-en libtool pkg-config python3 python3-build python3-devel python3-setuptools python3-wheel
+
+# Set up the l2tdevtools source and build directories
+WORKDIR /home/build/
+RUN git clone https://github.com/log2timeline/l2tdevtools.git
diff --git a/config/docker/plaso-dev.Dockerfile b/config/docker/plaso-dev.Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get -y install --no-install-recommends \
   libyaml-dev \
   locales \
   mercurial \
+  python3-build \
   python3-dev \
   python3-distutils \
   python3-setuptools \
diff --git a/data/projects.ini b/data/projects.ini
@@ -2162,6 +2162,7 @@ dpkg_name: python-xlsxwriter
 dpkg_template_install_python3: python3-xlsxwriter.install
 dpkg_source_name: xlsxwriter
 rpm_template_spec: XlsxWriter.spec
+setup_name: xlsxwriter
 maintainer: John McNamara <jmcnamara@cpan.org>
 homepage_url: https://xlsxwriter.readthedocs.org/
 download_url: https://pypi.org/project/XlsxWriter
diff --git a/data/rpm_templates/XlsxWriter.spec b/data/rpm_templates/XlsxWriter.spec
@@ -50,7 +50,7 @@ rm -rf %{{buildroot}}
 %files -n python3-%{{name}}
 %license LICENSE.txt
 %{{python3_sitelib}}/xlsxwriter/
-%{{python3_sitelib}}/XlsxWriter*.egg-info
+%{{python3_sitelib}}/xlsxwriter*.egg-info
 
 %exclude %{{_bindir}}/*
 
diff --git a/data/rpm_templates/pyzmq.spec b/data/rpm_templates/pyzmq.spec
@@ -11,7 +11,7 @@ Summary: Python bindings for 0MQ
 Url: https://pyzmq.readthedocs.org
 Vendor: Brian E. Granger, Min Ragan-Kelley <zeromq-dev@lists.zeromq.org>
 Source0: %{{name}}-%{{version}}.tar.gz
-BuildRequires: gcc, gcc-c++, python3-devel, python3-packaging, python3-scikit-build-core, python3-setuptools
+BuildRequires: gcc, gcc-c++, libsodium-devel, python3-devel, python3-packaging, python3-pip, python3-scikit-build-core, python3-setuptools
 
 %{{?python_disable_dependency_generator}}
 
diff --git a/data/templates/.pylintrc b/data/templates/.pylintrc
@@ -470,6 +470,7 @@ disable=assignment-from-none,
         too-many-lines,
         too-many-locals,
         too-many-nested-blocks,
+        too-many-positional-arguments,
         too-many-public-methods,
         too-many-return-statements,
         too-many-statements,
diff --git a/data/templates/appveyor_scripts/install.sh b/data/templates/appveyor_scripts/install.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+brew untap homebrew/homebrew-cask-versions
 brew update -q
 brew install -q ${brew_packages} || true
 
diff --git a/data/templates/github_actions/test_docker.yml b/data/templates/github_actions/test_docker.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['39', '40']
+        version: ['41']
     container:
       image: registry.fedoraproject.org/fedora:$${{ matrix.version }}
     steps:
diff --git a/data/templates/github_actions/test_tox.yml b/data/templates/github_actions/test_tox.yml
@@ -14,8 +14,6 @@ jobs:
     strategy:
       matrix:
         include:
-        - python-version: '3.8'
-          toxenv: 'py38,wheel'
         - python-version: '3.9'
           toxenv: 'py39,wheel'
         - python-version: '3.10'
diff --git a/data/templates/setup.cfg/metadata b/data/templates/setup.cfg/metadata
@@ -22,4 +22,4 @@ install_requires = file:requirements.txt
 package_dir =
   ${python_module_name} = ${python_module_name}
 packages = find:
-python_requires = >=3.8
+python_requires = >=3.9
diff --git a/data/templates/tox.ini/header b/data/templates/tox.ini/header
@@ -19,7 +19,7 @@ deps =
     setuptools >= 65
     wheel
 commands =
-  py3{8,9,10,11,12,13}: ./run_tests.py
+  py3{9,10,11,12,13}: ./run_tests.py
   coverage: coverage erase
   coverage: coverage run --source=${python_module_name} --omit="*_test*,*__init__*,*test_lib*" run_tests.py
   coverage: coverage xml
diff --git a/data/templates/tox.ini/testenv_lint b/data/templates/tox.ini/testenv_lint
@@ -12,7 +12,7 @@ deps =
   -rrequirements.txt
   -rtest_requirements.txt
   docformatter
-  pylint >= 3.2.0, < 3.3.0
+  pylint >= 3.3.0, < 3.4.0
   setuptools
 commands =
   docformatter --version
diff --git a/data/templates/tox.ini/testenv_lint-with_yaml b/data/templates/tox.ini/testenv_lint-with_yaml
@@ -12,7 +12,7 @@ deps =
   -rrequirements.txt
   -rtest_requirements.txt
   docformatter
-  pylint >= 3.2.0, < 3.3.0
+  pylint >= 3.3.0, < 3.4.0
   setuptools
   yamllint >= 1.26.0
 commands =
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = l2tdevtools
-version = 20241226
+version = 20250730
 description = Development tools for the log2timeline projects
 long_description = Development tools for the log2timeline projects.
 long_description_content_type = text/plain
@@ -22,7 +22,7 @@ install_requires = file:requirements.txt
 package_dir =
   l2tdevtools = l2tdevtools
 packages = find:
-python_requires = >=3.8
+python_requires = >=3.9
 scripts =
   tools/build.py
   tools/develop.py
diff --git a/tests/download_helpers/github.py b/tests/download_helpers/github.py
@@ -19,7 +19,7 @@ class PefileGitHubReleasesDownloadHelperTest(test_lib.BaseTestCase):
 
   _PROJECT_ORGANIZATION = 'erocarrera'
   _PROJECT_NAME = 'pefile'
-  _PROJECT_VERSION = '2023.2.7'
+  _PROJECT_VERSION = '2024.8.26'
 
   @classmethod
   def setUpClass(cls):
@@ -172,7 +172,7 @@ class Log2TimelineGitHubReleasesDownloadHelperTest(test_lib.BaseTestCase):
 
   _PROJECT_ORGANIZATION = 'log2timeline'
   _PROJECT_NAME = 'dfvfs'
-  _PROJECT_VERSION = '20240317'
+  _PROJECT_VERSION = '20240505'
 
   @classmethod
   def setUpClass(cls):
diff --git a/tox.ini b/tox.ini
@@ -19,7 +19,7 @@ deps =
     setuptools >= 65
     wheel
 commands =
-  py3{8,9,10,11,12,13}: ./run_tests.py
+  py3{9,10,11,12,13}: ./run_tests.py
   coverage: coverage erase
   coverage: coverage run --source=l2tdevtools --omit="*_test*,*__init__*,*test_lib*" run_tests.py
   coverage: coverage xml
@@ -45,7 +45,7 @@ deps =
   -rrequirements.txt
   -rtest_requirements.txt
   docformatter
-  pylint >= 3.2.0, < 3.3.0
+  pylint >= 3.3.0, < 3.4.0
   setuptools
   yamllint >= 1.26.0
 commands =
