Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split up dependencies into main, ioc and plotting #22

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Split up dependencies into main, ioc and plotting #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2415dce
Split up dependencies into main, ioc and plotting
callumforrester Jun 9, 2023
984e8bd
Update test dependencies
callumforrester Jun 9, 2023
0502dbc
Fix all dependencies in tests
callumforrester Jun 9, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
matrix:
os: ["ubuntu-latest"] # can add windows-latest, macos-latest
python: ["3.9", "3.10"]
install: ["-e .[dev]"]
install: ["-e .[dev,ioc,plotting]"]
# Make one version be non-editable to test both paths of version code
include:
- os: "ubuntu-latest"
python: "3.9"
install: ".[dev]"
install: ".[dev,ioc,plotting]"

runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
uses: docker/build-push-action@v3
with:
build-args: |
PIP_OPTIONS=-r lockfiles/requirements.txt dist/*.whl
PIP_OPTIONS=-r lockfiles/requirements.txt ${ls dist/*.whl}[plotting]
push: ${{ github.event_name != 'pull_request' && endsWith(github.ref, 'main') }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
6 changes: 2 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ dependencies = [
"ipython",
"pyepics",
"click",
"PyQt6",
"PyQt5",
"pydantic",
"softioc",
"pandablocks",
"scipy",
]
dynamic = ["version"]
Expand All @@ -33,6 +29,8 @@ readme = "README.rst"
requires-python = ">=3.9"

[project.optional-dependencies]
plotting = ["PyQt6", "PyQt5", "matplotlib"]
ioc = ["softioc", "pandablocks"]
dev = [
"black",
"mypy",
Expand Down