From 757e020c760b05078318a9f0531fc2471f02fa43 Mon Sep 17 00:00:00 2001 From: Martin Reuter Date: Sat, 4 May 2024 23:16:19 +0200 Subject: [PATCH 1/3] stop requesting x64 for mac to work on arm --- .github/workflows/code-style.yml | 2 +- .github/workflows/doc.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/pytest.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index 218ec13..25428c8 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.9' - architecture: 'x64' + #architecture: 'x64' - name: Install dependencies run: | python -m pip install --progress-bar off --upgrade pip setuptools wheel diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index b1f6cee..8f12b07 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -24,7 +24,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: 3.9 - architecture: 'x64' + #architecture: 'x64' - name: Install package run: | python -m pip install --progress-bar off --upgrade pip setuptools wheel diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 73deab0..aa55874 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.9' - architecture: 'x64' + #architecture: 'x64' - name: Install dependencies run: | python -m pip install --progress-bar off --upgrade pip setuptools wheel diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index baea84a..8834d30 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - architecture: 'x64' + #architecture: 'x64' - name: Install package run: | python -m pip install --progress-bar off --upgrade pip setuptools wheel From 42e91c590236be33652530090c0aa5a37e8b27d0 Mon Sep 17 00:00:00 2001 From: Martin Reuter Date: Sat, 4 May 2024 23:40:57 +0200 Subject: [PATCH 2/3] bumping to PyQt6 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6553104..50fafe3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ 'pillow', 'pyopengl==3.1.6', 'nibabel', - 'PyQt5==5.15.6', + 'PyQt6', 'psutil' ] From 961d44bd4c40de885fabeb71615a965394c1a88d Mon Sep 17 00:00:00 2001 From: Martin Reuter Date: Tue, 14 May 2024 22:54:52 +0200 Subject: [PATCH 3/3] try PyQt5 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 50fafe3..1bc4385 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ 'pillow', 'pyopengl==3.1.6', 'nibabel', - 'PyQt6', + 'PyQt5', 'psutil' ]