Skip to content

Commit e31d2a2

Browse files
joachimmetzjoachimmetz
authored
Changes for CI tests and replaced Cryptography #713 (#756)
1 parent 7bb69e5 commit e31d2a2

25 files changed

+280
-250
lines changed

‎.github/workflows/test_docker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install dependencies
1919
run: |
2020
dnf copr -y enable @gift/dev
21-
dnf install -y @development-tools python3 python3-devel libbde-python3 libewf-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi python3-cryptography python3-dfdatetime python3-dtfabric python3-idna python3-pytsk3 python3-pyyaml python3-setuptools python3-xattr
21+
dnf install -y @development-tools python3 python3-devel libbde-python3 libcaes-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi python3-dfdatetime python3-dtfabric python3-idna python3-pytsk3 python3-pyyaml python3-setuptools python3-xattr
2222
- name: Run tests
2323
env:
2424
LANG: C.utf8
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
add-apt-repository -y ppa:gift/dev
6060
apt-get update -q
61-
apt-get install -y build-essential python3 python3-dev libbde-python3 libewf-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-cryptography python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-wheel python3-xattr python3-yaml
61+
apt-get install -y build-essential python3 python3-dev libbde-python3 libcaes-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-wheel python3-xattr python3-yaml
6262
- name: Run tests
6363
env:
6464
LANG: en_US.UTF-8

‎.github/workflows/test_docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
include:
17-
- python-version: '3.11'
17+
- python-version: '3.12'
1818
toxenv: 'docs'
1919
container:
2020
image: ubuntu:22.04
@@ -36,7 +36,7 @@ jobs:
3636
add-apt-repository -y ppa:deadsnakes/ppa
3737
add-apt-repository -y ppa:gift/dev
3838
apt-get update -q
39-
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libewf-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-cryptography python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
39+
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libcaes-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
4040
- name: Install tox
4141
run: |
4242
python3 -m pip install tox

‎.github/workflows/test_tox.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
add-apt-repository -y ppa:deadsnakes/ppa
4747
add-apt-repository -y ppa:gift/dev
4848
apt-get update -q
49-
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libewf-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-cryptography python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
49+
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libcaes-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
5050
- name: Install tox
5151
run: |
5252
python3 -m pip install tox
@@ -82,7 +82,7 @@ jobs:
8282
add-apt-repository -y ppa:deadsnakes/ppa
8383
add-apt-repository -y ppa:gift/dev
8484
apt-get update -q
85-
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libewf-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-cryptography python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
85+
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libcaes-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
8686
- name: Install tox
8787
run: |
8888
python3 -m pip install tox
@@ -98,7 +98,7 @@ jobs:
9898
strategy:
9999
matrix:
100100
include:
101-
- python-version: '3.11'
101+
- python-version: '3.12'
102102
toxenv: 'lint'
103103
container:
104104
image: ubuntu:22.04
@@ -120,7 +120,7 @@ jobs:
120120
add-apt-repository -y ppa:deadsnakes/ppa
121121
add-apt-repository -y ppa:gift/dev
122122
apt-get update -q
123-
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libewf-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-cryptography python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
123+
apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libbde-python3 libcaes-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 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvsapm-python3 libvsgpt-python3 libvshadow-python3 libvslvm-python3 python3-cffi-backend python3-dfdatetime python3-distutils python3-dtfabric python3-idna python3-pip python3-pytsk3 python3-setuptools python3-xattr python3-yaml
124124
- name: Install tox
125125
run: |
126126
python3 -m pip install tox

‎.pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ clear-cache-post-run=no
2929
# A comma-separated list of package or module names from where C extensions may
3030
# be loaded. Extensions are loading into the active Python interpreter and may
3131
# run arbitrary code.
32-
extension-pkg-allow-list=pybde,pyewf,pyfsapfs,pyfsext,pyfsfat,pyfshfs,pyfsntfs,pyfsxfs,pyfvde,pyfwnt,pyluksde,pymodi,pyphdi,pyqcow,pysigscan,pysmdev,pysmraw,pytsk3,pyvhdi,pyvmdk,pyvsapm,pyvsgpt,pyvshadow,pyvslvm,xattr
32+
extension-pkg-allow-list=pybde,pycaes,pyewf,pyfcrypto,pyfsapfs,pyfsext,pyfsfat,pyfshfs,pyfsntfs,pyfsxfs,pyfvde,pyfwnt,pyluksde,pymodi,pyphdi,pyqcow,pysigscan,pysmdev,pysmraw,pytsk3,pyvhdi,pyvmdk,pyvsapm,pyvsgpt,pyvshadow,pyvslvm,xattr
3333

