build(deps): bump minimum Python to 3.12, update deps, drop typed_ast (…

…#473) * build(deps): bump Python to 3.12, drop typed_ast and ruff-replaced linters - Require Python ^3.12 (from ^3.7.2) - Drop typing-extensions: Concatenate/ParamSpec now in stdlib typing (3.10+) - Drop black and flake8: superseded by ruff (already in pre-commit config) - Bump pytest ^6 → ^8, Sphinx * → ^9 (requires Python 3.12) - Unpin pydata-sphinx-theme (sphinx-book-theme#711 long resolved) - Drop allow-prereleases on web3 (stable 6.x line is sufficient) - Loosen click ^8.0.3 → ^8 - Update build backend: poetry.masonry.api → poetry.core.masonry.api - CI: test and typecheck jobs now use Python 3.12 - Move [tool.ruff] → [tool.ruff.lint] (deprecation fix) - Silence unused _token_two variable (second-token approval was never wired up) Note: web3 7.x upgrade deferred (major async-first rewrite, breaking API changes). * ci: fix Poetry 2.x compat and bump docs to Python 3.12 - Remove deprecated 'installer.modern-installation' setting (removed in Poetry 2.0) - Bump docs.yml from Python 3.8 to 3.12 to match the new package floor (Python 3.8 + cytoolz 0.12.1 failed to build via Cython under PEP 517) * fix(makefile): replace flake8/black with ruff lint/format targets flake8 and black were removed as direct dependencies in the Python 3.12 dep bump; the Makefile still referenced them. Ruff already handles both roles. * fix(deps): add explicit floors for Python 3.12-incompatible Cython packages cytoolz 0.12.1, frozenlist 1.3.3, yarl 1.8.2, and multidict 6.0.4 all declare python-versions=>=3.6 but have no pre-built cp312 wheels, causing Cython compilation failures when installing under Python 3.12. Add explicit minimum constraints in pyproject.toml so poetry resolves to versions that ship cp312 wheels: - cytoolz >=0.12.3 (locked to 1.1.0) - frozenlist >=1.5.0 (locked to 1.8.0) - multidict >=6.0.5 (locked to 6.7.1) - yarl >=1.10.0 (locked to 1.24.5) propcache 0.5.2 added as a new transitive dep from yarl 1.24.5. * fix(deps): add aiohttp floor to unblock Python 3.12 CI aiohttp 3.8.4 (transitive via web3) has no cp312 wheels and fails to build from source on Python 3.12 — PyLongObject.ob_digit was removed in 3.12. Added aiohttp = ">=3.9.0" (first release with cp312 wheels) as a direct dependency constraint; poetry re-locked to 3.14.3 which ships cp312 wheels. This fixes all 6 failing CI jobs (build + 4 test matrix + typecheck). * fix(deps): pin setuptools<82 and bump doc theme versions for Python 3.12 CI Two independent CI failures after the Python 3.12 bump: - Test/typecheck jobs: eth-keyfile (pulled in via web3->eth-account) still imports pkg_resources, which setuptools dropped starting in 82.0.0 (last shipped in 81.0.0). eth-account>=0.12 fixes this upstream but requires hexbytes>=1.2.0, which conflicts with web3 6.x's hexbytes<0.4.0 pin — that needs the (deliberately deferred) web3 7.x migration. Pin setuptools<82 as a stopgap; also floor typing-extensions>=4.12.0, since 4.5.0 crashes under Python 3.12.13's stricter TypeVar base-class check (docs build failure). - Docs build: sphinx-book-theme was resolving to 0.0.11 (a 2020-era release, incompatible with Sphinx 9's theme API — missing 'get_edit_url'). Floor it to ^1.1, which also pulls a compatible pydata-sphinx-theme (0.20.0). Along the way, Sphinx 9 hard-fails on the old implicit-%s extlinks caption format ("issue #" -> "issue #%s"). Verified locally: full install, docs build (make html), pytest collection (250 tests), and mypy --pretty all pass in an isolated poetry venv. * fix(deps): add ruff as explicit dev dependency Makefile lint/format targets call `poetry run ruff` but ruff was absent from [tool.poetry.dev-dependencies]. A fresh `poetry install` would succeed without it, making `make lint` fail immediately. Lock file regenerated with Poetry 2.3.2 / Python 3.12.3.
uniswap-python · liquid-8 · Jul 28, 2026 · Jul 28, 2026 · Jul 28, 2026 · Jul 28, 2026
commit dee6a778ccac19c8231792aa81612068dfbadc54
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -12,14 +12,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.8
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.8'
+        python-version: '3.12'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip poetry
-        poetry config installer.modern-installation false
         poetry install
     - name: Docs
       run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.8'
+        python-version: '3.12'
     # Set up poetry cache, from https://github.com/python-poetry/poetry/blob/45a9b8f20384591d0a33ae876bcf23656f928ec0/.github/workflows/main.yml
     - name: Get full python version
       id: full-python-version
@@ -51,7 +51,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip poetry
         poetry config virtualenvs.in-project true
-        poetry config installer.modern-installation false
 
     - name: Set up cache
       uses: actions/cache@v4
@@ -94,7 +93,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.8'
+        python-version: '3.12'
 
     # Set up poetry cache, from https://github.com/python-poetry/poetry/blob/45a9b8f20384591d0a33ae876bcf23656f928ec0/.github/workflows/main.yml
     - name: Get full python version
@@ -107,7 +106,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip poetry
         poetry config virtualenvs.in-project true
-        poetry config installer.modern-installation false
 
     - name: Set up cache
       uses: actions/cache@v4

diff --git a/Makefile b/Makefile
@@ -7,10 +7,10 @@ typecheck:
 	poetry run mypy --pretty
 
 lint:
-	poetry run flake8
+	poetry run ruff check uniswap
 
 format:
-	black uniswap
+	poetry run ruff format uniswap
 
 format-abis:
 	npx prettier --write --parser=json uniswap/assets/*/*.abi

diff --git a/docs/conf.py b/docs/conf.py
@@ -44,7 +44,7 @@
 exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 extlinks = {
-    "issue": ("https://github.com/shanefontaine/uniswap-python/issues/%s", "issue #"),
+    "issue": ("https://github.com/shanefontaine/uniswap-python/issues/%s", "issue #%s"),
 }
 
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,32 +23,40 @@ classifiers = [
 unipy = "uniswap:main"
 
 [tool.poetry.dependencies]
-python = "^3.7.2"
-web3 = { version = "^6.5.0", allow-prereleases = true }
-click = "^8.0.3"
+python = "^3.12"
+web3 = ">=6.20.0,<7"
+cytoolz = ">=0.12.3"
+frozenlist = ">=1.5.0"
+multidict = ">=6.0.5"
+yarl = ">=1.10.0"
+click = "^8"
 python-dotenv = "*"
-typing-extensions = "*"
+aiohttp = ">=3.9.0"
+typing-extensions = ">=4.12.0"
+# eth-keyfile (via web3->eth-account) imports pkg_resources, which setuptools
+# dropped in 82.0.0 (last shipped in 81.0.0). Pin below that until web3 7.x
+# (which pulls in a pkg_resources-free eth-keyfile) is adopted.
+setuptools = "<82"
 
 [tool.poetry.dev-dependencies]
 mypy = "*"
-black = "*"
 pre-commit = "*"
-pytest = "^6.0"
+pytest = "^8"
 pytest-cov = "*"
 pytest-dotenv = "*"
-flake8 = "*"
-Sphinx = "*"
-sphinx-book-theme = "*"
+ruff = ">=0.9"
+Sphinx = "^9"
+sphinx-book-theme = "^1.1"
 sphinx-click = "*"
-pydata-sphinx-theme = "0.13.1"  # due to: https://github.com/executablebooks/sphinx-book-theme/issues/711
+pydata-sphinx-theme = "*"
 
 [tool.pytest.ini_options]
 log_cli = false  # to print logs during tests, set to true
 #log_level = "NOTSET"
 
-[tool.ruff]
+[tool.ruff.lint]
 ignore = ["E402", "E501"]
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=1.0"]
+build-backend = "poetry.core.masonry.api"
diff --git a/uniswap/decorators.py b/uniswap/decorators.py
@@ -2,13 +2,13 @@
 from typing import (
     TYPE_CHECKING,
     Callable,
+    Concatenate,
     List,
     Optional,
+    ParamSpec,
     TypeVar,
 )
 
-from typing_extensions import Concatenate, ParamSpec
-
 from .constants import ETH_ADDRESS
 from .types import AddressLike
 
@@ -21,7 +21,7 @@
 
 
 def check_approval(
-    method: Callable[Concatenate["Uniswap", P], T]
+    method: Callable[Concatenate["Uniswap", P], T],
 ) -> Callable[Concatenate["Uniswap", P], T]:
     """Decorator to check if user is approved for a token. It approves them if they
     need to be approved."""
@@ -30,11 +30,11 @@ def check_approval(
     def approved(self: "Uniswap", *args: P.args, **kwargs: P.kwargs) -> T:
         # Check to see if the first token is actually ETH
         token: Optional[AddressLike] = args[0] if args[0] != ETH_ADDRESS else None  # type: ignore
-        token_two = None
+        _token_two = None
 
         # Check second token, if needed
         if method.__name__ == "make_trade" or method.__name__ == "make_trade_output":
-            token_two = args[1] if args[1] != ETH_ADDRESS else None
+            _token_two = args[1] if args[1] != ETH_ADDRESS else None
 
         # Approve both tokens, if needed
         if token:
@@ -53,15 +53,13 @@ def supports(
     [Callable[Concatenate["Uniswap", P], T]], Callable[Concatenate["Uniswap", P], T]
 ]:
     def g(
-        f: Callable[Concatenate["Uniswap", P], T]
+        f: Callable[Concatenate["Uniswap", P], T],
     ) -> Callable[Concatenate["Uniswap", P], T]:
         if f.__doc__ is None:
             f.__doc__ = ""
         f.__doc__ += """\n\n
         Supports Uniswap
-        """ + ", ".join(
-            "v" + str(ver) for ver in versions
-        )
+        """ + ", ".join("v" + str(ver) for ver in versions)
 
         @functools.wraps(f)
         def check_version(self: "Uniswap", *args: P.args, **kwargs: P.kwargs) -> T: