Skip to content

Commit

Permalink
chore(deps): adds compliance-trestle-fedramp dependency
Browse files Browse the repository at this point in the history
Adds the compliance-trestle-fedramp as an optional dependency so
that the version included with trestle-bot will be resolved with
the version of compliance-trestle being leveraged to ensure compatibility.

Refs: PSCE-578
Closes: #318

Signed-off-by: Jennifer Power <[email protected]>
  • Loading branch information
jpower432 committed Sep 19, 2024
1 parent 21b4043 commit d9bb9a3
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-poetry/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ runs:
shell: bash

- name: Install dependencies
run: poetry install --no-interaction --no-root
run: poetry install --with tests,dev --no-interaction --no-root
shell: bash
13 changes: 10 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN microdnf update -y \
FROM python-base AS dependencies

ARG POETRY_VERSION=1.7.1
ARG INSTALL_PLUGINS=true

# https://python-poetry.org/docs/configuration/#using-environment-variables
ENV POETRY_VIRTUALENVS_IN_PROJECT=true \
Expand All @@ -39,14 +40,20 @@ COPY . "/build"
# Install runtime deps and install the project in non-editable mode.
# Ensure pip and setuptools are updated in the virtualenv as well.
RUN python3.9 -m venv "$VENV_PATH" && \
. "$VENV_PATH"/bin/activate && \
python3.9 -m pip install --no-cache-dir --upgrade pip setuptools && \
if [ "$INSTALL_PLUGINS" == "true" ]; then \
poetry install --with plugins --no-root \
else \
poetry install --no-root \
fi

RUN python3.9 -m venv "$VENV_PATH" && \
. "$VENV_PATH"/bin/activate && \
python3.9 -m pip install --no-cache-dir --upgrade pip setuptools && \
poetry install --without tests,dev --no-root && \
poetry build -f wheel -n && \
pip install --no-cache-dir --no-deps dist/*.whl && \
rm -rf dist ./*.egg-info


FROM python-base AS final

COPY --from=dependencies $PYSETUP_PATH $PYSETUP_PATH
Expand Down
54 changes: 53 additions & 1 deletion poetry.lock

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

11 changes: 11 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ python-gitlab = "^4.2.0"
ruamel-yaml = "^0.18.5"
pydantic = "^2.0.0"

[tool.poetry.group.dev]
optional = true

[tool.poetry.group.dev.dependencies]
flake8 = "^7.0.0"
black = "^24.3.0"
Expand All @@ -46,12 +49,20 @@ pre-commit = "^3.4.0"
mkdocs-material = "^9.5.31"
markdown-include = "^0.8.1"

[tool.poetry.group.tests]
optional = true

[tool.poetry.group.tests.dependencies]
pytest = "^8.3.2"
pytest-cov = "^5.0.0"
pytest-skip-slow = "^0.0.5"
responses = "^0.25.0"

[tool.poetry.group.plugins]
optional = true

[tool.poetry.group.plugins.dependencies]
compliance-trestle-fedramp = "^0.3.0"

[tool.coverage.run]
branch = true
Expand Down

0 comments on commit d9bb9a3

Please sign in to comment.