3434
# A comma-separated list of package or module names from where C extensions may
3535
# be loaded. Extensions are loading into the active Python interpreter and may

‎appveyor.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@ environment:
22
PYPI_TOKEN:
33
secure: /FwQrmudDyj+Mu3DaxLEowyvwBaY7x1GRt6gYJrVerEAo4PujrTDfMs9/K6PJSN7KkCL/6LQK2VfTD91bbnUwGMiTjfeItu2+aernJtwLLtoDJ22sHgMiajGMqficrHlOc7uNhFMjQsGa7WiiGGo12c/b7z55dNmU2N0EIc086/Z2G6O+n2+oBeT5SbFu5j5XXkwrd98vnW8hryuZPjLauV1mxc6MMNiv3dOgVL8gtWDjW5xZVJvfOTcYA+7MMLPUbMbqMcXkTSRshqUrX/6mw==
44
matrix:
5-
- DESCRIPTION: "Run tests on Windows with 32-bit Python 3.11"
5+
- DESCRIPTION: "Run tests on Windows with 32-bit Python 3.12"
66
MACHINE_TYPE: "x86"
77
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
8-
PYTHON: "C:\\Python311"
9-
PYTHON_VERSION: "3.11"
8+
PYTHON: "C:\\Python312"
9+
PYTHON_VERSION: "3.12"
1010
L2TBINARIES_TRACK: "dev"
1111
TARGET: tests
12-
- DESCRIPTION: "Run tests on Windows with 64-bit Python 3.11"
12+
- DESCRIPTION: "Run tests on Windows with 64-bit Python 3.12"
1313
MACHINE_TYPE: "amd64"
1414
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
15-
PYTHON: "C:\\Python311-x64"
16-
PYTHON_VERSION: "3.11"
15+
PYTHON: "C:\\Python312-x64"
16+
PYTHON_VERSION: "3.12"
1717
L2TBINARIES_TRACK: "dev"
1818
TARGET: tests
19-
- DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.11"
19+
- DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.12"
2020
MACHINE_TYPE: "amd64"
2121
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
22-
PYTHON: "C:\\Python311-x64"
23-
PYTHON_VERSION: "3.11"
22+
PYTHON: "C:\\Python312-x64"
23+
PYTHON_VERSION: "3.12"
2424
L2TBINARIES_TRACK: "dev"
2525
TARGET: wheel
26-
- DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.11"
26+
- DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.12"
2727
MACHINE_TYPE: "amd64"
2828
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
29-
PYTHON: "C:\\Python311-x64"
30-
PYTHON_VERSION: "3.11"
29+
PYTHON: "C:\\Python312-x64"
30+
PYTHON_VERSION: "3.12"
3131
L2TBINARIES_TRACK: "dev"
3232
TARGET: wheel
33-
- DESCRIPTION: "Run tests on Mac OS with Python 3.11"
33+
- DESCRIPTION: "Run tests on Mac OS with Python 3.12"
3434
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
3535
HOMEBREW_NO_INSTALL_CLEANUP: 1
3636
TARGET: tests

‎config/appveyor/install.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Script to set up tests on AppVeyor Windows.
22

3-
$Dependencies = "PyYAML cffi cryptography dfdatetime dtfabric idna libbde libewf libfsapfs libfsext libfsfat libfshfs libfsntfs libfsxfs libfvde libfwnt libluksde libmodi libphdi libqcow libsigscan libsmdev libsmraw libvhdi libvmdk libvsapm libvsgpt libvshadow libvslvm pytsk3 xattr"
3+
$Dependencies = "PyYAML cffi dfdatetime dtfabric idna libbde libcaes libewf libfcrypto libfsapfs libfsext libfsfat libfshfs libfsntfs libfsxfs libfvde libfwnt libluksde libmodi libphdi libqcow libsigscan libsmdev libsmraw libvhdi libvmdk libvsapm libvsgpt libvshadow libvslvm pytsk3 xattr"
44

