Changes for CI tests (log2timeline#213)

joachimmetz · Oct 29, 2023 · d16d378 · d16d378
1 parent 84ceb73
commit d16d378
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
@@ -58,7 +58,7 @@ jobs:
       run: |
         add-apt-repository -y ppa:gift/dev
         apt-get update -q
-        apt-get install -y build-essential python3 python3-dev libcreg-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-setuptools python3-yaml
+        apt-get install -y build-essential python3 python3-dev libcreg-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-setuptools python3-yaml python3-wheel
     - name: Run tests
       env:
         LANG: en_US.UTF-8
@@ -69,6 +69,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

diff --git a/requirements.txt b/requirements.txt
@@ -3,3 +3,4 @@ dfdatetime >= 20160814
 dtfabric >= 20170524
 libcreg-python >= 20210502
 libregf-python >= 20201002
+
diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,7 @@ deps =
   coverage: coverage
   wheel:
     build
-    setuptools
+    setuptools >= 65
     wheel
 commands =
   py3{7,8,9,10,11,12}: ./run_tests.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@ dfdatetime >= 20160814
		dtfabric >= 20170524
		libcreg-python >= 20210502
		libregf-python >= 20201002