Skip to content

Commit b982eaa

Browse files
AbstractUmbraAbstractUmbra
committed
switch to pdm, cache builds better, pin postgres version
1 parent e758fec commit b982eaa

9 files changed

+962
-1633
lines changed

‎.github/workflows/coverage_and_lint.yml

+19-37
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- feature/revamp
78
pull_request:
89
branches:
910
- main
@@ -15,60 +16,41 @@ jobs:
1516
strategy:
1617
fail-fast: false
1718
matrix:
18-
python-version: ["3.11", "3.x"]
19+
python-version: ["3.12", "3.x"]
1920

2021
name: "Type Coverage and Linting @ ${{ matrix.python-version }}"
2122
steps:
2223
- name: "Checkout Repository"
23-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2425
with:
2526
fetch-depth: 0
2627

27-
- name: "Load cached poetry installation @ ${{ matrix.python-version }}"
28-
id: cached-poetry
29-
uses: actions/cache@v3
28+
- name: Setup PDM @ ${{ matrix.python-version }}
29+
uses: pdm-project/setup-pdm@v4
3030
with:
31-
path: ~/.local
32-
key: poetry-0
31+
python-version: ${{ matrix.python-version }}
32+
cache: true
3333

34-
- name: "Setup Poetry @ ${{ matrix.python-version }}"
35-
if: steps.cached-poetry.outputs.cache-hit != 'true'
36-
uses: snok/install-poetry@v1
37-
with:
38-
version: latest
39-
virtualenvs-create: true
40-
virtualenvs-in-project: true
41-
virtualenvs-path: .venv
42-
43-
- name: "Setup Python @ ${{ matrix.python-version }}"
44-
id: setup-python
45-
uses: actions/setup-python@v4
46-
with:
47-
python-version: "${{ matrix.python-version }}"
48-
cache: "poetry"
49-
50-
- name: "Load cached venv @ ${{ matrix.python-version }}"
51-
id: cached-pip-wheels
52-
uses: actions/cache@v3
53-
with:
54-
path: .venv/
55-
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
56-
57-
- name: "Install Python deps @ ${{ matrix.python-version }}"
58-
if: ${{ steps.cached-pip-wheels.outputs.cache-hit != 'true' }}
59-
id: install-deps
34+
- name: Install deps @ ${{ matrix.python-version }}
6035
run: |
61-
poetry install --no-interaction
36+
pdm install --check --no-editable
6237
6338
- name: Activate venv @ ${{ matrix.python-version }}
6439
run: |
65-
echo "$(poetry env info --path)/bin" >> $GITHUB_PATH
40+
echo "$(pdm info --where)/.venv/bin" >> $GITHUB_PATH
6641
6742
- name: "Run Pyright @ ${{ matrix.python-version }}"
68-
uses: jakebailey/pyright-action@v1
43+
uses: jakebailey/pyright-action@v2
6944
with:
7045
warnings: false
71-
no-comments: ${{ matrix.python-version != '3.x' }}
46+
annotate: ${{ matrix.python-version != '3.x' }}
7247

7348
- name: Lint
7449
uses: astral-sh/ruff-action@v3
50+
with:
51+
args: check .
52+
53+
- name: Formatting
54+
uses: astral-sh/ruff-action@v3
55+
with:
56+
args: check .

‎.github/workflows/deploy.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
name: Deploy
2+
3+
on:
4+
workflow_run:
5+
workflows: ["Create and publish a Docker image"]
6+
branches: [main]
7+
types:
8+
- completed
9+
110
jobs:
211
deploy:
312
name: Deploy bot
@@ -16,12 +25,3 @@ jobs:
1625
docker compose --profile snekbox pull
1726
docker compose --profile snekbox up --build -d
1827
username: ${{ secrets.SSH_USER }}
19-
20-
name: Deploy
21-
22-
on:
23-
workflow_run:
24-
workflows: ["Create and publish a Docker image"]
25-
branches: [main]
26-
types:
27-
- completed