55
If ($Dependencies.Length -gt 0)
66
{

‎config/appveyor/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
set -e
44

55
brew update -q
6-
brew install -q gettext gnu-sed python@3.11 tox || true
6+
brew install -q gettext gnu-sed python@3.12 tox || true
77

‎config/appveyor/runtests.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LDFLAGS="-L/usr/local/lib -L/usr/local/opt/gettext/lib ${LDFLAGS}";
99
export CPPFLAGS="-I/usr/local/opt/[email protected]/include ${CPPFLAGS}";
1010
export LDFLAGS="-L/usr/local/opt/[email protected]/lib ${LDFLAGS}";
1111

12-
# Set the following environment variables to ensure tox can find Python 3.11.
13-
export PATH="/usr/local/opt/python@3.11/bin:${PATH}";
12+
# Set the following environment variables to ensure tox can find Python 3.12.
13+
export PATH="/usr/local/opt/python@3.12/bin:${PATH}";
1414

15-
tox -e py311
15+
tox -e py312

‎config/dpkg/changelog

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
dfvfs (20240107-1) unstable; urgency=low
1+
dfvfs (20240115-1) unstable; urgency=low
22

33
* Auto-generated
44

5-
-- Log2Timeline maintainers <[email protected]> Sun, 07 Jan 2024 08:11:24 +0100
5+
-- Log2Timeline maintainers <[email protected]> Mon, 15 Jan 2024 05:37:59 +0100

‎config/dpkg/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Homepage: https://github.com/log2timeline/dfvfs
99

1010
Package: python3-dfvfs
1111
Architecture: all
12-
Depends: libbde-python3 (>= 20220121), libewf-python3 (>= 20131210), 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), 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-cffi-backend (>= 1.9.1), python3-cryptography (>= 2.0.2), python3-dfdatetime (>= 20221112), python3-dtfabric (>= 20230518), python3-idna (>= 2.5), python3-pytsk3 (>= 20210419), python3-xattr (>= 0.7.2), python3-yaml (>= 3.10), ${misc:Depends}
12+
Depends: libbde-python3 (>= 20220121), libcaes-python3 (>= 20240114), 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), 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-cffi-backend (>= 1.9.1), python3-dfdatetime (>= 20221112), python3-dtfabric (>= 20230518), python3-idna (>= 2.5), python3-pytsk3 (>= 20210419), python3-xattr (>= 0.7.2), python3-yaml (>= 3.10), ${misc:Depends}
1313
Description: Python 3 module of dfVFS
1414
dfVFS, or Digital Forensics Virtual File System, provides read-only access to
1515
file-system objects from various storage media types and file formats. The goal

‎dependencies.ini

+16-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ minimum_version: 1.9.1
55
rpm_name: python3-cffi
66
version_property: __version__
77

8-
[cryptography]
9-
dpkg_name: python3-cryptography
10-
minimum_version: 2.0.2
11-
rpm_name: python3-cryptography
12-
version_property: __version__
13-
148
[dfdatetime]
159
dpkg_name: python3-dfdatetime
1610
minimum_version: 20221112
@@ -31,6 +25,14 @@ minimum_version: 2.5
3125
rpm_name: python3-idna
3226
version_property: __version__
3327

28+
[pycaes]
29+
dpkg_name: libcaes-python3
30+
l2tbinaries_name: libcaes
31+
minimum_version: 20240114
32+
pypi_name: libcaes-python
33+
rpm_name: libcaes-python3
34+
version_property: get_version()
35+
3436
[pybde]
3537
dpkg_name: libbde-python3
3638
l2tbinaries_name: libbde
@@ -47,6 +49,14 @@ pypi_name: libewf-python
4749
rpm_name: libewf-python3
4850
version_property: get_version()
4951

52+
[pyfcrypto]
53+
dpkg_name: libfcrypto-python3
54+
l2tbinaries_name: libfcrypto
55+
minimum_version: 20240114
56+
pypi_name: libfcrypto-python
57+
rpm_name: libfcrypto-python3
58+
version_property: get_version()
59+
5060
[pyfsapfs]
5161
dpkg_name: libfsapfs-python3
5262
l2tbinaries_name: libfsapfs

‎dfvfs/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
storage media types and file formats.
77
"""
88

9-
__version__ = '20240107'
9+
__version__ = '20240115'

0 commit comments

Comments
 (0)