try to resolve build failure

neutrons · Dec 21, 2023 · b9a6b83 · b9a6b83
1 parent cc018d6
commit b9a6b83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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,16 +67,13 @@ 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
 
       - 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
@@ -1,11 +1,10 @@
 name: addie
 channels:
-    - conda-forge
     - neutrons
     - mantid
     - oncat
+    - conda-forge
 dependencies:
-    - python>=3.8
     - build
     - configparser
     - flake8