diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e151d3b..01cfafe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,26 +4,24 @@ on: [push, pull_request] jobs: test: - name: ${{ matrix.os }} ${{ matrix.python-version }} + name: ${{ matrix.os }} ${{ matrix.environment }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: os: [ubuntu-latest] - python-version: ["3.9", "3.10", "3.11"] - environment: [continuous_integration/environment.yml] + environment: ["3.9", "3.10", "3.11"] include: - os: windows-latest - python-version: "3.9" + environment: "3.9" - os: windows-latest - python-version: "3.11" + environment: "3.11" - os: macos-latest - python-version: "3.9" + environment: "3.9" - os: macos-latest - python-version: "3.11" + environment: "3.11" - os: ubuntu-latest - python-version: "3.9" - environment: continuous_integration/environment-no-optional-deps.yml + environment: nodeps steps: - name: Checkout source @@ -37,10 +35,10 @@ jobs: miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true + channel-priority: strict + environment-file: continuous_integration/environment-${{ matrix.environment }}.yml activate-environment: test - condarc-file: continuous_integration/condarc - python-version: ${{ matrix.python-version }} - environment-file: ${{ matrix.environment }} + auto-activate-base: false - name: Install zict shell: bash -l {0} diff --git a/continuous_integration/condarc b/continuous_integration/condarc deleted file mode 100644 index 258ac5f..0000000 --- a/continuous_integration/condarc +++ /dev/null @@ -1,9 +0,0 @@ -channels: - - conda-forge - - defaults -channel_priority: true -auto_activate_base: false -remote_backoff_factor: 20 -remote_connect_timeout_secs: 20.0 -remote_max_retries: 10 -remote_read_timeout_secs: 60.0 diff --git a/continuous_integration/environment-3.10.yml b/continuous_integration/environment-3.10.yml new file mode 100644 index 0000000..b189ae0 --- /dev/null +++ b/continuous_integration/environment-3.10.yml @@ -0,0 +1,11 @@ +name: test +channels: + - conda-forge +dependencies: + - python =3.10 + - psutil # Enables extra tests + - python-lmdb # Optional dependency + - pytest + - pytest-asyncio + - pytest-repeat + - pytest-timeout diff --git a/continuous_integration/environment-3.11.yml b/continuous_integration/environment-3.11.yml new file mode 100644 index 0000000..053e6d1 --- /dev/null +++ b/continuous_integration/environment-3.11.yml @@ -0,0 +1,11 @@ +name: test +channels: + - conda-forge +dependencies: + - python =3.11 + - psutil # Enables extra tests + - python-lmdb # Optional dependency + - pytest + - pytest-asyncio + - pytest-repeat + - pytest-timeout diff --git a/continuous_integration/environment.yml b/continuous_integration/environment-3.9.yml similarity index 92% rename from continuous_integration/environment.yml rename to continuous_integration/environment-3.9.yml index c5d470e..35b4550 100644 --- a/continuous_integration/environment.yml +++ b/continuous_integration/environment-3.9.yml @@ -2,6 +2,7 @@ name: test channels: - conda-forge dependencies: + - python =3.9 - psutil # Enables extra tests - python-lmdb # Optional dependency - pytest diff --git a/continuous_integration/environment-no-optional-deps.yml b/continuous_integration/environment-nodeps.yml similarity index 88% rename from continuous_integration/environment-no-optional-deps.yml rename to continuous_integration/environment-nodeps.yml index f30b1e4..bae6ecb 100644 --- a/continuous_integration/environment-no-optional-deps.yml +++ b/continuous_integration/environment-nodeps.yml @@ -2,6 +2,7 @@ name: test channels: - conda-forge dependencies: + - python =3.9 - pytest - pytest-asyncio - pytest-repeat