Update MacOS build

This commit is contained in:
Veronica Berglyd Olsen
2025-10-22 19:30:36 +02:00
parent 41c58a52e3
commit 687bcc2779
5 changed files with 26 additions and 20 deletions
+12 -12
View File
@@ -6,27 +6,27 @@ jobs:
buildAssets: buildAssets:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Python Setup - name: Checkout Source
uses: actions/setup-python@v6 uses: actions/checkout@v5
with:
python-version: "3.13"
architecture: x64
- name: Install Packages (apt) - name: Install System Packages
run: | run: |
sudo apt update sudo apt update
sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra
- name: Checkout Source - name: Install UV and Python
uses: actions/checkout@v5 uses: astral-sh/setup-uv@v6
with:
python-version: "3.13"
- name: Install Packages (pip) - name: Sync UV
run: pip install -U -r requirements.txt -r docs/requirements.txt run: |
uv sync --no-dev --group docs
- name: Build Assets - name: Build Assets
run: | run: |
python pkgutils.py build-assets uv run --no-sync pkgutils.py qtlrelease
python pkgutils.py icons optional uv run --no-sync pkgutils.py sample
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
+7 -3
View File
@@ -14,14 +14,18 @@ jobs:
with: with:
python-version: "3.13" python-version: "3.13"
architecture: x64 architecture: x64
- name: Install Packages (apt)
- name: Checkout Source
uses: actions/checkout@v5
- name: Install System Packages
run: | run: |
sudo apt update sudo apt update
sudo apt install qttools5-dev-tools sudo apt install qttools5-dev-tools
- name: Checkout Source
uses: actions/checkout@v5
- name: Build Assets - name: Build Assets
run: python pkgutils.py qtlrelease run: python pkgutils.py qtlrelease
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
+1 -1
View File
@@ -40,7 +40,7 @@ jobs:
run: | run: |
uv sync --no-dev --group test uv sync --no-dev --group test
- name: Run Build Commands - name: Build Assets
run: | run: |
uv run --no-sync pkgutils.py qtlrelease uv run --no-sync pkgutils.py qtlrelease
uv run --no-sync pkgutils.py sample uv run --no-sync pkgutils.py sample
+6 -3
View File
@@ -9,6 +9,8 @@ description = "A plain text editor for planning and writing novels"
readme = { file = "setup/description_pypi.md", content-type = "text/markdown" } readme = { file = "setup/description_pypi.md", content-type = "text/markdown" }
license = "GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0" license = "GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0"
license-files = ["LICENSE.md", "setup/LICENSE-Apache-2.0.txt"] license-files = ["LICENSE.md", "setup/LICENSE-Apache-2.0.txt"]
dynamic = ["version"]
requires-python = ">=3.10"
classifiers = [ classifiers = [
"Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.10",
@@ -23,9 +25,10 @@ classifiers = [
"Natural Language :: English", "Natural Language :: English",
"Topic :: Text Editors", "Topic :: Text Editors",
] ]
requires-python = ">=3.10" dependencies = [
dependencies = ["pyqt6>=6.4", "pyenchant>=3.0.0"] "pyqt6>=6.4",
dynamic = ["version"] "pyenchant>=3.3.0", # 3.3 is needed for MacOS AARCH64 builds
]
[dependency-groups] [dependency-groups]
dev = [ dev = [
-1
View File
@@ -109,7 +109,6 @@ conda install -c conda-forge enchant hunspell-en --yes
# Install dependencies # Install dependencies
echo "Installing Python dependencies ..." echo "Installing Python dependencies ..."
pip install -r "$SRC_DIR/requirements.txt" pip install -r "$SRC_DIR/requirements.txt"
pip install pyenchant==3.3.0rc1
# Leave conda env # Leave conda env
conda deactivate conda deactivate