Merge branch 'main' into reorganize

jeertmans · Jan 29, 2025 · 4bf4d38 · 4bf4d38
2 parents f02ef63 + ccbe9d5
commit 4bf4d38
Show file tree

Hide file tree

Showing 56 changed files with 6,428 additions and 1,568 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -27,7 +27,9 @@ body:
     label: Terms
     description: 'By submitting this issue, I have:'
     options:
-    - label: Checked the [existing issues](https://github.com/jeertmans/manim-slides/issues?q=is%3Aissue+label%3Adocumentation+) and [discussions](https://github.com/jeertmans/manim-slides/discussions) to see if my issue had not already been reported;
+    - label: Checked the [existing issues](https://github.com/jeertmans/manim-slides/issues?q=is%3Aissue+label%3Abug+) and [discussions](https://github.com/jeertmans/manim-slides/discussions) to see if my issue had not already been reported;
+      required: true
+    - label: Checked the [frequently asked questions](https://manim-slides.eertmans.be/latest/faq.html);
       required: true
     - label: Read the [installation instructions](https://manim-slides.eertmans.be/latest/installation.html);
       required: true
@@ -73,22 +75,22 @@ body:
     description: |
       Please copy and paste the output of `python --version`.
       Make sure to activate your virtual environment first (if any).
-      This will be automatically formatted into code, so no need for backticks.
     placeholder: Python 3.11.8
   validations:
-    required: false
+    required: true
 
 - type: textarea
   id: venv
   attributes:
     label: Python environment
     description: |
-      Please copy and paste the output of `pip freeze`.
+      Please copy and paste the output of `manim-slides checkhealth`.
       Make sure to activate your virtual environment first (if any).
       This will be automatically formatted into code, so no need for backticks.
+      If Manim Slides installation failed, enter 'N/A' instead.
     render: shell
   validations:
-    required: false
+    required: true
 
 - type: dropdown
   id: platform
@@ -120,7 +122,7 @@ body:
       This will be automatically formatted into code, so no need for backticks.
     placeholder: |
       from manim import *
-      from manim_slides.slide import Slide
+      from manim_slides import Slide
 
 
       class MWE(Slide):

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -18,7 +18,7 @@ body:
     label: Terms
     description: 'By submitting this issue, I have:'
     options:
-    - label: Checked the [existing issues](https://github.com/jeertmans/manim-slides/issues?q=is%3Aissue+label%3Adocumentation+) and [discussions](https://github.com/jeertmans/manim-slides/discussions) to see if my issue had not already been reported;
+    - label: Checked the [existing issues](https://github.com/jeertmans/manim-slides/issues?q=is%3Aissue+label%3Aenhancement+) and [discussions](https://github.com/jeertmans/manim-slides/discussions) to see if my issue had not already been reported;
       required: true
 
 - type: textarea

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -18,18 +18,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Setup Rye
-      env:
-        RYE_INSTALL_OPTION: --yes
-      run: |
-        curl -sSf https://rye.astral.sh/get | bash
-        echo "$HOME/.rye/shims" >> $GITHUB_PATH
-
-    - name: Configure Rye
-      run: rye config --set-bool behavior.use-uv=true
+    - name: Setup uv
+      uses: astral-sh/setup-uv@v4
+      with:
+        enable-cache: true
 
     - name: Build package
-      run: rye build
+      run: uv build
 
     - name: Publish to PyPI
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
@@ -41,7 +36,6 @@ jobs:
     env:
       REGISTRY: ghcr.io
       IMAGE_NAME: ${{ github.repository }}
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -72,7 +66,7 @@ jobs:
       with:
         platforms: linux/arm64,linux/amd64
         file: docker/Dockerfile
-        push: true
+        push: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }}
         tags: |
           ghcr.io/jeertmans/manim-slides:latest
           ghcr.io/jeertmans/manim-slides:${{ steps.create_release.outputs.tag_name }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
         pyversion: ['3.9', '3.10', '3.11', '3.12']
         extras: [pyside6-full, manimgl]
         exclude:
@@ -41,7 +41,9 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get update
-        sudo apt-get install build-essential python3-dev libcairo2-dev libpango1.0-dev ffmpeg freeglut3-dev xvfb
+        sudo apt install software-properties-common
+        sudo add-apt-repository ppa:deadsnakes/ppa
+        sudo apt-get install build-essential python${{ matrix.pyversion }}-dev libcairo2-dev libpango1.0-dev ffmpeg freeglut3-dev xvfb
         nohup Xvfb $DISPLAY &
 
     - name: Install Windows dependencies
@@ -63,36 +65,16 @@ jobs:
     env:
       QT_QPA_PLATFORM: offscreen
       MANIM_SLIDES_VERBOSITY: error
-      PYTHONFAULTHANDLER: 1
       DISPLAY: :99
       GITHUB_WORKFLOWS: 1
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Setup Rye
-      if: matrix.os != 'windows-latest'
-      env:
-        RYE_TOOLCHAIN_VERSION: ${{ matrix.pyversion}}
-        RYE_INSTALL_OPTION: --yes
-      run: |
-        curl -sSf https://rye.astral.sh/get | bash
-        echo "$HOME/.rye/shims" >> $GITHUB_PATH
-
-    # Stolen from https://github.com/bluss/pyproject-local-kernel/blob/2b641290694adc998fb6bceea58d3737523a68b7/.github/workflows/ci.yaml
-    - name: Install Rye (Windows)
-      if: matrix.os == 'windows-latest'
-      shell: bash
-      run: |
-        C:/msys64/usr/bin/wget.exe -q 'https://github.com/astral-sh/rye/releases/latest/download/rye-x86_64-windows.exe' -O rye-x86_64-windows.exe
-        ./rye-x86_64-windows.exe self install --toolchain-version ${{ matrix.pyversion }} --modify-path -y
-        echo "$HOME\\.rye\\shims" >> $GITHUB_PATH
-
-    - name: Configure Rye
-      shell: bash
-      run: |
-        rye config --set-bool behavior.use-uv=true
-        rye pin ${{ matrix.pyversion }}
+    - name: Setup uv
+      uses: astral-sh/setup-uv@v4
+      with:
+        enable-cache: true
 
     - name: Install manim dependencies on MacOS
       if: matrix.os == 'macos-latest'
@@ -113,16 +95,11 @@ jobs:
       if: matrix.os == 'windows-latest'
       uses: ssciwr/setup-mesa-dist-win@v2
 
-    - name: Install Manim Slides
-      shell: bash
-      run: rye sync
-
     - name: Run pytest
-      shell: bash
-      run: rye run pytest
+      run: uv run --python ${{ matrix.pyversion }} --frozen --extra tests pytest
 
     - name: Upload to codecov.io
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       with:

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@ __pycache__/
 /build
 /dist
 *.egg-info/
-.pdm-python
 
 # Manim files
 images/
@@ -45,7 +44,7 @@ paper/paper.pdf
 paper/media/
 
 # Others
-.coverage
+.coverage*
 coverage.xml
 
 rendering_times.csv
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ ci:
   autoupdate_commit_msg: 'chore(deps): pre-commit autoupdate'
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: check-yaml
   - id: check-toml
@@ -20,23 +20,19 @@ repos:
   - id: pretty-format-toml
     exclude: poetry.lock
     args: [--autofix, --trailing-commas]
-- repo: https://github.com/keewis/blackdoc
-  rev: v0.3.9
-  hooks:
-  - id: blackdoc
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.6.1
+  rev: v0.9.3
   hooks:
   - id: ruff
     args: [--fix]
   - id: ruff-format
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.11.1
+  rev: v1.14.1
   hooks:
   - id: mypy
     additional_dependencies: [types-requests, types-setuptools]
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.3.0
+  rev: v2.4.0
   hooks:
   - id: codespell
     additional_dependencies:

diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.11.8
+3.11
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -2,13 +2,10 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: '3.10'
+    python: '3.11'
   apt_packages:
   - libpango1.0-dev
   - ffmpeg
-  jobs:
-    post_install:
-    - ipython kernel install --name "manim-slides" --user
 sphinx:
   builder: html
   configuration: docs/source/conf.py