Switch to uv

Author: inducer

.ci/run-tests-for-ci.sh

@@ -9,8 +9,8 @@ echo "OSTYPE: $OSTYPE"
 if [[ "$OSTYPE" != msys ]]; then
     echo "i18n"
     # Make sure i18n literals marked correctly
-    poetry run python manage.py makemessages --all
-    poetry run python manage.py compilemessages
+    uv run python manage.py makemessages --all
+    uv run python manage.py compilemessages
 fi
 
 staticfiles=(
@@ -29,7 +29,7 @@ for i in "${staticfiles[@]}"; do
     touch "frontend-dist/$i"
 done
 
-poetry run python manage.py collectstatic
+uv run python manage.py collectstatic
 
 rm local_settings.py
 
@@ -50,7 +50,7 @@ fi
 
 if [[ "$RL_CI_TEST" = "expensive" ]]; then
     echo "Expensive tests"
-    poetry run python -m pytest "${PYTEST_COMMON_FLAGS[@]}" --slow
+    uv run python -m pytest "${PYTEST_COMMON_FLAGS[@]}" --slow
 elif [[ "$RL_CI_TEST" = "postgres" ]]; then
     export PGPASSWORD=relatepgpass
 
@@ -69,10 +69,10 @@ elif [[ "$RL_CI_TEST" = "postgres" ]]; then
             },
         }" >> local_settings_example.py
 
-    poetry run pip install psycopg2
+    uv run pip install psycopg2
     echo "Database tests"
-    poetry run python -m pytest "${PYTEST_COMMON_FLAGS[@]}"
+    uv run python -m pytest "${PYTEST_COMMON_FLAGS[@]}"
 else
     echo "Base tests"
-    poetry run python -m pytest "${PYTEST_COMMON_FLAGS[@]}"
+    uv run python -m pytest "${PYTEST_COMMON_FLAGS[@]}"
 fi

.ci/test-command-line-tool.sh

@@ -7,11 +7,6 @@ on:
   schedule:
     - cron: "17 3 * * 0"
 
-defaults:
-  run:
-    # required by https://github.com/snok/install-poetry#windows
-    shell: bash
-
 concurrency:
     group: ${{ github.head_ref || github.ref_name }}
     cancel-in-progress: true
@@ -25,38 +20,27 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-      - name: Install Poetry
-        uses: snok/[email protected]
-        with:
-          version: "1.8.2"
-          virtualenvs-create: true
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
-      #- name: Cache python dependencies
-      #  uses: actions/cache@v2
-      #  id: cache
-      #  with:
-      #    path: ~/.cache/pypoetry
-      #    key: poetry-${{ hashFiles('**/poetry.lock') }}-${{ matrix.python-version }}
-      #    restore-keys: |
-      #      poetry-${{ hashFiles('**/poetry.lock') }}-${{ matrix.python-version }}
       - name: Install Dependencies
-        run: poetry install
-      #  if: steps.cache.outputs.cache-hit != 'true'
+        run: uv sync --frozen
+
       - name: "Ruff"
         run: |
-          poetry run ruff check
+          uv run ruff check
       - uses: crate-ci/typos@master
       - name: "Set up local settings"
         run: cp local_settings_example.py local_settings.py
       - name: "Mypy"
-        run: poetry run ./.ci/run-mypy.sh
+        run: uv run ./.ci/run-mypy.sh
       - name: "Safety"
-        run: poetry run ./.ci/run-safety.sh
+        run: uv run ./.ci/run-safety.sh
         env:
           SAFETY_API_KEY: ${{ secrets.SAFETY_API_KEY }}
       - name: "Sphinx"
         run: |
-            (cd doc; poetry run make html SPHINXOPTS="-W --keep-going -n")
+            (cd doc; uv run make html SPHINXOPTS="-W --keep-going -n")
 
   frontend:
     name: Lint JS/build frontend (Node ${{ matrix.node-version }})
@@ -103,23 +87,12 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        uses: snok/[email protected]
-        with:
-          version: "1.8.2"
-          virtualenvs-create: true
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
-      #- name: Cache python dependencies
-      #  uses: actions/cache@v2
-      #  id: cache
-      #  with:
-      #    path: ~/.cache/pypoetry
-      #    key: poetry-${{ hashFiles('**/poetry.lock') }}-${{ matrix.python-version }}
-      #    restore-keys: |
-      #      poetry-${{ hashFiles('**/poetry.lock') }}-${{ matrix.python-version }}
       - name: Install Dependencies
