Skip to content

Commit

Permalink
Merge pull request #73 from ImperialCollegeLondon/fix-poetry
Browse files Browse the repository at this point in the history
Fix issues when installing the package in macos and linux.
  • Loading branch information
eeeyoung committed Dec 6, 2024
2 parents 8e719aa + bd03813 commit d293185
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 73 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,25 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install poetry
run: pipx install poetry==1.8.4

- uses: actions/setup-python@v5
with:
python-version: ${{matrix.python-version}}
cache: poetry

- name: Show Python Version
run: python --version

- name: Install Poetry
uses: abatilo/[email protected]
with:
poetry-version: 1.2.2
- name: Install system dependencies in Linux
if: runner.os == 'Linux'
shell: bash
run: |
sudo apt update
# Without this, PySide6 gives an ImportError
sudo apt install libegl1
- name: Install dependencies
run: poetry install
Expand Down
4 changes: 0 additions & 4 deletions bubble_analyser/GUI_manual.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@
from datetime import datetime
from pathlib import Path

import matplotlib
import numpy as np
import toml as tomllib

matplotlib.use("Agg") # Force backend to Agg for CI

from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.figure import Figure
from numpy import typing as npt
Expand Down
4 changes: 2 additions & 2 deletions bubble_analyser/__main__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""The entry point for the Bubble Analyser program."""

from .GUI_manual import main as gui_main

if __name__ == "__main__":
from .GUI_manual import main as gui_main

gui_main()
# default_main()
65 changes: 2 additions & 63 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d293185

Please sign in to comment.