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
14 changes: 0 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ jobs:
- uses: actions/checkout@v7
with:
fetch-depth: 0 # All of history
- name: Cache pip
uses: actions/cache@v6
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- uses: asdf-vm/actions/install@v4
- name: Install dependencies
run: make sync
Expand All @@ -64,13 +57,6 @@ jobs:
- uses: actions/checkout@v7
with:
fetch-depth: 0 # All of history
- name: Cache pip
uses: actions/cache@v6
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- uses: asdf-vm/actions/install@v4
- name: Install dependencies
run: make sync
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ repos:
hooks:
- id: pretty-format-toml
args: [--autofix]
exclude: uv.lock

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.5
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
FROM python:3.12.6
WORKDIR /app
RUN apt-get update && apt-get install -y iproute2
COPY requirements.txt /app
RUN pip install -r requirements.txt
RUN curl -LsSf https://astral.sh/uv/0.13.5/install.sh | sh
ENV UV_PROJECT_ENVIRONMENT=/usr/local
COPY pyproject.toml uv.lock /app/
RUN ~/.local/bin/uv sync
COPY . /app
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
.venv/bin/python:
uv venv

sync: .venv/bin/python requirements.txt
uv pip sync --strict requirements.txt

requirements.txt: requirements.in .venv/bin/python
uv pip compile requirements.in -o requirements.txt --python-version 3.12 --no-strip-extras
sync: .venv/bin/python pyproject.toml
uv sync

watch-test: sync
.venv/bin/ptw --now --runner .venv/bin/pytest . -vvv
Expand Down
4 changes: 3 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ Vagrant.configure("2") do |config|
set -eux -o pipefail
sudo apt-get update
sudo apt-get install --no-install-recommends -y build-essential python3 python3-pip git apt-transport-https curl redis-server firefox python3-setuptools python3-wheel python3-dev libssl-dev xdg-utils hostsed
curl -LsSf https://astral.sh/uv/0.13.5/install.sh | sh
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker-key.gpg
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker-key.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
cd /vagrant
pip3 install --break-system-packages -r requirements.txt
~/.local/bin/uv venv --system-site-packages
~/.local/bin/uv sync
./test.sh
SHELL
end
27 changes: 27 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
[dependency-groups]
dev = [
"selenium==4.31.0",
"pre-commit==4.4.0",
"pytest==9.0.3",
"pytest-django==4.11.1",
"pytest-watcher==0.4.3",
"model-bakery==1.20.5"
]

[project]
dependencies = [
"django==6.0.8",
"django-jinja-bootstrap-form==4.5.0",
"dj-database-url==3.0.0",
"requests==2.33.0",
"jinja2==3.1.6",
"psycopg2-binary==2.9.10",
"celery[redis]==5.5.1",
"django-redis==7.0.0",
"django-celery-results==2.6.0",
"paramiko==5.0.0",
"gitpython==3.2.1",
"humanize==4.12.2",
"timeout-decorator==0.5.0",
"packaging==26.0",
"django-jinja==2.11.0"
]
description = "Opinionated web frontend for Dokku"
name = "wharf"
requires-python = ">=3.12"
Expand Down
23 changes: 0 additions & 23 deletions requirements.in

This file was deleted.

195 changes: 0 additions & 195 deletions requirements.txt

This file was deleted.

Loading