‎.github/workflows/signoff.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: validate-signoff
2+
23
on:
34
pull_request:
45
types:

‎.pdm-python

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/penumbra/projects/other/pythonista/pythonista-bot/.venv/bin/python

‎Dockerfile

+27-45
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,36 @@
1-
FROM python:3.12-slim
1+
ARG PYTHON_BASE=3.12-slim
2+
3+
FROM python:${PYTHON_BASE} AS builder
4+
5+
# disable update check since we're "static" in an image
6+
ENV PDM_CHECK_UPDATE=false
7+
# install PDM
8+
RUN pip install -U pdm
9+
10+
WORKDIR /project
11+
12+
RUN apt-get update -y \
13+
&& apt-get install --no-install-recommends --no-install-suggests -y git \
14+
&& rm -rf /var/lib/apt/lists/*
15+
16+
RUN --mount=type=cache,target=/project/.venv/,sharing=locked \
17+
--mount=type=bind,source=pyproject.toml,target=/project/pyproject.toml,readwrite \
18+
--mount=type=bind,source=pdm.lock,target=/project/pdm.lock,readwrite \
19+
pdm install --check --prod --no-editable && \
20+
cp -R /project/.venv /project/.ready-venv
21+
22+
FROM python:${PYTHON_BASE}
223

324
LABEL org.opencontainers.image.source=https://github.com/PythonistaGuild/Pythonista-Bot
425
LABEL org.opencontainers.image.description="Pythonista Guild's Discord Bot"
526
LABEL org.opencontainers.image.licenses=MIT
627

7-
ENV PYTHONUNBUFFERED=1 \
8-
# prevents python creating .pyc files
9-
PYTHONDONTWRITEBYTECODE=1 \
10-
\
11-
# pip
12-
PIP_NO_CACHE_DIR=off \
13-
PIP_DISABLE_PIP_VERSION_CHECK=on \
14-
PIP_DEFAULT_TIMEOUT=100 \
15-
\
16-
# poetry
17-
# https://python-poetry.org/docs/configuration/#using-environment-variables
18-
# make poetry install to this location
19-
POETRY_HOME="/opt/poetry" \
20-
# make poetry create the virtual environment in the project's root
21-
# it gets named `.venv`
22-
POETRY_VIRTUALENVS_IN_PROJECT=true \
23-
# do not ask any interactive question
24-
POETRY_NO_INTERACTION=1 \
25-
\
26-
# paths
27-
# this is where our requirements + virtual environment will live
28-
PYSETUP_PATH="/opt/pysetup" \
29-
VENV_PATH="/opt/pysetup/.venv"
30-
31-
ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
32-
33-
RUN apt-get update \
34-
&& apt-get install --no-install-recommends -y \
35-
git \
36-
# deps for installing poetry
37-
curl \
38-
# deps for building python deps
39-
build-essential \
40-
libcurl4-gnutls-dev \
41-
gnutls-dev \
42-
libmagic-dev
43-
44-
RUN curl -sSL https://install.python-poetry.org | python -
45-
46-
# copy project requirement files here to ensure they will be cached.
28+
USER 1000:1000
29+
4730
WORKDIR /app
48-
COPY poetry.lock pyproject.toml ./
4931

50-
# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
51-
RUN poetry install --only=main
32+
COPY --from=builder --chown=1000:1000 /project/.ready-venv/ /app/.venv
33+
ENV PATH="/app/.venv/bin:$PATH"
5234

5335
COPY . /app/
54-
ENTRYPOINT ["poetry", "run", "python", "-O", "launcher.py" ]
36+
ENTRYPOINT [ "python", "-O", "launcher.py" ]

‎docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- database
1010

1111
database:
12-
image: postgres
12+
image: postgres:16
1313
container_name: pythonista-bot-db
1414
env_file:
1515
- .env

0 commit comments

Comments
 (0)