Initial commit from 'copier' template

Author: Gehock

.copier-answers.yml

@@ -1,10 +1,10 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v1.8.1
+_commit: v2.0.0a1
 _src_path: gh:OverkillGuy/python-template
 author_email: [email protected]
 author_name: Jb Doyon
 description: Multipurpose discord bot for the Zeusops community
-dynamic_versioning: false
+dynamic_versioning: true
 package_name: zeusops_bot
 project_name: Zeusops bot
 project_slug: zeusops-bot

.dockerignore

@@ -1,16 +1,16 @@
-# Poetry.lock is an exact version pinning tool (down to SHA256 of libs)
-# If writing a (reusable) library, exact versions don't matter that much so it
-# may make sense to gitignore that file, uncommenting the following line:
-# poetry.lock
-# If writing an App (binary-deployable), then exact library versions
-# do matter a lot, and you'll want to keep Poetry.lock tracked = keep
-# commented
-
 ################################################################################
 # Global ignore list, common in BOTH .dockerignore, and .gitignore
 # Make sure that whatever is done below is copied to the other file
 ################################################################################
 
+# uv.lock is an exact version pinning tool (down to SHA256 of libs)
+# If writing a (reusable) library, exact versions don't matter that much so it
+# may make sense to ignore that file, uncommenting the following line:
+# uv.lock
+# If writing an App (binary-deployable), then exact library versions
+# do matter a lot, and you'll want to keep Uv.lock tracked = keep
+# commented
+
 test_results/
 
 # Do not track the code-extracted docs page from 'make docs'
@@ -120,6 +120,12 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
@@ -132,8 +138,10 @@ ipython_config.py
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
@@ -185,6 +193,19 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
+
+# Cursor
+#  Cursor is an AI-powered code editor.`.cursorignore` specifies files/directories to
+#  exclude from AI features like autocomplete and code analysis. Recommended for sensitive data
+#  refer to https://docs.cursor.com/context/ignore-files
+.cursorignore
+.cursorindexingignore
+
 ################ Above is Python gitignore from github/gitignore ###############
 
 

.gitignore

@@ -1,16 +1,16 @@
-# Poetry.lock is an exact version pinning tool (down to SHA256 of libs)
-# If writing a (reusable) library, exact versions don't matter that much so it
-# may make sense to gitignore that file, uncommenting the following line:
-poetry.lock
-# If writing an App (binary-deployable), then exact library versions
-# do matter a lot, and you'll want to keep Poetry.lock tracked = keep
-# commented
-
 ################################################################################
 # Global ignore list, common in BOTH .dockerignore, and .gitignore
 # Make sure that whatever is done below is copied to the other file
 ################################################################################
 
+# uv.lock is an exact version pinning tool (down to SHA256 of libs)
+# If writing a (reusable) library, exact versions don't matter that much so it
+# may make sense to ignore that file, uncommenting the following line:
+# uv.lock
+# If writing an App (binary-deployable), then exact library versions
+# do matter a lot, and you'll want to keep Uv.lock tracked = keep
+# commented
+
 test_results/
 
 # Do not track the code-extracted docs page from 'make docs'
@@ -120,6 +120,12 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
@@ -132,8 +138,10 @@ ipython_config.py
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
@@ -185,6 +193,19 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
+
+# Cursor
+#  Cursor is an AI-powered code editor.`.cursorignore` specifies files/directories to
+#  exclude from AI features like autocomplete and code analysis. Recommended for sensitive data
+#  refer to https://docs.cursor.com/context/ignore-files
+.cursorignore
+.cursorindexingignore
+
 ################ Above is Python gitignore from github/gitignore ###############
 
 

.pre-commit-config.yaml

@@ -31,20 +31,20 @@ repos:
     name: Hadolint (Dockerfile checker)
 # Actual Python Linters
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.11
+  rev: v0.7.0
   hooks:
   - id: ruff-format
   - id: ruff
     args: ["--fix"]
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.15.0
+  rev: v1.12.1
   hooks:
   - id: mypy
     name: Mypy (Python type-checker)
     exclude: 'docs/source/.*\.py'
     # Uncomment below if mypy requires extra type stub packages
     # additional_dependencies: [types-PyYAML==6.0.12.2]
 - repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.45.0
+  rev: v0.42.0
   hooks:
   - id: markdownlint-fix

Dockerfile

@@ -1,18 +1,19 @@
-FROM python:3.12-bookworm
+FROM ghcr.io/astral-sh/uv:python3.12-bookworm
 
-# Bring poetry, our package manager, and pre-commit hooks
-ARG POETRY_VERSION=1.8.1
-ARG PRECOMMIT_VERSION=4.1.0
-RUN pip install --no-cache-dir \
-    poetry==${POETRY_VERSION} \
-    pre-commit==${PRECOMMIT_VERSION}
+# Ensure tools installed by UV are on PATH right away
+# Per https://github.com/astral-sh/uv/issues/13057#issuecomment-2832631407
+ENV UV_TOOL_BIN_DIR=/usr/local/bin
 
+# Disable python version downloading, use what we got!
+ENV UV_PYTHON_DOWNLOADS=0
 
-# We may be in docker, but the package's dependecies we install may clash with
-# the poetry/pre-commit dependencies (mostly requests version).
-# Set up a venv anyway here:
-ENV POETRY_VIRTUALENVS_CREATE=true
 
+ARG PRECOMMIT_VERSION=4.2.0
+ARG UV_DYNAMIC_VERSION=0.8.2
+RUN uv pip install --system \
+    "uv-dynamic-versioning==${UV_DYNAMIC_VERSION}" && \
+    uv tool install \
+    "pre-commit==${PRECOMMIT_VERSION}"
 
 # Workaround critical-level CVEs in Python image
 # By forcing just security update (no featureful updates, as part of apt conf)
