Merge pull request #59 from ericpre/2021.10.30

Update bundle
hyperspy · Oct 30, 2021 · d0c0ab7 · d0c0ab7
2 parents e430e69 + 4ed531f
commit d0c0ab7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -101,6 +101,10 @@ jobs:
         name: Install constructor
         run: |
           conda install constructor jinja2
+          # include fixes for start menu shortcut
+          # https://github.com/conda-forge/conda-standalone-feedstock/pull/18
+          conda install -y conda-standalone -c ericpre --override-channels
+          pip install https://github.com/ericpre/constructor/archive/refs/heads/workhorse.zip --force --no-deps
 
       - shell: bash -l {0}
         name: Build distribution

diff --git a/conda_distribution/construct.yaml b/conda_distribution/construct.yaml
@@ -39,6 +39,9 @@ specs:
   - qt
   - qtconsole
   - scanning_drift_corr
+  # sphinx >=4.0 pins docutils <0.18
+  - sphinx >=4.0
+  - spyder
   - start_jupyter_cm