From f2b96edf806bc00e134b1de1d14c788bb7f2b005 Mon Sep 17 00:00:00 2001 From: Chapin Bryce Date: Mon, 22 Mar 2021 07:21:52 -0400 Subject: [PATCH 1/4] Moved testing requirements to extras --- setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f9e473d..22fddaf 100644 --- a/setup.py +++ b/setup.py @@ -23,9 +23,8 @@ packages=setuptools.find_packages(), install_requires=[ 'six', - 'pytest==4.6.11', 'hexdump==3.3', - 'pytest-cov==2.11.1', + # pin deps for python 2, see #67 'more_itertools==5.0.0', @@ -33,6 +32,13 @@ 'configparser==4.0.2', 'pyparsing==2.4.7', ], + extras_require={ + # For running unit tests & coverage + "test": [ + 'pytest-cov==2.11.1', + 'pytest==4.6.11', + ] + }, scripts=['scripts/evtx_dump.py', 'scripts/evtx_dump_chunk_slack.py', 'scripts/evtx_eid_record_numbers.py', From 8fafe0bfa1da9a1e1a5d7d53661c3f1b3e7490aa Mon Sep 17 00:00:00 2001 From: Chapin Bryce Date: Mon, 22 Mar 2021 07:22:58 -0400 Subject: [PATCH 2/4] Added lxml dependency to pass unit tests --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 22fddaf..8854969 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ install_requires=[ 'six', 'hexdump==3.3', - + 'lxml==4.6.3', # pin deps for python 2, see #67 'more_itertools==5.0.0', From fd26e04852b8904265a26192502438197ca154a2 Mon Sep 17 00:00:00 2001 From: Chapin Bryce Date: Mon, 22 Mar 2021 07:27:21 -0400 Subject: [PATCH 3/4] Moved lxml to testing dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8854969..7f4f07c 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,6 @@ install_requires=[ 'six', 'hexdump==3.3', - 'lxml==4.6.3', # pin deps for python 2, see #67 'more_itertools==5.0.0', @@ -37,6 +36,7 @@ "test": [ 'pytest-cov==2.11.1', 'pytest==4.6.11', + 'lxml==4.6.3', ] }, scripts=['scripts/evtx_dump.py', From 534f521595212ca7a445b3fabfe6c6f5aaf87414 Mon Sep 17 00:00:00 2001 From: Chapin Bryce Date: Mon, 22 Mar 2021 07:31:59 -0400 Subject: [PATCH 4/4] Updated github actions installation string --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 497387b..084e417 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - name: Install lxml run: pip install lxml - name: Install python-evtx - run: pip install -e . + run: pip install -e .[test] - name: Run tests run: pytest tests/