@@ -23,8 +24,22 @@ RUN apt-get update \
     && apt-get upgrade -y \
     && rm -rf /var/lib/apt/lists/*
 
-COPY . /workdir
+
 WORKDIR /workdir
 
-# Install the local package dependencies (dev-mode)
-RUN poetry install
+# Changing the default UV_LINK_MODE silences warnings about not being able to
+# use hard links since the cache and sync target are on separate file systems.
+ENV UV_LINK_MODE=copy
+
+# Install dependencies only, as they don't change often (note bindmount deplist)
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv sync --locked --no-install-project
+
+# Copy the actual project contents into the image
+COPY . /workdir
+
+# Sync the project now the code is present
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked

Makefile

@@ -12,7 +12,8 @@ endif
 # - Fallback values using ?=, see below:
 DOCKER_IMAGE_NAME?=zeusops-bot
 DOCKER_REGISTRY?=
-APP_VERSION?=$(shell poetry version --short)
+APP_VERSION?=$(shell uvx dunamai from git | sed 's/+/-/g')
+
 
 ## Default command, run via 'make' or 'make all'
 .PHONY: all
@@ -31,7 +32,7 @@ help:
 ## Set up the virtualenv and install the package + dependencies
 .PHONY: install
 install:
-	poetry install
+	uv sync --all-extras
 
 ## Run the linters and formatters on all files (not just staged for commit)
 .PHONY: lint
@@ -41,17 +42,18 @@ lint:
 ## Run the tests
 .PHONY: test
 test:
-	poetry run pytest
+	uv run --all-extras pytest
 
 ## Generate the docs, both HTML and docsets
 .PHONY: docs
 docs:
 	cd docs && make html
-	poetry run doc2dash \
-		--force \
-		--name zeusops-bot \
-		docs/build/html \
-		--destination docs/build/docset
+	uv run --all-extras \
+		doc2dash \
+			--force \
+			--name zeusops-bot \
+			docs/build/html \
+			--destination docs/build/docset
 
 ## Serve the generated docs on a port of localhost
 .PHONY: docs-serve
@@ -61,7 +63,7 @@ docs-serve:
 ## Build the wheel/tarball package
 .PHONY: build
 build:
-	poetry build
+	uv build
 
 ## Set up the pre-commit hooks to execute on next git commit
 .PHONY: install-hooks
@@ -82,55 +84,48 @@ docker-build-dev:
 	docker build -t ${DOCKER_IMAGE_NAME}-dev .
 
 ##  Make a release commit + tag, creating Changelog entry
-##  Set BUMP variable to any of poetry-supported (major, minor, patch)
-##  or number (1.2.3 etc), see 'poetry version' docs for details
+##  Set BUMP variable to any of uv-supported (major, minor, patch)
 ##  Default the bump to a patch (v1.2.3 -> v1.2.4)
 BUMP=patch
 .PHONY: release
 release:
 # Set the new version Makefile variable after the version bump
-	$(eval NEW_VERSION := $(shell poetry version --short ${BUMP}))
+	$(eval NEW_VERSION := $(shell uv version --short --dry-run --bump ${BUMP}))
 	$(eval TMP_CHANGELOG := $(shell mktemp))
-	sed \
-		"s/\(## \[Unreleased\]\)/\1\n\n## v${NEW_VERSION} - $(shell date +%Y-%m-%d)/" \
+	@sed \
+		"s;\(## \[Unreleased\]\);\1\n\n## v${NEW_VERSION} - $(shell date +%Y-%m-%d);" \
 		CHANGELOG.md > ${TMP_CHANGELOG}
-	mv --force ${TMP_CHANGELOG} CHANGELOG.md
-	git add CHANGELOG.md pyproject.toml
+	@mv --force ${TMP_CHANGELOG} CHANGELOG.md
+	git add CHANGELOG.md
 	git commit -m "Bump to version v${NEW_VERSION}"
 	git tag --annotate "v${NEW_VERSION}" \
 		--message "Release v${NEW_VERSION}"
 
 ##  Less commonly used commands
 
-##  Generate/update the poetry.lock file
+##  Generate/update the uv.lock file
 .PHONY: lock
 lock:
-	poetry lock --no-update
+	uv lock
 
 ##  Update dependencies (within pyproject.toml specs)
 ##  Update the lock-file at the same time
 .PHONY: update
 update:
-	poetry update --lock
+	uv lock --upgrade
+
 
-## Install tools (poetry, pre-commit) via pipx
+## Install tools (uv, pre-commit) via pipx
 ## Assumes you have pipx installed
 # See https://jiby.tech/post/my-python-toolbox/#pipx-for-cli-installs-not-pip
 .PHONY: install-tools
 install-tools:
-	pipx install poetry
-	pipx install pre-commit
-
-## Ensure Poetry will generate virtualenv inside the git repo /.venv/
-## rather than in a centralized location. This makes it possible to
-## manipulate venv more simply
-.PHONY: poetry-venv-local
-poetry-venv-local:
-	poetry config virtualenvs.in-project true
+	uv self version
+	uv tool install uv-dynamic-versioning
+	uv tool install pre-commit
 
 ## Delete the virtualenv to clean dependencies
 ## Useful when switching to a branch with less dependencies
-## Requires the virtualenv to be local (see "poetry-venv-local")
-.PHONY: poetry-venv-nuke
-poetry-venv-nuke:
+.PHONY: venv-nuke
+venv-nuke:
 	find .venv -delete