diff --git a/.circleci/config.yml b/.circleci/config.yml index a413abbaf05..1a4560b5a33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,8 @@ jobs: - run: git submodule update --init - run: sudo apt update - run: sudo apt install -y rclone - - run: pip install --user tox + - run: pip install --user tox tox-uv + - run: tox --version - run: tox -e py312 - codecov/upload @@ -50,7 +51,8 @@ jobs: - run: git submodule update --init - run: sudo apt update - run: sudo apt install -y rclone - - run: pip install --user tox + - run: pip install --user tox tox-uv + - run: tox --version - run: tox -e ext-theme tests-embedapi: @@ -60,7 +62,7 @@ jobs: - checkout - run: git submodule sync - run: git submodule update --init - - run: pip install --user 'tox<4' + - run: pip install --user tox tox-uv - run: tox --version - run: tox -c tox.embedapi.ini @@ -81,7 +83,8 @@ jobs: - restore_cache: keys: - pre-commit-cache-{{ checksum "pre-commit-cache-key.txt" }} - - run: pip install --user tox + - run: pip install --user tox tox-uv + - run: tox --version - run: tox -e pre-commit - run: tox -e migrations - node/install: diff --git a/requirements/docker.in b/requirements/docker.in index 4d145275d69..de227ab6d62 100644 --- a/requirements/docker.in +++ b/requirements/docker.in @@ -4,6 +4,7 @@ # run tests tox +tox-uv # Used together with structlog to have nicer logs locally rich diff --git a/requirements/docker.txt b/requirements/docker.txt index afed55f6d5a..7c2279574ce 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -297,6 +297,7 @@ packaging==25.0 # gunicorn # pyproject-api # tox + # tox-uv parso==0.8.4 # via jedi pdbpp==0.11.6 @@ -447,6 +448,9 @@ toml==0.10.2 # bumpver tox==4.25.0 # via -r requirements/docker.in + # tox-uv +tox-uv==1.16.1 + # via -r requirements/docker.in traitlets==5.14.3 # via # ipython @@ -495,6 +499,8 @@ urllib3==2.4.0 # requests user-agents==2.2.0 # via -r requirements/pip.txt +uv==0.5.8 + # via tox-uv vine==5.1.0 # via # -r requirements/pip.txt diff --git a/tox.embedapi.ini b/tox.embedapi.ini index 95bd44eeda2..68f9be40e14 100644 --- a/tox.embedapi.ini +++ b/tox.embedapi.ini @@ -15,8 +15,8 @@ install_command = # Sphinx from `requirements/pip.txt` but from the `deps=` field. sh -c ' \ cat {toxinidir}/requirements/testing.txt | grep -v "Sphinx" > {toxinidir}/requirements/embedapi.txt; \ - pip install -r {toxinidir}/requirements/embedapi.txt; \ - pip install $*;' -- {opts} {packages} + uv pip sync {toxinidir}/requirements/embedapi.txt; \ + uv pip install $*;' -- {packages} deps = sphinx-45: Sphinx~=4.5.0 sphinx-53: Sphinx~=5.3.0