Skip to content

Commit 752844a

Browse files
committed
Avoid wx4.2.5 on MacOS in gsas2main
1 parent 432977a commit 752844a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

install/GSAS2main/makeBldFiles.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ def makeConstructYaml(Gver, pyver, npver, name='construct.yaml'):
304304
- python={pyversion}
305305
- numpy={npversion}
306306
- matplotlib-base
307-
- wxpython
307+
- wxpython !=4.2.5 # [osx]
308+
- wxpython # [not osx]
308309
- pyopengl
309310
- scipy
310311
- briantoby::gsas2main
@@ -322,7 +323,7 @@ def makeConstructYaml(Gver, pyver, npver, name='construct.yaml'):
322323
- xmltodict
323324
- pybaselines
324325
- seekpath
325-
- pywin32 [win]
326+
- pywin32 # [win]
326327
327328
post_install: g2postinstall.sh [unix]
328329
post_install: g2postinstall.bat [win]

0 commit comments

Comments
 (0)