From b2d036af80754cb2e3f1d2f1bf662ac2513694c7 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Wed, 17 Jul 2024 09:48:55 -0600 Subject: [PATCH 1/3] Update pre-commit config file --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d5b126c7..e8739349 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: rev: 6.0.0 hooks: - id: flake8 - args: ["--config=setup.cfg"] + args: ["--config=.flake8"] additional_dependencies: [flake8-isort] # Can run individually with `pre-commit run mypy --all-files` @@ -30,6 +30,6 @@ repos: rev: v0.991 hooks: - id: mypy - args: ["--config=setup.cfg", "--show-error-codes"] + args: ["--config=pyproject.toml", "--show-error-codes"] verbose: true additional_dependencies: ['types-requests', 'types-PyYAML'] From 996e79be51179068106d9c0d321918dfe3e429e0 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Wed, 17 Jul 2024 09:49:29 -0600 Subject: [PATCH 2/3] Switch bulid workflow to run with `pyproject.toml` --- .github/workflows/build_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 50442c04..dddd360c 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -80,7 +80,7 @@ jobs: path: ~/conda_pkgs_dir key: ${{ runner.os }}-${{ matrix.python-version }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('spec-file.txt,setup.cfg') }} + hashFiles('spec-file.txt,pyproject.toml,.flake8') }} - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Set up Conda Environment From 96ca7b0b8fd5871f7ea8ec006f039f0be6124399 Mon Sep 17 00:00:00 2001 From: Althea Denlinger <67075698+altheaden@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:03:14 -0600 Subject: [PATCH 3/3] Update .github/workflows/build_workflow.yml Co-authored-by: Xylar Asay-Davis --- .github/workflows/build_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index dddd360c..4f2a9fcd 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -80,7 +80,7 @@ jobs: path: ~/conda_pkgs_dir key: ${{ runner.os }}-${{ matrix.python-version }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('spec-file.txt,pyproject.toml,.flake8') }} + hashFiles('spec-file.txt,pyproject.toml,') }} - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Set up Conda Environment