Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/build_installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.10
- pip
- llvm-openmp
- expat=2.7.3
- expat=2.5.0
- pip:
- -r requirements.txt
- -r requirements-dev.txt
6 changes: 4 additions & 2 deletions rascal2/widgets/terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,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()

Expand Down Expand Up @@ -71,6 +73,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):
Expand All @@ -97,8 +100,7 @@ def write_error(self, text: str):

def clear(self):
"""Clear the text in the terminal."""
self.write_html('<div style="white-space: pre-line;"><b>" "</b></div>')
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()

Expand Down
Loading