Applied updates and clean up (#427)

ForensicArtifacts · Jun 20, 2021 · 5df040a · 5df040a
1 parent b274e02
commit 5df040a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['32', '33']
+        version: ['33', '34']
     container:
       image: registry.fedoraproject.org/fedora:${{ matrix.version }}
     steps:

diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml
@@ -1,21 +1,31 @@
 # Run tox tests on Ubuntu Docker images using GIFT PPA
 name: test_tox
-on: [push, pull_request]
+on:
+  pull_request:
+    branches:
+    - main
+  push:
+    branches:
+    - main
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
-        - python-version: 3.6
+        - python-version: '3.6'
           toxenv: 'py36'
-        - python-version: 3.7
+        - python-version: '3.7'
           toxenv: 'py37'
-        - python-version: 3.8
+        - python-version: '3.8'
           toxenv: 'py38,coverage,codecov'
-        - python-version: 3.8
+        - python-version: '3.9'
+          toxenv: 'py39'
+        - python-version: '3.10'
+          toxenv: 'py310'
+        - python-version: '3.8'
           toxenv: 'pylint'
-        - python-version: 3.8
+        - python-version: '3.8'
           toxenv: 'docs'
     container:
       image: ubuntu:20.04
@@ -37,7 +47,10 @@ 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 python${{ matrix.python-version }} python${{ matrix.python-version }}-dev tox python3-distutils python3-mock python3-pbr python3-setuptools python3-six python3-yaml
+        apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-mock python3-pbr python3-pip python3-setuptools python3-six python3-yaml
+    - name: Install tox
+      run: |
+        python3 -m pip install tox
     - name: Run tests
       env:
         LANG: en_US.UTF-8

diff --git a/data/windows.yaml b/data/windows.yaml
@@ -2944,16 +2944,16 @@ supported_os: [Windows]
 urls: ['https://www.microsoftpressstore.com/articles/article.aspx?p=2762082&seqNum=2']
 ---
 name: WindowsTimezone
-doc: The timezone of the system in Olson format.
+doc: The time zone of the system as a Windows time zone name or in MUI form.
 sources:
 - type: REGISTRY_VALUE
   attributes:
     key_value_pairs:
-      - {key: 'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\TimeZoneInformation', value: 'StandardName'}
-      - {key: 'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\TimeZoneInformation', value: 'TimeZoneKeyName'}
+    - {key: 'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\TimeZoneInformation', value: 'StandardName'}
+    - {key: 'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\TimeZoneInformation', value: 'TimeZoneKeyName'}
 provides: [time_zone]
 supported_os: [Windows]
-urls: ['https://github.com/libyal/winreg-kb/blob/main/documentation/Time%20zone%20keys.asciidoc']
+urls: ['https://winreg-kb.readthedocs.io/en/latest/sources/system-keys/Time-zones.html']
 ---
 name: WindowsToolPaths
 doc: Paths to windows tools such as defrag, chkdsk.

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{6,7,8,9},coverage,docs,pylint
+envlist = py3{6,7,8,9,10},coverage,docs,pylint
 
 [testenv]
 pip_pre = True
@@ -10,7 +10,7 @@ deps =
     -rtest_requirements.txt
     coverage: coverage
 commands =
-    py3{6,7,8,9}: ./run_tests.py
+    py3{6,7,8,9,10}: ./run_tests.py
     coverage: coverage erase
     coverage: coverage run --source=artifacts --omit="*_test*,*__init__*,*test_lib*" run_tests.py
 

diff --git a/utils/dependencies.py b/utils/dependencies.py
@@ -25,6 +25,8 @@ class DependencyDefinition(object):
     rpm_name (str): name of the rpm package that provides the dependency.
     skip_check (bool): True if the dependency should be skipped by the
         CheckDependencies or CheckTestDependencies methods of DependencyHelper.
+    skip_requires (bool): True if the dependency should be excluded from
+        requirements.txt or setup.py install_requires.
     version_property (str): name of the version attribute or function.
   """
 
@@ -46,6 +48,7 @@ def __init__(self, name):
     self.python3_only = False
     self.rpm_name = None
     self.skip_check = None
+    self.skip_requires = None
     self.version_property = None
 
 
@@ -63,6 +66,7 @@ class DependencyDefinitionReader(object):
       'python3_only',
       'rpm_name',
       'skip_check',
+      'skip_requires',
       'version_property'])
 
   def _GetConfigValue(self, config_parser, section_name, value_name):