-        run: poetry install
-      #  if: steps.cache.outputs.cache-hit != 'true'
+        run: uv sync --frozen --extra postgres
+
       - name: Install OS dependencies
         env:
           DEBIAN_FRONTEND: noninteractive
@@ -136,9 +109,9 @@ jobs:
           git clone https://github.com/inducer/relate-sample
           cd relate-sample
 
-          poetry run relate validate .
-          poetry run relate test-code questions/autograded-python-example.yml
-          poetry run relate expand-yaml flows/quiz-test.yml > /dev/null
+          uv run relate validate .
+          uv run relate test-code questions/autograded-python-example.yml
+          uv run relate expand-yaml flows/quiz-test.yml > /dev/null
 
   pytest-windows:
     name: Python - Windows
@@ -148,17 +121,11 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-      - name: Install Poetry
-        uses: snok/[email protected]
-        with:
-          version: "1.8.2"
-          virtualenvs-create: true
-      - name: Configure Poetry
-        run: |
-          poetry config virtualenvs.in-project true
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
       - name: Install Dependencies
         run: |
-          poetry install
+          uv sync --frozen
       - name: Run test suite
         run: |
           bash ./.ci/run-tests-for-ci.sh

.github/workflows/ci.yml

@@ -9,8 +9,6 @@ local_settings.py
 doc/_build
 node_modules
 
-poetry.toml
-
 setuptools-[0-9]*
 virtualenv-[0-9]*
 

.gitignore

@@ -1,19 +1,3 @@
-variables:
-    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-    POETRY_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pypoetry"
-    POETRY_VIRTUALENVS_IN_PROJECT: "true"
-
-cache:
-  key:
-    files:
-      - .gitlab-ci.yml
-      - poetry.lock
-    prefix: relate
-  paths:
-    - ".cache/pypoetry"
-    - ".cache/pip"
-    - ".venv"
-
 stages:
   - setup
   - lint
@@ -25,9 +9,9 @@ stages:
   tags:
     - docker-runner
   before_script:
-    - curl -sSL https://install.python-poetry.org | python3 -
+    - curl -LsSf https://astral.sh/uv/install.sh | sh
     - export PATH="$HOME/.local/bin:$PATH"
-    - poetry install
+    - uv sync --frozen
 
 .quality-template: &quality
   <<: *install-deps
@@ -47,22 +31,22 @@ stages:
 setup:
   <<: *install-deps
   stage: setup
-  script: poetry config --list
+  script: "true"
 
 ruff:
   <<: *quality
   script: |
-    poetry run ruff check
+    uv run ruff check
 
 mypy:
   <<: *quality
   variables:
     RELATE_LOCAL_TEST_SETTINGS: './local_settings_example.py'
-  script: poetry run ./.ci/run-mypy.sh
+  script: uv run ./.ci/run-mypy.sh
 
 safety:
   <<: *quality
-  script: poetry run ./.ci/run-safety.sh
+  script: uv run ./.ci/run-safety.sh
 
 Python 3:
   <<: *test
@@ -79,9 +63,9 @@ Python 3 CLI Tool:
   script:
     - git clone https://github.com/inducer/relate-sample
     - cd relate-sample
-    - poetry run relate validate .
-    - poetry run relate test-code questions/autograded-python-example.yml
-    - poetry run relate expand-yaml flows/quiz-test.yml > /dev/null
+    - uv run relate validate .
+    - uv run relate test-code questions/autograded-python-example.yml
+    - uv run relate expand-yaml flows/quiz-test.yml > /dev/null
   needs: [setup]
 
 Documentation:
@@ -90,5 +74,5 @@ Documentation:
   variables:
     RELATE_LOCAL_TEST_SETTINGS: './local_settings_example.py'
   script:
-    - poetry run bash ./doc/build-docs.sh
+    - uv run bash ./doc/build-docs.sh
   needs: [setup]

.gitlab-ci.yml

@@ -1,4 +1,4 @@
 #! /bin/bash
 
 find node_modules/mathjax/es5 -name '*.js' -exec sed -i /sourceMappingURL=/d '{}' \;
-poetry run python manage.py collectstatic
+uv run python manage.py collectstatic

collectstatic.sh

@@ -2,10 +2,8 @@
 
 set -e
 
-# This whole script is being run inside of poetry, so no need to wrap move of
-# it in poetry calls.
-
-python -m pip install docutils sphinx
+# This whole script is being run inside of uv, so no need to wrap move of
+# it in uv calls.
 
 cp local_settings_example.py doc