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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
- uses: actions/checkout@v4

- name: Log in to the Container registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata for Docker
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
Expand All @@ -34,7 +34,7 @@ jobs:
latest=auto

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
context: .
push: true
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ jobs:
- uses: actions/checkout@v4

- name: Install uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
with:
# this should be the same as in pyproject.toml
version: "0.6.9"
version-file: "pyproject.toml"

- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

Expand All @@ -32,13 +31,12 @@ jobs:
- uses: actions/checkout@v4

- name: Install uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
with:
# this should be the same as in pyproject.toml
version: "0.6.9"
version-file: "pyproject.toml"

- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.11.2
rev: v0.15.9
hooks:
- id: ruff
- id: ruff-check
args: [ --fix ]
- id: ruff-format
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM python:3.13.2-alpine3.21
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
FROM python:3.14.3-alpine3.23
COPY --from=ghcr.io/astral-sh/uv:0.11 /uv /uvx /bin/

WORKDIR /app

Expand Down
39 changes: 20 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ name = "blockbot"
version = "0.1.0"
description = "Discord bot maintained by the Redbrick webgroup"
readme = "README.md"
requires-python = ">=3.13"
requires-python = "~=3.14.0"
license = { text = "MIT" }
authors = [{ name = "JedHazaymeh", email = "[email protected]" }, { name = "nova", email = "[email protected]"}]
maintainers = [{ name = "nova", email = "[email protected]"}, { name = "wizzdom", email = "[email protected]"}]
dependencies = [
"aiofiles>=25.1.0",
"aiohttp>=3.11.14",
"asyncpg>=0.30.0",
"dnspython>=2.7.0",
"fortune-python>=1.1.1",
"hikari>=2.2.0",
"hikari-arc>=2.0.0",
"aiohttp>=3.13.5",
"asyncpg>=0.31.0",
"dnspython>=2.8.0",
"fortune-python>=1.1.2",
"hikari>=2.5.0",
"hikari-arc>=2.2.0",
"hikari-miru>=4.2.0",
"pyfiglet>=1.0.2",
"python-dotenv>=1.0.1",
"sqlalchemy>=2.0.39",
"pyfiglet>=1.0.4",
"python-dotenv>=1.2.2",
"sqlalchemy>=2.0.49",
"rcon>=2.4.9",
"miniopy-async>=1.23.4",
"miniopy-async>=1.23.5",
]

[project.urls]
Expand All @@ -29,18 +29,18 @@ Repository = "https://github.com/redbrick/blockbot"

[dependency-groups]
dev = [
"pre-commit>=4.2.0",
"pyright>=1.1.397",
"ruff>=0.11.2",
"uv>=0.6.9", # this should be the same as in the github workflows
"pre-commit>=4.5.1",
"pyright>=1.1.408",
"ruff>=0.15.9",
"uv>=0.11.3", # this should be the same as in the github workflows
]
nox = [
"nox>=2025.2.9",
"nox>=2026.2.9",
]

[tool.ruff]
include = ["./src/*.py", "noxfile.py"]
target-version = "py313"
target-version = "py314"

[tool.ruff.format]
docstring-code-format = true
Expand Down Expand Up @@ -76,14 +76,15 @@ ignore = [
"PLR2004", # magic-value-comparison
"PLR0913", # too-many-arguments
"COM812", # missing-trailing-comma
"TC002", # typing-only-third-party-import
]

[tool.ruff.lint.pydocstyle]
convention = "numpy"

[tool.uv]
required-version = "~=0.6"
required-version = "~=0.11"

[tool.pyright]
pythonVersion = "3.13"
pythonVersion = "3.14"
typeCheckingMode = "strict"
Loading
Loading