diff --git a/.copier-answers.yaml b/.copier-answers.yaml
index dafbbb0..8f856db 100644
--- a/.copier-answers.yaml
+++ b/.copier-answers.yaml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 3a223c6
+_commit: 4f23417
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: true
 add_extension: python
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 83b0aab..075843d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
         python-version: ["3.12"]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - uses: actions-ext/python/setup@main
       with:
@@ -53,6 +53,7 @@ jobs:
     - name: Build
       run: make build
 
+<<<<<<< before updating
 #    - name: Test
 #      run: make coverage
 #
@@ -72,3 +73,32 @@ jobs:
 #      uses: codecov/codecov-action@v5
 #      with:
 #        token: ${{ secrets.CODECOV_TOKEN }}
+=======
+    - name: Test
+      run: make coverage
+
+    - name: Upload test results (Python)
+      uses: actions/upload-artifact@v6
+      with:
+        name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
+        path: junit.xml
+      if: ${{ always() }}
+
+    - name: Publish Unit Test Results
+      uses: EnricoMi/publish-unit-test-result-action@v2
+      with:
+        files: '**/junit.xml'
+
+    - name: Upload coverage
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+
+    - name: Make dist
+      run: make dist
+
+    - uses: actions/upload-artifact@v6
+      with:
+        name: dist-${{matrix.os}}
+        path: dist
+>>>>>>> after updating
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index e7707ef..ef65729 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -11,7 +11,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-ext/python/setup@main
       - run: | 
           sudo apt-get update
diff --git a/.gitignore b/.gitignore
index e5a9a38..dca6669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ physics_workload/extension
 # Jupyter
 .ipynb_checkpoints
 .autoversion
+Untitled*.ipynb
 !physics_workload/extension/physics_workload.json
 !physics_workload/extension/install.json
 physics_workload/nbextension
diff --git a/pyproject.toml b/pyproject.toml
index cba97b2..06d3fe1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,15 +1,23 @@
 [build-system]
-requires = ["hatchling"]
+requires = [
+    "hatchling",
+]
 build-backend="hatchling.build"
 
 [project]
 name = "physics-workload"
-authors = [{name = "Sam Mangham", email = "s.mangham@soton.ac.uk"}]
+authors = [
+    {name = "Sam Mangham", email = "s.mangham@soton.ac.uk"},
+]
 description = "Tool for managing staff teaching time."
 readme = "README.md"
 license = { text = "Apache-2.0" }
 version = "0.1.0"
+<<<<<<< before updating
 requires-python = ">=3.11"
+=======
+requires-python = ">=3.10"
+>>>>>>> after updating
 keywords = []
 
 classifiers = [
@@ -18,11 +26,11 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 
 dependencies = [
@@ -54,12 +62,13 @@ develop = [
     "check-manifest",
     "codespell>=2.4,<2.5",
     "hatchling",
-    "mdformat>=0.7.22,<0.8",
+    "mdformat>=0.7.22,<1.1",
     "mdformat-tables>=1",
     "pytest",
     "pytest-cov",
-    "ruff",
+    "ruff>=0.9,<0.15",
     "twine",
+    "ty",
     "uv",
     "wheel",
     "django-fastdev",
@@ -109,32 +118,60 @@ artifacts = []
 src = "/"
 
 [tool.hatch.build.targets.sdist]
-packages = ["physics_workload"]
+packages = [
+    "physics_workload",
+]
 
 [tool.hatch.build.targets.wheel]
-packages = ["physics_workload"]
+packages = [
+    "physics_workload",
+]
 
 [tool.hatch.build.targets.wheel.shared-data]
 
 [tool.pytest.ini_options]
-addopts = ["-vvv", "--junitxml=junit.xml"]
+addopts = [
+    "-vvv",
+    "--junitxml=junit.xml",
+]
 testpaths = "physics_workload/tests"
 
 [tool.ruff]
 line-length = 150
 
 [tool.ruff.lint]
-extend-select = ["I"]
+extend-select = [
+    "I",
+]
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
 default-section = "third-party"
+<<<<<<< before updating
 known-first-party = ["physics_workload", "app", "core", "users"]
 section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "F403"]
 "*.py" = ["E731"]
+=======
+known-first-party = [
+    "physics_workload",
+]
+section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "first-party",
+    "local-folder",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = [
+    "F401",
+    "F403",
+]
+>>>>>>> after updating
 
 [tool.yardang]
 title = "Teaching Time Tool"