diff --git a/.github/workflows/build_installer.yaml b/.github/workflows/build_installer.yaml index 961bd3e5..13bf54a7 100644 --- a/.github/workflows/build_installer.yaml +++ b/.github/workflows/build_installer.yaml @@ -29,7 +29,7 @@ jobs: conda init powershell conda activate rascal2 conda install -c nsis nsis=3.* accesscontrol - python -m pip install --no-build-isolation 'D:\hostedtoolcache\windows\MATLAB\extern\engines\python' + python -m pip install --no-build-isolation matlabengine==9.14.* python packaging/build_exe.py if ($env:GITHUB_REF_NAME -eq "main") { makensis /DNIGHTLY packaging/windows/build_installer.nsi @@ -94,13 +94,19 @@ jobs: conda activate rascal2 if [ ${{ matrix.platform }} == "macos-14" ]; then ARCH="arm64" - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/Users/runner/hostedtoolcache/MATLAB/2023.2.999/arm64/MATLAB.app/bin/maca64 - python -m pip install --no-build-isolation /Users/runner/hostedtoolcache/MATLAB/2023.2.999/arm64/MATLAB.app/extern/engines/python + MATLAB_DIR="/Users/runner/hostedtoolcache/MATLAB/2023.2.999/arm64/MATLAB.app/bin/maca64" + ENGINE_DIR="/Users/runner/hostedtoolcache/MATLAB/2023.2.999/arm64/MATLAB.app/extern/engines/python" + else ARCH="x64" - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/Users/runner/hostedtoolcache/MATLAB/2023.2.999/x64/MATLAB.app/bin/maci64 - python -m pip install --no-build-isolation /Users/runner/hostedtoolcache/MATLAB/2023.2.999/x64/MATLAB.app/extern/engines/python + MATLAB_DIR="/Users/runner/hostedtoolcache/MATLAB/2023.2.999/x64/MATLAB.app/bin/maci64" + ENGINE_DIR="/Users/runner/hostedtoolcache/MATLAB/2023.2.999/x64/MATLAB.app/extern/engines/python" fi + if [ ! -d "${MATLAB_DIR}" ]; then + echo "MATLAB directory not found!" + fi + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$MATLAB_DIR + python -m pip install --no-build-isolation $ENGINE_DIR python packaging/build_exe.py chmod 777 packaging/bundle/rascal.app/Contents/Resources/matlab/engine/_arch.txt cd packaging/macos/ diff --git a/environment.yaml b/environment.yaml index f26e9dac..b8b0bc70 100644 --- a/environment.yaml +++ b/environment.yaml @@ -6,8 +6,8 @@ dependencies: - python=3.10 - pip - llvm-openmp - - expat=2.7.3 - openssl=3.6.2 + - expat=2.5.0 - pip: - -r requirements.txt - -r requirements-dev.txt diff --git a/rascal2/widgets/terminal.py b/rascal2/widgets/terminal.py index 784f2da1..1d008379 100644 --- a/rascal2/widgets/terminal.py +++ b/rascal2/widgets/terminal.py @@ -38,6 +38,8 @@ def __init__(self): font.setStyleHint(font.StyleHint.Monospace) self.text_area.setFont(font) self.text_area.setLineWrapMode(self.text_area.LineWrapMode.NoWrap) + self.text_format = QtGui.QTextCharFormat(self.text_area.currentCharFormat()) + self.text_format.setFontWeight(QtGui.QFont.Weight.Bold) widget_layout = QtWidgets.QVBoxLayout() @@ -72,6 +74,7 @@ def write(self, text: str): The text to append. """ + self.text_area.setCurrentCharFormat(self.text_format) self.text_area.appendPlainText(text.rstrip()) def write_html(self, text: str): @@ -98,8 +101,7 @@ def write_error(self, text: str): def clear(self): """Clear the text in the terminal.""" - self.write_html('
" "
') - self.text_area.moveCursor(QtGui.QTextCursor.MoveOperation.Start, QtGui.QTextCursor.MoveMode.MoveAnchor) + self.text_area.setCurrentCharFormat(self.text_format) self.text_area.setPlainText("") self.update()