From d428f9f0183bd9c44d6dd0d7abf551de7f92c9a6 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 21 Jun 2023 15:22:56 -0400 Subject: [PATCH 1/7] Update case-utils test integration; add testing feature to package This patch catches a submodule update that should have happened as part of PR 31, and a test environment build update that could have happened as part of PR 31 or 26. No effects were observed on Make-managed files. References: * https://github.com/casework/CASE-Implementation-ExifTool/pull/26 * https://github.com/casework/CASE-Implementation-ExifTool/pull/31 Signed-off-by: Alex Nelson --- dependencies/CASE-Utilities-Python | 2 +- setup.cfg | 4 ++++ tests/Makefile | 9 ++------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dependencies/CASE-Utilities-Python b/dependencies/CASE-Utilities-Python index f47bd6c..435d67e 160000 --- a/dependencies/CASE-Utilities-Python +++ b/dependencies/CASE-Utilities-Python @@ -1 +1 @@ -Subproject commit f47bd6ce191b867767cee9be82e55b0a292333ea +Subproject commit 435d67e7cd776ad502e02a305df2296866644a3e diff --git a/setup.cfg b/setup.cfg index 5a5a3c3..d207b9e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,6 +26,10 @@ python_requires = >=3.8 console_scripts = case_exiftool = case_exiftool:main +[options.extras_require] +testing = + case_utils[testing] + [options.package_data] case_exiftool = py.typed diff --git a/tests/Makefile b/tests/Makefile index 8e9d85b..671a383 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -28,7 +28,6 @@ all: \ .venv.done.log: \ $(top_srcdir)/.git_submodule_init.done.log \ - $(top_srcdir)/dependencies/CASE-Utilities-Python/tests/requirements.txt \ $(top_srcdir)/setup.cfg \ $(top_srcdir)/setup.py rm -rf venv @@ -42,12 +41,8 @@ all: \ wheel source venv/bin/activate \ && pip install \ - --requirement $(top_srcdir)/dependencies/CASE-Utilities-Python/tests/requirements.txt - source venv/bin/activate \ - && cd $(top_srcdir) \ - && pip install \ - --editable \ - . + --editable \ + $(top_srcdir)[testing] touch $@ check: \ From ad2e05c6b6fbd2804e7611aa190b60534487d7f2 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 22 Jun 2023 08:40:49 -0400 Subject: [PATCH 2/7] Fix workflow name copy-paste error Signed-off-by: Alex Nelson --- .github/workflows/supply-chain.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/supply-chain.yml b/.github/workflows/supply-chain.yml index 54e932b..25e8299 100644 --- a/.github/workflows/supply-chain.yml +++ b/.github/workflows/supply-chain.yml @@ -12,7 +12,7 @@ # This workflow uses Make to review direct dependencies of this # repository. -name: Continuous Integration +name: Supply Chain on: schedule: From 22b460d5046537f45762281ac72677f5491afda2 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 17 Jul 2023 14:15:15 -0400 Subject: [PATCH 3/7] Run pre-commit autoupdate No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ec8fa19..d4e1a99 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.7.0 hooks: - id: black - repo: https://github.com/pycqa/flake8 From 13e28bc544432b5149c3a8c862e6bdcaff9f84f0 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 31 Jul 2023 10:21:43 -0400 Subject: [PATCH 4/7] Run pre-commit autoupdate No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d4e1a99..b4161f2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: hooks: - id: black - repo: https://github.com/pycqa/flake8 - rev: 6.0.0 + rev: 6.1.0 hooks: - id: flake8 - repo: https://github.com/pycqa/isort From 42c1e82d8e2780204ebc30fe6133f1b944755a0c Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 29 Aug 2023 16:00:24 -0400 Subject: [PATCH 5/7] Require Python 3.9 References: * https://github.com/casework/CASE-Utilities-Python/issues/127 Signed-off-by: Alex Nelson --- .github/workflows/ci.yml | 2 +- .github/workflows/supply-chain.yml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 244a7b1..ef5cac2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: python-version: - - '3.8' + - '3.9' - '3.11' steps: diff --git a/.github/workflows/supply-chain.yml b/.github/workflows/supply-chain.yml index 2661c23..b16ea59 100644 --- a/.github/workflows/supply-chain.yml +++ b/.github/workflows/supply-chain.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: python-version: - - '3.8' + - '3.9' - '3.11' steps: diff --git a/setup.cfg b/setup.cfg index d207b9e..345fc5b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,7 @@ install_requires = case_utils >= 0.11.0, < 0.12.0 python-dateutil packages = find: -python_requires = >=3.8 +python_requires = >=3.9 [options.entry_points] console_scripts = From 4adb878848c827e78c1abd4359574bf9948f418a Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 29 Aug 2023 16:05:49 -0400 Subject: [PATCH 6/7] Bump case-utils adoption to 0.13.0 No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- dependencies/CASE-Utilities-Python | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-Utilities-Python b/dependencies/CASE-Utilities-Python index 435d67e..1611e58 160000 --- a/dependencies/CASE-Utilities-Python +++ b/dependencies/CASE-Utilities-Python @@ -1 +1 @@ -Subproject commit 435d67e7cd776ad502e02a305df2296866644a3e +Subproject commit 1611e58476ff04d2e84c2239bf6aa9281129b9ff diff --git a/setup.cfg b/setup.cfg index 345fc5b..2fc2a35 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ classifiers = [options] install_requires = - case_utils >= 0.11.0, < 0.12.0 + case_utils >= 0.13.0, < 0.14.0 python-dateutil packages = find: python_requires = >=3.9 From 5d8f5c1ae3e93893a880a7715f3ba6a8e61ea4bb Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 29 Aug 2023 16:15:00 -0400 Subject: [PATCH 7/7] Bump version Signed-off-by: Alex Nelson --- case_exiftool/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_exiftool/__init__.py b/case_exiftool/__init__.py index cd23ecb..717f430 100644 --- a/case_exiftool/__init__.py +++ b/case_exiftool/__init__.py @@ -15,7 +15,7 @@ This tool parses the RDF output of ExifTool, mapping it into UCO properties and relationships-of-assumption. An analyst should later annotate the output with their beliefs on its verity. """ -__version__ = "0.7.1" +__version__ = "0.8.0" import argparse import contextlib