From 637793d3df806d6f3ade3b8e7c16662a59431c02 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 11 Sep 2023 08:56:43 -0400 Subject: [PATCH 1/6] 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 b4161f2..09d33e9 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.9.1 hooks: - id: black - repo: https://github.com/pycqa/flake8 From 3f060c6db3905a6b9f286e4ebb92af208ab34693 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 20 Oct 2023 08:40:16 -0400 Subject: [PATCH 2/6] 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 09d33e9..2818845 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.10.0 hooks: - id: black - repo: https://github.com/pycqa/flake8 From 1bdaca42e776f94bbae85b198a8ffde6f80c7c48 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 26 Oct 2023 15:12:17 -0400 Subject: [PATCH 3/6] Review pre-commit pinned versions as prerelease step Because refreshing `pre-commit`'s pinned versions is the only supply chain check for this repository, this patch also removes the nightly supply chain review job. References: * https://github.com/casework/CASE-Implementation-PROV-O/pull/92 Signed-off-by: Alex Nelson --- .../{supply-chain.yml => prerelease.yml} | 23 ++++++++++--------- Makefile | 1 + 2 files changed, 13 insertions(+), 11 deletions(-) rename .github/workflows/{supply-chain.yml => prerelease.yml} (55%) diff --git a/.github/workflows/supply-chain.yml b/.github/workflows/prerelease.yml similarity index 55% rename from .github/workflows/supply-chain.yml rename to .github/workflows/prerelease.yml index b16ea59..961acbc 100644 --- a/.github/workflows/supply-chain.yml +++ b/.github/workflows/prerelease.yml @@ -1,18 +1,21 @@ +# 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: @@ -29,12 +32,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/Makefile b/Makefile index a1c7975..3d49e68 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,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 \ From c2c45ce6025658ba8fcf7782719982d97b00bc73 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 26 Oct 2023 15:21:43 -0400 Subject: [PATCH 4/6] Bump version Signed-off-by: Alex Nelson --- case_gnu_time/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_gnu_time/__init__.py b/case_gnu_time/__init__.py index 29d7eaa..48ef95e 100644 --- a/case_gnu_time/__init__.py +++ b/case_gnu_time/__init__.py @@ -15,7 +15,7 @@ This library parses the output of GNU Time into a UCO Process graph node. """ -__version__ = "0.10.0" +__version__ = "0.10.1" import argparse import datetime From 25b56f283b2b2b5703269464177db9d7c8dfcd42 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 26 Oct 2023 15:23:45 -0400 Subject: [PATCH 5/6] 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 2818845..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.10.0 + rev: 23.10.1 hooks: - id: black - repo: https://github.com/pycqa/flake8 From 4d13ff4ee0133e0caf3ff09ff2f215ebb6b64931 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 26 Oct 2023 15:29:57 -0400 Subject: [PATCH 6/6] Change workflow trigger Signed-off-by: Alex Nelson --- .github/workflows/prerelease.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 961acbc..01cf7f1 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -18,8 +18,9 @@ name: Prerelease on: - schedule: - - cron: '15 5 * * 1,2,3,4,5' + pull_request: + branches: + - main jobs: build: