diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c712d355..a9d71a6f 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -11,7 +11,6 @@ on: tags: ['v*'] jobs: - linux: runs-on: ${{ matrix.os }} strategy: @@ -28,6 +27,7 @@ jobs: environment-file: environment.yml condarc: | channels: + - neutrons - mantid - oncat - conda-forge @@ -67,7 +67,6 @@ jobs: - name: Build python wheel # cannot be used without mantid shell: bash -l {0} run: | - # python3 -m pip install setuptools>=48.0.0 pip install check-wheel-contents python -m build --wheel --no-isolation check-wheel-contents dist/addie-*.whl # currently bad package @@ -75,8 +74,6 @@ jobs: - name: Build conda libraray shell: bash -l {0} run: | - # set up environment - # python3 -m pip install setuptools>=47.0.0 conda install -y anaconda-client conda-build conda-verify boa cd conda.recipe echo "versioningit $(versioningit ../)" diff --git a/environment.yml b/environment.yml index e3d08f85..33163e4f 100644 --- a/environment.yml +++ b/environment.yml @@ -1,11 +1,10 @@ name: addie channels: - - conda-forge - neutrons - mantid - oncat + - conda-forge dependencies: - - python>=3.8 - build - configparser - flake8