Upgrade Poetry to 2.x

jacebrowning · Feb 28, 2025 · 57404e9 · 57404e9
1 parent 9eee94c
commit 57404e9
Show file tree

Hide file tree

Showing 8 changed files with 247 additions and 100 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     working_directory: ~/memegen
 
     docker:
-      - image: cimg/python:3.13.1
+      - image: cimg/python:3.13.2
 
     steps:
       - checkout

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-python 3.13.1
-poetry 1.8.5
+python 3.13.2
+poetry 2.0.1
diff --git a/.verchew.ini b/.verchew.ini
@@ -6,14 +6,14 @@ version = GNU Make
 [Python]
 
 cli = python
-version = 3.13.1
+version = 3.13
 message = $ asdf install
 
 [Poetry]
 
 cli = poetry
-version = 1
-message = $ curl -sSL https://install.python-poetry.org | python3 -
+version = 2
+message = $ asdf install
 
 [OptiPNG]
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -46,6 +46,7 @@
     "Ducreux",
     "Earther",
     "emojize",
+    "envrc",
     "exif",
     "extrahead",
     "Futurama",
@@ -71,6 +72,7 @@
     "imgur",
     "isort",
     "isupper",
+    "jpegoptim",
     "jsonify",
     "Kalam",
     "Kalm",
@@ -79,8 +81,10 @@
     "Khaby",
     "Kombucha",
     "LANCZOS",
+    "lastfailed",
     "Legobot",
     "maga",
+    "maxfail",
     "maxsplit",
     "Memegen",
     "Midwit",
@@ -93,17 +97,20 @@
     "NOOOOO",
     "Noto",
     "notosans",
+    "optipng",
     "pacman",
     "Panik",
     "Philosoraptor",
     "Photoshop",
     "pilmoji",
     "pluginmanager",
     "podman",
+    "procfile",
     "pygments",
     "pymdown",
     "pyproject",
     "PYTHONASYNCIODEBUG",
+    "PYTHONBREAKPOINT",
     "PYTHONUNBUFFERED",
     "Qaeda",
     "Redditors",

diff --git a/Containerfile b/Containerfile
@@ -2,7 +2,7 @@ ARG ARG_PORT=5000
 ARG ARG_MAX_REQUESTS=0
 ARG ARG_MAX_REQUESTS_JITTER=0
 
-FROM docker.io/python:3.13.1-bullseye as build
+FROM docker.io/python:3.13.2-bullseye as build
 
 # Install system dependencies
 RUN apt update && apt install --yes webp cmake

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ export PYTHONBREAKPOINT=ipdb.set_trace
 all: doctor format check test ## Run all validation targets
 
 .PHONY: dev
-dev: install ## Rerun all validation targests in a loop
+dev: install ## Rerun all validation targets in a loop
 	@ sleep 2 && touch */__init__.py &
 	@ poetry run watchmedo shell-command --recursive --pattern="*.py" --command="clear && make test check format SKIP_SLOW=true && echo && echo ✅ && echo" --wait --drop
 
@@ -14,7 +14,7 @@ dev: install ## Rerun all validation targests in a loop
 .PHONY: bootstrap
 bootstrap: ## Attempt to install system dependencies
 	asdf plugin add python || asdf plugin update python
-	asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git || asdf plugin update poetry
+	asdf plugin add poetry || asdf plugin update poetry
 	asdf install
 
 .PHONY: doctor
@@ -36,7 +36,7 @@ $(BACKEND_DEPENDENCIES): poetry.lock
 
 ifndef CI
 poetry.lock: pyproject.toml
-	poetry lock --no-update
+	poetry lock
 	@ touch $@
 endif
 
@@ -107,7 +107,7 @@ test-slow: install
 	poetry run pytest -m slow --durations=0 --durations-min=0.05
 
 .PHONY: run
-run: install ## Run the applicaiton
+run: install ## Run the application
 ifdef DEBUG
 	make clean-tmp
 endif