Skip to content

Commit

Permalink
Merge pull request #41 from bento-platform/chore/updates
Browse files Browse the repository at this point in the history
chore: update deps, base image, actions
  • Loading branch information
davidlougheed authored Jan 30, 2024
2 parents e7ba243 + b69798b commit 46bc5b9
Show file tree
Hide file tree
Showing 8 changed files with 469 additions and 494 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run Bento build action
uses: bento-platform/[email protected].0
uses: bento-platform/[email protected].1
with:
registry: ghcr.io
registry-username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install flake8
run: pip install flake8
- name: Run linter
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
matrix:
python-version: [ "3.10", "3.11" ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
name: Set up Python
with:
python-version: ${{ matrix.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.12.01
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2024.01.01

# Use uvicorn (instead of hypercorn) in production since I've found
# multiple benchmarks showing it to be faster - David L
RUN pip install --no-cache-dir poetry==1.7.1 "uvicorn[standard]==0.25.0"
RUN pip install --no-cache-dir poetry==1.7.1 "uvicorn[standard]==0.27.0"

# Backwards-compatible with old BentoV2 container layout
WORKDIR /drop-box
Expand Down
4 changes: 2 additions & 2 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.12.01
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2024.01.01

RUN pip install --no-cache-dir poetry==1.7.1 "uvicorn[standard]==0.25.0"
RUN pip install --no-cache-dir poetry==1.7.1 "uvicorn[standard]==0.27.0"

# Backwards-compatible with old BentoV2 container layout
WORKDIR /drop-box
Expand Down
925 changes: 450 additions & 475 deletions poetry.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "bento_drop_box_service"
version = "1.1.3"
version = "1.1.4"
description = "Drop box and basic file management service for the Bento platform."
authors = ["David Lougheed <[email protected]>", "Simon Chénard <[email protected]>"]
readme = "README.md"
Expand All @@ -19,19 +19,19 @@ classifiers = [

[tool.poetry.dependencies]
python = "^3.10.0"
bento-lib = {extras = ["fastapi"], version = "^11.1.1"}
bento-lib = {extras = ["fastapi"], version = "^11.4.0"}
aiofiles = "^23.1.0"
fastapi = "^0.104.0"
fastapi = "^0.109.0"
werkzeug = "^3.0.1"
python-multipart = "^0.0.6"
pydantic-settings = "^2.0.3"

[tool.poetry.group.dev.dependencies]
tox = "^4.11.3"
coverage = "^7.3.2"
pytest = "^7.4.2"
pytest = "^7.4.4"
pytest-cov = "^4.0.0"
flake8 = "^6.0.0"
pytest-asyncio = "^0.21.1"
flake8 = "^7.0.0"
pytest-asyncio = "^0.23.4"
debugpy = "^1.8.0"
httpx = "^0.25.0"
httpx = "^0.26.0"
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ skip_install = true
allowlist_externals =
poetry
commands =
poetry install
pytest -svv --cov=bento_drop_box_service --cov-branch {posargs}
flake8 ./bento_drop_box_service ./tests
poetry install --sync
poetry run pytest -svv --cov=bento_drop_box_service --cov-branch {posargs}
poetry run flake8 ./bento_drop_box_service ./tests

0 comments on commit 46bc5b9

Please sign in to comment.