Skip to content

Commit

Permalink
Merge pull request #32 from bento-platform/chore/updates
Browse files Browse the repository at this point in the history
chore: update dependencies + base image
  • Loading branch information
davidlougheed authored Jan 30, 2024
2 parents b35d511 + d263c5e commit 5bf35ef
Show file tree
Hide file tree
Showing 8 changed files with 567 additions and 591 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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
lint:
runs-on: ubuntu-latest
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: "3.10"
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 "uvicorn[standard]==0.24.0"
RUN pip install --no-cache-dir "uvicorn[standard]==0.27.0"

# Backwards-compatible with old BentoV2 container layout
WORKDIR /service-registry
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 "uvicorn[standard]==0.24.0"
RUN pip install --no-cache-dir "uvicorn[standard]==0.27.0"

# Backwards-compatible with old BentoV2 container layout
WORKDIR /service-registry
Expand Down
1,108 changes: 542 additions & 566 deletions poetry.lock

Large diffs are not rendered by default.

28 changes: 14 additions & 14 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_service_registry"
version = "1.3.3"
version = "1.3.4"
description = "An implementation of GA4GH Service Registry API for the Bento platform."
authors = ["David Lougheed <[email protected]>"]
readme = "README.md"
Expand All @@ -21,21 +21,21 @@ classifiers = [
python = "^3.10.0"
aiodns = "^3.0.0"
aiofiles = "^23.2.1"
aiohttp = "^3.9.2"
bento-lib = {extras = ["fastapi"], version = "^11.1.0"}
fastapi = "^0.105.0"
pydantic = "^2.4.0"
aiohttp = "^3.9.3"
bento-lib = {extras = ["fastapi"], version = "^11.4.0"}
fastapi = "^0.109.0"
pydantic = "^2.6.0"
pydantic-settings = "^2.0.3"
orjson = "^3.9.10"
orjson = "^3.9.12"

[tool.poetry.group.dev.dependencies]
coverage = "^7.2.1"
flake8 = "^6.0.0"
pytest = "^7.2.0"
debugpy = "^1.8.0"
flake8 = "^7.0.0"
httpx = "^0.26.0"
mypy = "~1.8.0"
pytest = "^7.4.4"
pytest-asyncio = "^0.23.4"
pytest-cov = "^4.0.0"
tox = "^4.4.5"
mypy = "^1.0.0"
types-aiofiles = "^22.1.0"
pytest-asyncio = "^0.20.1"
debugpy = "^1.6.3"
httpx = "^0.24.1"
tox = "^4.12.1"
types-aiofiles = "^23.2.0"
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ skip_install = true
allowlist_externals =
poetry
commands =
poetry install
poetry install --sync
poetry run pytest -svv --cov=bento_service_registry --cov-branch {posargs}
poetry run flake8 ./bento_service_registry ./tests
poetry run mypy bento_service_registry

0 comments on commit 5bf35ef

Please sign in to comment.