From fbfabeb87c3f10242f7510bc9eba19d14ad7bb81 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:19:36 -0700 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate (#1192) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .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 221182985..c84bfaffc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: # hooks: # - id: black - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.3 + rev: v0.6.8 hooks: - id: ruff # - repo: https://github.com/econchick/interrogate From 335abdd55683b6cb065c72b4831211982a25b4ac Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 2 Oct 2024 13:42:30 -0700 Subject: [PATCH 2/2] Remove mamba key from GH Actions (#1194) --- .github/workflows/run_all_tests.yml | 4 +--- .github/workflows/run_coverage.yml | 1 - .github/workflows/run_tests.yml | 4 +--- CHANGELOG.md | 5 +++++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run_all_tests.yml b/.github/workflows/run_all_tests.yml index 8df190d55..b713f4763 100644 --- a/.github/workflows/run_all_tests.yml +++ b/.github/workflows/run_all_tests.yml @@ -165,13 +165,12 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-ver }} channels: conda-forge - mamba-version: "*" - name: Install build dependencies run: | conda config --set always_yes yes --set changeps1 no conda info - mamba install -c conda-forge "tox>=4" + conda install -c conda-forge "tox>=4" - name: Conda reporting run: | @@ -229,7 +228,6 @@ jobs: python-version: ${{ matrix.python-ver }} channels: conda-forge auto-activate-base: false - mamba-version: "*" - name: Install run dependencies run: | diff --git a/.github/workflows/run_coverage.yml b/.github/workflows/run_coverage.yml index bd2eeb921..08b6c59ea 100644 --- a/.github/workflows/run_coverage.yml +++ b/.github/workflows/run_coverage.yml @@ -101,7 +101,6 @@ jobs: python-version: ${{ matrix.python-ver }} channels: conda-forge auto-activate-base: false - mamba-version: "*" - name: Install run dependencies run: | diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 5e0b3bff2..2e94bcb62 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -139,13 +139,12 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-ver }} channels: conda-forge - mamba-version: "*" - name: Install build dependencies run: | conda config --set always_yes yes --set changeps1 no conda info - mamba install -c conda-forge "tox>=4" + conda install -c conda-forge "tox>=4" - name: Conda reporting run: | @@ -239,7 +238,6 @@ jobs: python-version: ${{ matrix.python-ver }} channels: conda-forge auto-activate-base: false - mamba-version: "*" - name: Install run dependencies run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e56cde40..b72ead1c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # HDMF Changelog +## HDMF 3.14.6 (Upcoming) + +### Bug fixes +- Fixed mamba-related error in conda-based GitHub Actions. @rly [#1194](https://github.com/hdmf-dev/hdmf/pull/1194) + ## HDMF 3.14.5 (September 17, 2024) ### Enhancements