diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 21d034c..f865256 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -34,6 +34,15 @@ jobs: shell: bash -l {0} run: conda install -c conda-forge tox-conda + ############################################################################### + # tox-conda fixes on Windows (https://github.com/tox-dev/tox-conda/issues/37) # + ############################################################################### + + - name: Install fixes for Python 3+ on Windows + if: runner.os == 'Windows' + shell: bash -l {0} + run: pip install scikit-misc + - name: Run pytest shell: bash -l {0} run: tox -e pytest diff --git a/environment.yml b/environment.yml index a8b8479..1a41f49 100644 --- a/environment.yml +++ b/environment.yml @@ -28,5 +28,5 @@ dependencies: - tox-conda - pip: - kernreg - - scikit-misc==0.1.3 + - scikit-misc<=0.1.3 - scikit-learn diff --git a/tox.ini b/tox.ini index e1c8c20..2099fa1 100644 --- a/tox.ini +++ b/tox.ini @@ -27,7 +27,7 @@ conda_channels = deps = kernreg scikit-learn - scikit-misc==0.1.3 + scikit-misc<=0.1.3 commands = pytest {posargs}