diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e76556..b74dc04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,7 +118,7 @@ jobs: source $CONDA_ROOT/etc/profile.d/conda.sh conda info -a mv conda-bld $CONDA_ROOT/conda-bld - conda create -n cptest local::conda-pack conda-forge::pytest conda-forge::pytest-cov python=${{ matrix.pyver }} ${{ matrix.squashfs_deps }} + conda create -n cptest local::conda-pack conda-forge::pytest conda-forge::pytest-cov defaults::python=${{ matrix.pyver }} ${{ matrix.squashfs_deps }} conda activate cptest pytest -v -ss --cov=conda_pack --cov-branch --cov-report=xml conda_pack/tests - uses: codecov/codecov-action@v4 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2bc7ce2..6321fae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: exclude: conda-recipe/meta.yaml - id: check-merge-conflict - repo: https://github.com/asottile/pyupgrade - rev: v3.15.2 + rev: v3.16.0 hooks: - id: pyupgrade args: ["--py37-plus"]