From fc3be1545c52c0f306f27f8dfc56b0a321b520f4 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 17 Aug 2025 05:02:23 +0000
Subject: [PATCH] Update from copier (2025-08-17T05:02:23)

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .copier-answers.yaml         |  3 ++-
 .github/workflows/build.yaml |  2 +-
 .github/workflows/docs.yaml  |  9 +++++++--
 .gitignore                   |  5 +++++
 Makefile                     | 26 +++++++++++++++++++-------
 README.md                    |  3 +++
 6 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/.copier-answers.yaml b/.copier-answers.yaml
index 26005ac..dafbbb0 100644
--- a/.copier-answers.yaml
+++ b/.copier-answers.yaml
@@ -1,8 +1,9 @@
 # Changes here will be overwritten by Copier
-_commit: c53b04c
+_commit: 3a223c6
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: true
 add_extension: python
+add_wiki: false
 email: s.mangham@soton.ac.uk
 github: Southampton-RSG
 project_description: Tool for managing staff teaching time.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3d6fbdf..70b0e5b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
         python-version: ["3.12"]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - uses: actions-ext/python/setup@main
       with:
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index b624c77..41a5be2 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -1,4 +1,5 @@
-name: Docs
+name: Publish Docs
+
 on:
   push:
     branches:
@@ -10,12 +11,16 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-ext/python/setup@main
+<<<<<<< before updating
       - run: | 
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libssl-dev libsasl2-dev
       - run: uv pip install .
+=======
+      - run: uv pip install .[develop]
+>>>>>>> after updating
       - run: uv pip install yardang
       - run: yardang build
       - uses: peaceiris/actions-gh-pages@v4
diff --git a/.gitignore b/.gitignore
index a6a1285..e5a9a38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,11 +138,16 @@ js/coverage
 js/dist
 js/lib
 js/node_modules
+js/test-results
+js/playwright-report
 js/*.tgz
+physics_workload/extension
 
 # Jupyter
 .ipynb_checkpoints
 .autoversion
+!physics_workload/extension/physics_workload.json
+!physics_workload/extension/install.json
 physics_workload/nbextension
 physics_workload/labextension
 
diff --git a/Makefile b/Makefile
index ebb207b..b4682c3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,11 @@
 develop:  ## install dependencies and build library
 	uv pip install -e .[develop]
 
+requirements:  ## install prerequisite python build requirements
+	python -m pip install --upgrade pip toml
+	python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))'`
+	python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print(" ".join(c["project"]["optional-dependencies"]["develop"]))'`
+
 build:  ## build the python library
 	python -m build -n
 
@@ -15,20 +20,27 @@ install:  ## install library
 #########
 # LINTS #
 #########
-.PHONY: lint lints fix format
+.PHONY: lint-py lint-docs fix-py fix-docs lint lints fix format
 
-lint:  ## run python linter with ruff
+lint-py:  ## lint python with ruff
 	python -m ruff check physics_workload
 	python -m ruff format --check physics_workload
 
-# Alias
-lints: lint
+lint-docs:  ## lint docs with mdformat and codespell
+	python -m mdformat --check README.md 
+	python -m codespell_lib README.md 
 
-fix:  ## fix python formatting with ruff
+fix-py:  ## autoformat python code with ruff
 	python -m ruff check --fix physics_workload
 	python -m ruff format physics_workload
 
-# alias
+fix-docs:  ## autoformat docs with mdformat and codespell
+	python -m mdformat README.md 
+	python -m codespell_lib --write README.md 
+
+lint: lint-py lint-docs  ## run all linters
+lints: lint
+fix: fix-py fix-docs  ## run all autoformatters
 format: fix
 
 ################
@@ -88,7 +100,7 @@ dist-check:  ## run python dist checker with twine
 
 dist: clean dist-build dist-check  ## build all dists
 
-publish: dist  # publish python assets
+publish: dist  ## publish python assets
 
 #########
 # CLEAN #
diff --git a/README.md b/README.md
index 32322b4..e38e04a 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ Tool for managing staff teaching time.
 [![PyPI](https://img.shields.io/pypi/v/physics-workload.svg)](https://pypi.python.org/pypi/physics-workload)
 
 
+<<<<<<< before updating
 ## Installation
 
 Clone the repo to the server:
@@ -58,5 +59,7 @@ sudo docker compose up
 
 # Extra
 
+=======
+>>>>>>> after updating
 > [!NOTE]
 > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).