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

Make all oaklib & fastapi non-optional #318

Merged
merged 4 commits into from
Sep 15, 2023
Merged

Make all oaklib & fastapi non-optional #318

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26f0ae7
Make all oaklib & fastapi non-optional
kevinschaper Sep 15, 2023
71719a9
Update Makefile
glass-ships Sep 15, 2023
fe6c0f5
Update test-backend.yaml
glass-ships Sep 15, 2023
3cee4bb
Update README.md
glass-ships Sep 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/test-backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# install your root project, if required
#----------------------------------------------
- name: Install library
run: poetry -C backend install --no-interaction -E api
run: poetry -C backend install --no-interaction

#----------------------------------------------
# run pytest
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ install: install-backend install-frontend
.PHONY: install-backend
install-backend:
cd backend && \
poetry install -E api --with dev
poetry install --with dev


.PHONY: install-frontend
Expand Down
89 changes: 43 additions & 46 deletions backend/poetry.lock
View file
Open in desktop

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

11 changes: 3 additions & 8 deletions backend/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ rich = "*"
docker = "^6.0.1"
pystow = ">=0.5.0"
loguru = "*"
### Optional API dependencies
fastapi ={ version = "^0.87.0", optional = true }
oaklib = "0.5.18rc2"
fastapi = "^0.87.0"
oaklib = "^0.5.19"


[tool.poetry.group.dev.dependencies]
Expand All @@ -47,13 +46,9 @@ habanero = "*"
manubot = "*"


[tool.poetry.extras]
api = ["fastapi", "oaklib"]


[tool.poetry.scripts]
monarch = "monarch_py.cli:app"
monarch-api = { callable = "monarch_py.api.main:run", extras = ["api"] }
monarch-api = { callable = "monarch_py.api.main:run"}


[tool.ruff]
Expand Down