diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef5cac2..47e3ed0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - '3.11' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/supply-chain.yml b/.github/workflows/prerelease.yml similarity index 51% rename from .github/workflows/supply-chain.yml rename to .github/workflows/prerelease.yml index b16ea59..01cf7f1 100644 --- a/.github/workflows/supply-chain.yml +++ b/.github/workflows/prerelease.yml @@ -1,22 +1,26 @@ +# Portions of this file contributed by NIST are governed by the following +# statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. # This workflow uses Make to review direct dependencies of this # repository. -name: Supply Chain +name: Prerelease on: - schedule: - - cron: '15 5 * * 1,2,3,4,5' + pull_request: + branches: + - main jobs: build: @@ -29,12 +33,10 @@ jobs: - '3.11' steps: - - uses: actions/checkout@v3 - with: - ref: develop + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Review dependencies - run: make check-supply-chain + run: make check-supply-chain-pre-commit diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4161f2..5ae8713 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.10.1 hooks: - id: black - repo: https://github.com/pycqa/flake8 diff --git a/Makefile b/Makefile index c4aa1d4..4b13058 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ check: \ check-supply-chain: \ check-supply-chain-pre-commit +# This target is scheduled to run as part of prerelease review. check-supply-chain-pre-commit: \ .venv-pre-commit/var/.pre-commit-built.log source .venv-pre-commit/bin/activate \ diff --git a/case_exiftool/__init__.py b/case_exiftool/__init__.py index 717f430..9aab467 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.8.0" +__version__ = "0.8.1" import argparse import contextlib