Changes to CI tests

libyal · Oct 6, 2024 · 50a2e5d · 50a2e5d
1 parent c121b76
commit 50a2e5d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 56 deletions.
diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
@@ -7,18 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['38']
+        version: ['39', '40']
     container:
       image: registry.fedoraproject.org/fedora:${{ matrix.version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       run: |
         dnf install -y dnf-plugins-core langpacks-en
     - name: Install dependencies
       run: |
         dnf copr -y enable @gift/dev
-        dnf install -y @development-tools python3 python3-devel libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-dtfabric python3-lz4 python3-pyyaml python3-setuptools python3-snappy python3-zstd
+        dnf install -y @development-tools libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3 python3-build python3-devel python3-dfdatetime python3-dtfabric python3-lz4 python3-pyyaml python3-setuptools python3-snappy python3-wheel python3-zstd
     - name: Run tests
       env:
         LANG: C.utf8
@@ -27,25 +27,21 @@ 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:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -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 libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-wheel python3-yaml python3-zstd
+        apt-get install -y build-essential libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3 python3-build python3-dev python3-dfdatetime python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-wheel python3-yaml python3-zstd
     - 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/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml
@@ -27,7 +27,7 @@ jobs:
     container:
       image: ubuntu:22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -44,7 +44,7 @@ jobs:
         add-apt-repository -y ppa:deadsnakes/ppa
         add-apt-repository -y ppa:gift/dev
         apt-get update -q
-        apt-get install -y build-essential git libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
+        apt-get install -y build-essential git libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lib2to3 python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
     - name: Install tox
       run: |
         python3 -m pip install tox
@@ -63,7 +63,7 @@ jobs:
     container:
       image: ubuntu:22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -80,7 +80,7 @@ jobs:
         add-apt-repository -y ppa:deadsnakes/ppa
         add-apt-repository -y ppa:gift/dev
         apt-get update -q
-        apt-get install -y build-essential git libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
+        apt-get install -y build-essential git libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lib2to3 python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
     - name: Install tox
       run: |
         python3 -m pip install tox
@@ -90,7 +90,9 @@ jobs:
       run: |
         tox -e${{ matrix.toxenv }}
     - name: Upload coverage report to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
   lint:
     runs-on: ubuntu-latest
     strategy:
@@ -101,7 +103,7 @@ jobs:
     container:
       image: ubuntu:22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -118,7 +120,7 @@ jobs:
         add-apt-repository -y ppa:deadsnakes/ppa
         add-apt-repository -y ppa:gift/dev
         apt-get update -q
-        apt-get install -y build-essential git libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
+        apt-get install -y build-essential git libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lib2to3 python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
     - name: Install tox
       run: |
         python3 -m pip install tox

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = dtformats
-version = 20240211
+version = 20241006
 description = Data formats (dtformats)
 long_description = dtFormats is a collection of various file formats.
 long_description_content_type = text/plain
@@ -70,28 +70,5 @@ exclude =
   utils
 where = .
 
-[bdist_rpm]
-release = 1
-packager = Joachim Metz <[email protected]>
-doc_files =
-  ACKNOWLEDGEMENTS
-  AUTHORS
-  LICENSE
-  README
-build_requires = python3-setuptools
-requires =
-  libfwps-python3 >= 20230131
-  libfwsi-python3 >= 20150606
-  libgzipf-python3 >= 20221229
-  liblnk-python3 >= 20230205
-  libolecf-python3 >= 20151223
-  libregf-python3 >= 20150315
-  python3-dfdatetime >= 20180510
-  python3-dtfabric >= 20230518
-  python3-lz4 >= 0.10.0
-  python3-pyyaml >= 3.10
-  python3-snappy >= 0.6.1
-  python3-zstd >= 1.3.0.2
-
 [bdist_wheel]
 universal = 1