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
4 changes: 2 additions & 2 deletions .github/workflows/pdm-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
with:
ref: main
- name: Update dependencies
uses: pdm-project/update-deps-action@v1.11
uses: astral-sh/setup-uv@v5
with:
token: ${{ secrets.GH_UPDATE_TOKEN }}
commit-message: "chore: Update pdm.lock"
commit-message: "chore: Update uv.lock"
pr-title: ":seedling: Update Python dependencies"
4 changes: 2 additions & 2 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ RUN groupadd -g 65532 chatgroup && \

WORKDIR /app

COPY pdm.lock pyproject.toml Makefile LICENSE README.md .
COPY uv.lock pyproject.toml Makefile LICENSE README.md .
COPY src/ src/
RUN make install-pdm install-global
RUN make install-uv install-global

RUN chown -R chatuser:chatgroup /app

Expand Down
4 changes: 2 additions & 2 deletions Containerfile.api
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ WORKDIR /app
RUN chown -R chatuser:chatgroup /app

COPY src/ src/
COPY pdm.lock pyproject.toml Makefile api-entrypoint.sh LICENSE README.md .
RUN make install-pdm install-global
COPY uv.lock pyproject.toml Makefile api-entrypoint.sh LICENSE README.md .
RUN make install-uv install-global
RUN chmod +x api-entrypoint.sh

USER chatuser
Expand Down
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
.PHONY: help install-deps tox

install-pdm: ## Install required utilities/tools
@command -v pdm > /dev/null || { echo >&2 "pdm is not installed. Installing..."; pip install --upgrade pip pdm; }
install-uv: ## Install required utilities/tools
@command -v uv > /dev/null || { echo >&2 "uv is not installed. Installing..."; pip install --upgrade pip uv; }

install-global: install-pdm pdm-lock-check ## Install rca-accelerator-chatbot to global Python directories
pdm install --global --project .
install-global: install-uv uv-lock-check ## Install rca-accelerator-chatbot to global Python directories
uv pip install .

install-deps: install-pdm ## Install Python dependencies
pdm sync
install-deps: install-uv ## Install Python dependencies
uv sync

install-dev-deps: install-pdm ## Install Python dependencies
pdm sync --dev
install-dev-deps: install-uv ## Install Python dependencies
uv sync --dev

pdm-lock-check: ## Check that the pdm.lock file is in a good shape
pdm lock --check
uv-lock-check: ## Check that the uv.lock file is in a good shape
uv lock --check

tox: ## Run tox
tox
Expand Down
2,743 changes: 0 additions & 2,743 deletions pdm.lock

This file was deleted.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
requires-python = "==3.12.*"
license = "Apache-2.0"

[tool.pdm.dev-dependencies]
[project.optional-dependencies]
dev = [
"tox==4.25.0",
"pylint==3.0.0",
Expand Down
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ env_list =
pytest

[testenv]
setenv =
PDM_IGNORE_SAVED_PYTHON="1"
deps = pdm
deps = uv
commands =
pdm lock --check
pdm install --dev --project .
uv lock --check
uv pip install -e ".[dev]"

[testenv:lint]
description = run Pylint
Expand Down
2,399 changes: 2,399 additions & 0 deletions uv.lock

Large diffs are not rendered by default.

Loading