diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 4b3fc38..8bfabd6 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['38'] + version: ['39', '40'] container: image: registry.fedoraproject.org/fedora:${{ matrix.version }} steps: @@ -18,7 +18,7 @@ jobs: - name: Install dependencies run: | dnf copr -y enable @gift/dev - dnf install -y @development-tools python3 python3-devel libbde-python3 libcaes-python3 libcreg-python3 libesedb-python3 libewf-python3 libfcrypto-python3 libfsapfs-python3 libfsext-python3 libfsfat-python3 libfshfs-python3 libfsntfs-python3 libfsxfs-python3 libfvde-python3 libfwnt-python3 libluksde-python3 libmodi-python3 libphdi-python3 libqcow-python3 libregf-python3 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-artifacts python3-cffi python3-cryptography python3-dfdatetime python3-dfimagetools python3-dfvfs python3-dfwinreg python3-dtfabric python3-idna python3-pytsk3 python3-pyyaml python3-setuptools python3-xattr + dnf install -y @development-tools libbde-python3 libcaes-python3 libcreg-python3 libesedb-python3 libewf-python3 libfcrypto-python3 libfsapfs-python3 libfsext-python3 libfsfat-python3 libfshfs-python3 libfsntfs-python3 libfsxfs-python3 libfvde-python3 libfwnt-python3 libluksde-python3 libmodi-python3 libphdi-python3 libqcow-python3 libregf-python3 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3 python3-artifacts python3-build python3-cffi python3-cryptography python3-devel python3-dfdatetime python3-dfimagetools python3-dfvfs python3-dfwinreg python3-dtfabric python3-idna python3-pytsk3 python3-pyyaml python3-setuptools python3-wheel python3-xattr - name: Run tests env: LANG: C.utf8 @@ -27,21 +27,17 @@ jobs: - name: Run end-to-end tests run: | if test -f tests/end-to-end.py; then PYTHONPATH=. python3 ./tests/end-to-end.py --debug -c config/end-to-end.ini; fi - - name: Build source distribution + - name: Build source distribution (sdist) run: | - python3 ./setup.py sdist - - name: Build binary distribution + python3 -m build --no-isolation --sdist + - name: Build binary distribution (wheel) run: | - python3 ./setup.py bdist - - name: Run build and install test - run: | - python3 ./setup.py build - python3 ./setup.py install + python3 -m build --no-isolation --wheel test_ubuntu: runs-on: ubuntu-latest strategy: matrix: - version: ['22.04'] + version: ['24.04'] container: image: ubuntu:${{ matrix.version }} steps: @@ -58,7 +54,7 @@ jobs: run: | add-apt-repository -y ppa:gift/dev apt-get update -q - apt-get install -y build-essential python3 python3-dev libbde-python3 libcaes-python3 libcreg-python3 libesedb-python3 libewf-python3 libfcrypto-python3 libfsapfs-python3 libfsext-python3 libfsfat-python3 libfshfs-python3 libfsntfs-python3 libfsxfs-python3 libfvde-python3 libfwnt-python3 libluksde-python3 libmodi-python3 libphdi-python3 libqcow-python3 libregf-python3 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-artifacts python3-cffi-backend python3-cryptography python3-dfdatetime python3-dfimagetools python3-dfvfs python3-dfwinreg python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-wheel python3-xattr python3-yaml + apt-get install -y build-essential libbde-python3 libcaes-python3 libcreg-python3 libesedb-python3 libewf-python3 libfcrypto-python3 libfsapfs-python3 libfsext-python3 libfsfat-python3 libfshfs-python3 libfsntfs-python3 libfsxfs-python3 libfvde-python3 libfwnt-python3 libluksde-python3 libmodi-python3 libphdi-python3 libqcow-python3 libregf-python3 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3 python3-artifacts python3-build python3-cffi-backend python3-cryptography python3-dev python3-dfdatetime python3-dfimagetools python3-dfvfs python3-dfwinreg python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-wheel python3-xattr python3-yaml - name: Run tests env: LANG: en_US.UTF-8 @@ -69,16 +65,9 @@ jobs: LANG: en_US.UTF-8 run: | if test -f tests/end-to-end.py; then PYTHONPATH=. python3 ./tests/end-to-end.py --debug -c config/end-to-end.ini; fi - - name: Update setuptools - run: | - python3 -m pip install -U setuptools - - name: Build source distribution - run: | - python3 ./setup.py sdist - - name: Build binary distribution + - name: Build source distribution (sdist) run: | - python3 ./setup.py bdist - - name: Run build and install test + python3 -m build --no-isolation --sdist + - name: Build binary distribution (wheel) run: | - python3 ./setup.py build - python3 ./setup.py install + python3 -m build --no-isolation --wheel diff --git a/config/dpkg/clean b/config/dpkg/clean index cb340e8..914f6b8 100644 --- a/config/dpkg/clean +++ b/config/dpkg/clean @@ -1,2 +1,2 @@ -dtformats/*.pyc +esedbrc/*.pyc *.pyc diff --git a/config/dpkg/python3-esedbrc.install b/config/dpkg/python3-esedbrc.install new file mode 100644 index 0000000..b1723c8 --- /dev/null +++ b/config/dpkg/python3-esedbrc.install @@ -0,0 +1,2 @@ +usr/lib/python3*/dist-packages/esedbrc/*.py +usr/lib/python3*/dist-packages/esedbrc*.egg-info/* diff --git a/config/dpkg/python3-winevtrc.install b/config/dpkg/python3-winevtrc.install deleted file mode 100644 index 69e61d2..0000000 --- a/config/dpkg/python3-winevtrc.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python3*/dist-packages/dtformats/*.py -usr/lib/python3*/dist-packages/dtformats*.egg-info/* diff --git a/scripts/extract.py b/scripts/extract.py index 67181a0..f9d75b1 100755 --- a/scripts/extract.py +++ b/scripts/extract.py @@ -71,7 +71,7 @@ def Main(): 'with: "all".')) argument_parser.add_argument( - 'source', nargs='?', action='store', metavar='image.raw', default=None, + 'source', nargs='?', action='store', metavar='PATH', default=None, help='path of a storage media image or ESE database file.') options = argument_parser.parse_args() diff --git a/setup.cfg b/setup.cfg index 96c712e..b23e5da 100644 --- a/setup.cfg +++ b/setup.cfg @@ -40,56 +40,5 @@ exclude = utils where = . -[bdist_rpm] -release = 1 -packager = Joachim Metz -doc_files = - ACKNOWLEDGEMENTS - AUTHORS - LICENSE - README -build_requires = python3-setuptools -requires = - libbde-python3 >= 20220121 - libcaes-python3 >= 20240114 - libcreg-python3 >= 20200725 - libesedb-python3 >= 20150409 - libewf-python3 >= 20131210 - libfcrypto-python3 >= 20240114 - libfsapfs-python3 >= 20220709 - libfsext-python3 >= 20220829 - libfsfat-python3 >= 20220925 - libfshfs-python3 >= 20220831 - libfsntfs-python3 >= 20211229 - libfsxfs-python3 >= 20220829 - libfvde-python3 >= 20220121 - libfwnt-python3 >= 20210717 - libluksde-python3 >= 20220121 - libmodi-python3 >= 20210405 - libphdi-python3 >= 20220228 - libqcow-python3 >= 20201213 - libregf-python3 >= 20201002 - libsigscan-python3 >= 20230109 - libsmdev-python3 >= 20140529 - libsmraw-python3 >= 20140612 - libvhdi-python3 >= 20201014 - libvmdk-python3 >= 20140421 - libvsapm-python3 >= 20230506 - libvsgpt-python3 >= 20211115 - libvshadow-python3 >= 20160109 - libvslvm-python3 >= 20160109 - python3-artifacts >= 20220219 - python3-cffi >= 1.9.1 - python3-cryptography >= 2.0.2 - python3-dfdatetime >= 20221112 - python3-dfimagetools >= 20220129 - python3-dfvfs >= 20220831 - python3-dfwinreg >= 20211207 - python3-dtfabric >= 20230518 - python3-idna >= 2.5 - python3-pytsk3 >= 20210419 - python3-pyyaml >= 3.10 - python3-xattr >= 0.7.2 - [bdist_wheel] universal = 1 diff --git a/tox.ini b/tox.ini index ae5a04a..f613250 100644 --- a/tox.ini +++ b/tox.ini @@ -62,4 +62,4 @@ commands = yamllint -v docformatter --check --diff --recursive esedbrc scripts setup.py tests pylint --rcfile=.pylintrc esedbrc scripts setup.py tests - yamllint -c .yamllint.yaml esedbrc esedbrc/data test_data + yamllint -c .yamllint.yaml esedbrc test_data