Require python 3.10 (#1008)

* require python 3.10+ for the cli; add all optional dependency

* tweak tests

Author: oscarlevin

.github/workflows/tests.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   format-and-types:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -38,50 +39,43 @@ jobs:
   deep-test:
     needs: format-and-types
     runs-on: ubuntu-22.04
-    #container: oscarlevin/pretext:full
+    container: oscarlevin/pretext-full
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.12'
-
-      - name: set up node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
 
       - name: Report Python version
         run: python --version
 
-      - name: Install apt packages (Linux with python 3.12 only)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends texlive texlive-science texlive-xetex ghostscript pdf2svg texlive-fonts-extra sagemath python3-pip
-
-      - name: Install poetry 1.8.4
+      - name: Install poetry
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install poetry==1.8.4
+          pip install --upgrade pip
+          pip install poetry
 
       - name: View poetry --help
         run: poetry --help
 
+      - name: Install build dependencies if on Linux
+        run: |
+          apt-get update
+          apt-get -y install gcc pkg-config python3-dev build-essential python3-louis librsvg2-bin libcairo2-dev
+
       - name: Install dependencies
         shell: bash
         run: |
-          python -m poetry install --all-extras
-          python -m poetry run python scripts/fetch_core.py
+          poetry install --all-extras
+          poetry run python scripts/fetch_core.py
 
       - name: Ensure dependencies are present
         run: |
           echo "manually installing pelican; poetry does not seem to do this correctly."
-          python -m poetry run pip install pelican
-          python -m poetry run pelican --version
+          poetry run pip install pelican
+          poetry run pelican --version
+          poetry run playwright install chromium
 
       - name: Test with pytest
         run: |
-          python -m poetry run pytest -v --cov
+          poetry run pytest -v --cov
 
 
   broad-tests:
@@ -90,7 +84,6 @@ jobs:
       fail-fast: true
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        poetry-version: ["1.8.4"]
         os: [ubuntu-latest, windows-latest]
         exclude:
           - os: windows-latest
@@ -119,11 +112,11 @@ jobs:
         with:
           node-version: '22'
 
-      - name: Install poetry ${{ matrix.poetry-version }}
+      - name: Install poetry
         run: |
           python -m ensurepip
           python -m pip install --upgrade pip
-          python -m pip install poetry==${{ matrix.poetry-version }}
+          python -m pip install poetry
 
       - name: View poetry --help
         run: poetry --help
@@ -140,6 +133,13 @@ jobs:
           python -m poetry install --all-extras
           python -m poetry run python scripts/fetch_core.py
 
+      - name: Initialize playwright
+        run: |
+          echo "Installing playwright dependencies"
+          python -m poetry run playwright install-deps
+          echo "Installing playwright browsers"
+          python -m poetry run playwright install
+
       - name: Ensure dependencies are present
         run: |
           echo "manually installing pelican; poetry does not seem to do this correctly."

CHANGELOG.md

@@ -9,6 +9,10 @@ Instructions: Add a subsection under `[Unreleased]` for additions, fixes, change
 
 ## [Unreleased]
 
+### Changed
+
+- Python version 3.10 or higher is now required (removed support for python 3.8 and 3.9).
+
 ### Fixed
 
 - Bug which caused error in `pretext view` when the `running_servers` file contained a blank line.

poetry.lock

@@ -566,7 +566,7 @@ def playwright_install() -> None:
     try:
         log.info("Checking for update for required playwright chromium browser.")
         # subprocess.run("playwright install-deps", shell=True)
-        subprocess.run("playwright install chromium", shell=True)
+        subprocess.run(["playwright", "install", "chromium"])
         log.debug("Installed dependencies to capture interactive previews")
     except Exception as e:
         log.critical(

pretext/utils.py

@@ -26,7 +26,7 @@ include = ["pretext/core/pretext.py", "pretext/resources/*.zip", "pretext/resour
 # Dependencies
 # ------------
 [tool.poetry.dependencies]
-python = "^3.8.5"
+python = "^3.10"
 lxml = "^5.3"
 requests = "^2"
 GitPython = "^3"
@@ -45,13 +45,13 @@ plastex = "^3"
 jinja2 = "^3"
 coloraide = "^4"
 pelican = { extras = ["markdown"], version = "^4.10", optional = true }
-prefig = { extras = ["pycairo"], version = "^0.2.10", optional = true }
+prefig = { extras = ["text"], version = "^0.3.2", optional = true }
 
 
 # Development dependencies
 # ------------------------
 [tool.poetry.group.dev.dependencies]
-black = [{version = "^23", python = "3.8"}, {version = "^24.10", python = ">=3.9"}]
+black = "^24.10"
 codechat-server = "^0"
 flake8 = "^6"
 lxml-stubs = "^0"
@@ -71,6 +71,7 @@ pep8-naming = "^0.14.1"
 [tool.poetry.extras]
 homepage = ["pelican"]
 prefigure = ["prefig"]
+all = ["pelican","prefig"]
 
 [tool.poetry.scripts]
 pretext = 'pretext.cli:main'

pyproject.toml

@@ -34,13 +34,13 @@ def resource_hashes() -> None:
                         r"PreTeXt \d+\.\d+\.\d+", f"PreTeXt {VERSION}", line
                     )
                     f.write(new_line)
-                elif '"image": "oscarlevin/pretext' in line:
-                    new_line = re.sub(
-                        r'("image": "oscarlevin/pretext(-full)?):latest"',
-                        rf'\1:{VERSION}"',
-                        line,
-                    )
-                    f.write(new_line)
+                # elif '"image": "oscarlevin/pretext' in line:
+                #    new_line = re.sub(
+                #        r'("image": "oscarlevin/pretext(-full)?):latest"',
+                #        rf'\1:{VERSION}"',
+                #        line,
+                #    )
+                #    f.write(new_line)
                 else:
                     f.write(line)
         # Now hash the updated file to add to a hash-table for this version

scripts/bundle_resources.py

@@ -13,9 +13,9 @@
 //
 ///////////////////////////////////////////////////////////////
 {
-  "image": "oscarlevin/pretext-full:latest",
+  "image": "oscarlevin/pretext-full",
   // If you don't need sagemath, you can use a smaller base image.  Comment out the line above and uncomment the line below to use a smaller image.
-  // "image": "oscarlevin/pretext:latest",
+  // "image": "oscarlevin/pretext",
   "features": {},
 
   // The pretext-full image above includes pretext, prefigure, and enough parts of latex and sagemath for most cases.  If there are errors with sage, you can install the full sagemath package through Conda by running ./.devcontainer/installSage.sh, or uncommenting that line and rebuilding the container.

templates/devcontainer.json

@@ -21,7 +21,7 @@ on:
 jobs:
     build:
         runs-on: ubuntu-latest
-        container: oscarlevin/pretext:full
+        container: oscarlevin/pretext-full
 
         steps:
             - name: Checkout source

templates/pretext-cli.yml

@@ -28,7 +28,7 @@ permissions:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    container: oscarlevin/pretext:full
+    container: oscarlevin/pretext-full
 
     steps:
       - name: Checkout source