Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: report python version
run: python --version
- name: Install linters and formatters
run: python -m pip install flake8 black mypy
- name: Install poetry
run: python -m pip install poetry
- name: Initialize project
run: |
python -m poetry install --all-extras
python -m poetry install
python -m poetry run python scripts/fetch_core.py
- name: Check formatting with black
run: python -m poetry run black --check --diff $(git ls-files "*.py")
Expand All @@ -36,7 +38,7 @@ jobs:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
poetry-version: ["1.8.4"]
os: [ubuntu-latest, windows-latest]
os: [ubuntu-22.04, windows-latest]
exclude:
- os: windows-latest
python-version: "3.8"
Expand All @@ -60,8 +62,8 @@ jobs:
- name: Install apt packages (Linux with python 3.12 only)
if: runner.os == 'Linux' && matrix.python-version == '3.12'
run: |
sudo apt update
sudo apt install -y --no-install-recommends texlive texlive-science texlive-xetex ghostscript pdf2svg texlive-fonts-extra sagemath
sudo apt-get update
sudo apt-get install -y --no-install-recommends texlive texlive-science texlive-xetex ghostscript pdf2svg texlive-fonts-extra sagemath


- name: Install poetry ${{ matrix.poetry-version }}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ Instructions: Add a subsection under `[Unreleased]` for additions, fixes, change

## [Unreleased]

### Changed

- Improved help when deploy fails.

## [2.11.4] - 2025-01-11

Includes updates to core through commit: [42236bf](https://github.com/PreTeXtBook/pretext/commit/42236bf454d9e3f98bc25f0bb5186029710f17f7)
Expand Down
63 changes: 44 additions & 19 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions pretext/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -729,16 +729,16 @@ def publish_to_ghpages(directory: Path, update_source: bool) -> None:
)
log.info("")
log.info(
"If you haven't already, configure SSH with GitHub by following instructions at:"
"Make sure you have set up authentication for GitHub. For more information, visit:"
)
log.info(" https://docs.github.com/en/authentication")
log.info(
" https://docs.github.com/en/authentication/connecting-to-github-with-ssh"
"Make sure you can push changes, either from the command line or in VS Code. Then try to deploy again."
)
log.info("Then try to deploy again.")
log.info("")
log.info(f"If `{origin.url}` doesn't match your GitHub repository,")
log.info(f"(If `{origin.url}` doesn't match your GitHub repository,")
log.info(
"use `git remote remove origin` on the command line then try to deploy again."
"use `git remote remove origin` on the command line then try to deploy again.)"
)
log.info("")
log.error("Deploy was unsuccessful.")
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ plastex = "^3"
jinja2 = "^3"
pelican = { extras = ["markdown"], version = "^4.10", optional = true }
prefig = { extras = ["pycairo"], version = "^0.2.10", optional = true }
pycairo = [{version = ">=1.20, <=1.26", python = "3.8", optional = true}, {version = "^1.20", python = ">=3.9", optional = true}]

# Development dependencies
# ------------------------
Expand All @@ -68,7 +69,7 @@ pep8-naming = "^0.14.1"

[tool.poetry.extras]
homepage = ["pelican"]
prefigure = ["prefig"]
prefigure = ["prefig", "pycairo"]

[tool.poetry.scripts]
pretext = 'pretext.cli:main'
Expand Down
Loading