Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Python Unit Test
uses: uc-cdis/.github/.github/workflows/python_unit_test.yaml@master
with:
python-version: '3.9'
python-version: '3.13'

ci:
name: Build Image and Push
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: PyPI Poetry Publish
uses: uc-cdis/.github/.github/workflows/python_package_index_publish.yaml@master
with:
PYTHON_VERSION: '3.9'
PYTHON_VERSION: '3.13'
# This will attempt push to test PyPI first and only push to prod if it works
DO_TEST_PUBLISH_FIRST: true
secrets:
Expand Down
14 changes: 10 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
ARG AZLINUX_BASE_VERSION=master
ARG AZLINUX_BASE_VERSION=3.13-buildbase

# Base stage with python-build-base
FROM quay.io/cdis/python-nginx-al:${AZLINUX_BASE_VERSION} AS base

FROM quay.io/cdis/amazonlinux-base:${AZLINUX_BASE_VERSION} AS base
ENV appname=dictionaryutils

COPY --chown=gen3:gen3 . /${appname}
Expand All @@ -12,10 +11,17 @@ WORKDIR /${appname}
# Builder stage
FROM base AS builder

USER root
RUN chown -R gen3:gen3 /venv
RUN dnf install -y python3-devel postgresql-devel gcc

USER gen3
RUN python3.13 -m pip install --upgrade pip && \
python3.13 -m pip install pipx && \
python3.13 -m pipx ensurepath

RUN pipx install 'poetry>=2.0'
ENV PATH="/home/gen3/.local/bin:/usr/sbin:${PATH}"
COPY poetry.lock pyproject.toml /${appname}/

RUN poetry install -vv --no-interaction --without dev
Expand All @@ -29,7 +35,7 @@ RUN poetry install -vv --no-interaction
ENV PATH="$(poetry env info --path)/bin:$PATH"

# Final stage
FROM base
FROM builder

COPY --from=builder /${appname} /${appname}

Expand Down
91 changes: 7 additions & 84 deletions poetry.lock

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

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "dictionaryutils"
version = "3.5.1"
version = "4.0.0"
description = "Python wrapper and metaschema for datadictionary."
authors = ["CTDS UChicago <cdis@uchicago.edu>"]
license = "Apache-2.0"
Expand All @@ -11,18 +11,18 @@ include = [
]

[tool.poetry.dependencies]
python = ">=3.9, <4"
python = ">=3.13,<4"
PyYAML = "*"
# limiting to a version where RefResolver is deprecated but still functioning
jsonschema = "<=4.23.0"
cdislogging = "*"
requests = "*"
gen3dictionary = "^2.0.4"
gen3dictionary = ">=3.0.0"

[tool.poetry.group.dev.dependencies]
pytest = "*"
data-simulator = {git = "https://github.com/uc-cdis/data-simulator.git"}

[build-system]
requires = ["poetry>=0.12"]
requires = ["poetry>=2.1.0"]
build-backend = "poetry.masonry.api"