Skip to content

Commit fc3be15

Browse files
Update from copier (2025-08-17T05:02:23)
Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 8c298eb commit fc3be15

6 files changed

Lines changed: 37 additions & 11 deletions

File tree

.copier-answers.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Changes here will be overwritten by Copier
2-
_commit: c53b04c
2+
_commit: 3a223c6
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: true
55
add_extension: python
6+
add_wiki: false
67
email: s.mangham@soton.ac.uk
78
github: Southampton-RSG
89
project_description: Tool for managing staff teaching time.

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python-version: ["3.12"]
3434

3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v5
3737

3838
- uses: actions-ext/python/setup@main
3939
with:

.github/workflows/docs.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: Docs
1+
name: Publish Docs
2+
23
on:
34
push:
45
branches:
@@ -10,12 +11,16 @@ jobs:
1011
docs:
1112
runs-on: ubuntu-latest
1213
steps:
13-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1415
- uses: actions-ext/python/setup@main
16+
<<<<<<< before updating
1517
- run: |
1618
sudo apt-get update
1719
sudo apt-get install -y libldap2-dev libssl-dev libsasl2-dev
1820
- run: uv pip install .
21+
=======
22+
- run: uv pip install .[develop]
23+
>>>>>>> after updating
1924
- run: uv pip install yardang
2025
- run: yardang build
2126
- uses: peaceiris/actions-gh-pages@v4

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,16 @@ js/coverage
138138
js/dist
139139
js/lib
140140
js/node_modules
141+
js/test-results
142+
js/playwright-report
141143
js/*.tgz
144+
physics_workload/extension
142145

143146
# Jupyter
144147
.ipynb_checkpoints
145148
.autoversion
149+
!physics_workload/extension/physics_workload.json
150+
!physics_workload/extension/install.json
146151
physics_workload/nbextension
147152
physics_workload/labextension
148153

Makefile

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
develop: ## install dependencies and build library
77
uv pip install -e .[develop]
88

9+
requirements: ## install prerequisite python build requirements
10+
python -m pip install --upgrade pip toml
11+
python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))'`
12+
python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print(" ".join(c["project"]["optional-dependencies"]["develop"]))'`
13+
914
build: ## build the python library
1015
python -m build -n
1116

@@ -15,20 +20,27 @@ install: ## install library
1520
#########
1621
# LINTS #
1722
#########
18-
.PHONY: lint lints fix format
23+
.PHONY: lint-py lint-docs fix-py fix-docs lint lints fix format
1924

20-
lint: ## run python linter with ruff
25+
lint-py: ## lint python with ruff
2126
python -m ruff check physics_workload
2227
python -m ruff format --check physics_workload
2328

24-
# Alias
25-
lints: lint
29+
lint-docs: ## lint docs with mdformat and codespell
30+
python -m mdformat --check README.md
31+
python -m codespell_lib README.md
2632

27-
fix: ## fix python formatting with ruff
33+
fix-py: ## autoformat python code with ruff
2834
python -m ruff check --fix physics_workload
2935
python -m ruff format physics_workload
3036

31-
# alias
37+
fix-docs: ## autoformat docs with mdformat and codespell
38+
python -m mdformat README.md
39+
python -m codespell_lib --write README.md
40+
41+
lint: lint-py lint-docs ## run all linters
42+
lints: lint
43+
fix: fix-py fix-docs ## run all autoformatters
3244
format: fix
3345

3446
################
@@ -88,7 +100,7 @@ dist-check: ## run python dist checker with twine
88100

89101
dist: clean dist-build dist-check ## build all dists
90102

91-
publish: dist # publish python assets
103+
publish: dist ## publish python assets
92104

93105
#########
94106
# CLEAN #

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Tool for managing staff teaching time.
88
[![PyPI](https://img.shields.io/pypi/v/physics-workload.svg)](https://pypi.python.org/pypi/physics-workload)
99

1010

11+
<<<<<<< before updating
1112
## Installation
1213

1314
Clone the repo to the server:
@@ -58,5 +59,7 @@ sudo docker compose up
5859

5960
# Extra
6061

62+
=======
63+
>>>>>>> after updating
6164
> [!NOTE]
6265
> 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).

0 commit comments

Comments
 (0)