Skip to content

Commit caafee8

Browse files
Update from copier (2026-03-15T05:29:13)
Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 3d818b2 commit caafee8

6 files changed

Lines changed: 116 additions & 39 deletions

File tree

.copier-answers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: 3a223c6
2+
_commit: 3160d4c
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: true
55
add_extension: python

.github/workflows/build.yaml

Lines changed: 31 additions & 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@v5
36+
- uses: actions/checkout@v6
3737

3838
- uses: actions-ext/python/setup@main
3939
with:
@@ -53,6 +53,7 @@ jobs:
5353
- name: Build
5454
run: make build
5555

56+
<<<<<<< before updating
5657
# - name: Test
5758
# run: make coverage
5859
#
@@ -72,3 +73,32 @@ jobs:
7273
# uses: codecov/codecov-action@v5
7374
# with:
7475
# token: ${{ secrets.CODECOV_TOKEN }}
76+
=======
77+
- name: Test
78+
run: make coverage
79+
80+
- name: Upload test results (Python)
81+
uses: actions/upload-artifact@v7
82+
with:
83+
name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
84+
path: junit.xml
85+
if: ${{ always() }}
86+
87+
- name: Publish Unit Test Results
88+
uses: EnricoMi/publish-unit-test-result-action@v2
89+
with:
90+
files: '**/junit.xml'
91+
92+
- name: Upload coverage
93+
uses: codecov/codecov-action@v5
94+
with:
95+
token: ${{ secrets.CODECOV_TOKEN }}
96+
97+
- name: Make dist
98+
run: make dist
99+
100+
- uses: actions/upload-artifact@v7
101+
with:
102+
name: dist-${{matrix.os}}
103+
path: dist
104+
>>>>>>> after updating

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
docs:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- uses: actions-ext/python/setup@main
1616
- run: |
1717
sudo apt-get update

.gitignore

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ __pycache__/
1111
*.exp
1212
*.lib
1313

14+
# Rust
15+
target
16+
1417
# Distribution / packaging
1518
.Python
1619
build/
@@ -55,26 +58,12 @@ junit.xml
5558
.hypothesis/
5659
.pytest_cache/
5760

58-
# Translations
59-
*.mo
60-
*.pot
61-
62-
# Django stuff:
61+
# Django
6362
*.log
6463
local_settings.py
6564
db.sqlite3
6665
db.sqlite3-journal
6766

68-
# Flask stuff:
69-
instance/
70-
.webassets-cache
71-
72-
# Scrapy stuff:
73-
.scrapy
74-
75-
# PyBuilder
76-
target/
77-
7867
# IPython
7968
profile_default/
8069
ipython_config.py
@@ -85,15 +74,12 @@ ipython_config.py
8574
# pipenv
8675
Pipfile.lock
8776

88-
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
89-
__pypackages__/
90-
91-
# Celery stuff
77+
# Celery
9278
celerybeat-schedule
9379
celerybeat.pid
9480

95-
# SageMath parsed files
96-
*.sage.py
81+
# Airspeed Velocity
82+
.asv
9783

9884
# Environments
9985
.env
@@ -141,13 +127,12 @@ js/node_modules
141127
js/test-results
142128
js/playwright-report
143129
js/*.tgz
144-
physics_workload/extension
145130

146131
# Jupyter
147132
.ipynb_checkpoints
148133
.autoversion
149-
!physics_workload/extension/physics_workload.json
150-
!physics_workload/extension/install.json
134+
Untitled*.ipynb
135+
physics_workload/extension
151136
physics_workload/nbextension
152137
physics_workload/labextension
153138

@@ -157,8 +142,14 @@ physics_workload/labextension
157142
# Rust
158143
target
159144

145+
<<<<<<< before updating
160146
# Project
161147
staticfiles/
162148
*.csv
163149
*.xlsx
164-
*/migrations/*
150+
*/migrations/*
151+
=======
152+
# Hydra
153+
outputs/
154+
multirun/
155+
>>>>>>> after updating

Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,24 @@ lints: lint
4343
fix: fix-py fix-docs ## run all autoformatters
4444
format: fix
4545

46+
<<<<<<< before updating
47+
=======
48+
################
49+
# Other Checks #
50+
################
51+
.PHONY: check-dist check-types checks check
52+
53+
check-dist: ## check python sdist and wheel with check-dist
54+
check-dist -v
55+
56+
check-types: ## check python types with ty
57+
ty check --python $$(which python)
58+
59+
checks: check-dist
60+
61+
# Alias
62+
check: checks
63+
>>>>>>> after updating
4664

4765
#########
4866
# TESTS #

pyproject.toml

Lines changed: 49 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
[build-system]
2-
requires = ["hatchling"]
3-
build-backend="hatchling.build"
2+
requires = [
3+
"hatchling",
4+
]
5+
build-backend = "hatchling.build"
46

57
[project]
68
name = "physics-workload"
7-
authors = [{name = "Sam Mangham", email = "s.mangham@soton.ac.uk"}]
9+
authors = [
10+
{name = "Sam Mangham", email = "s.mangham@soton.ac.uk"},
11+
]
812
description = "Tool for managing staff teaching time."
913
readme = "README.md"
1014
license = { text = "Apache-2.0" }
1115
version = "0.1.0"
16+
<<<<<<< before updating
1217
requires-python = ">=3.11"
18+
=======
19+
requires-python = ">=3.10"
20+
>>>>>>> after updating
1321
keywords = []
1422

1523
classifiers = [
@@ -18,11 +26,11 @@ classifiers = [
1826
"Programming Language :: Python :: Implementation :: CPython",
1927
"Programming Language :: Python :: Implementation :: PyPy",
2028
"Programming Language :: Python :: 3",
21-
"Programming Language :: Python :: 3.9",
2229
"Programming Language :: Python :: 3.10",
2330
"Programming Language :: Python :: 3.11",
2431
"Programming Language :: Python :: 3.12",
2532
"Programming Language :: Python :: 3.13",
33+
"Programming Language :: Python :: 3.14",
2634
]
2735

2836
dependencies = [
@@ -51,15 +59,16 @@ dependencies = [
5159
develop = [
5260
"build",
5361
"bump-my-version",
54-
"check-manifest",
55-
"codespell>=2.4,<2.5",
62+
"check-dist",
63+
"codespell",
5664
"hatchling",
57-
"mdformat>=0.7.22,<0.8",
65+
"mdformat",
5866
"mdformat-tables>=1",
5967
"pytest",
6068
"pytest-cov",
6169
"ruff",
6270
"twine",
71+
"ty",
6372
"uv",
6473
"wheel",
6574
"django-fastdev",
@@ -93,6 +102,7 @@ branch = true
93102
omit = [
94103
"physics_workload/tests/integration/",
95104
]
105+
96106
[tool.coverage.report]
97107
exclude_also = [
98108
"raise NotImplementedError",
@@ -109,32 +119,60 @@ artifacts = []
109119
src = "/"
110120

111121
[tool.hatch.build.targets.sdist]
112-
packages = ["physics_workload"]
122+
packages = [
123+
"physics_workload",
124+
]
113125

114126
[tool.hatch.build.targets.wheel]
115-
packages = ["physics_workload"]
127+
packages = [
128+
"physics_workload",
129+
]
116130

117131
[tool.hatch.build.targets.wheel.shared-data]
118132

119133
[tool.pytest.ini_options]
120-
addopts = ["-vvv", "--junitxml=junit.xml"]
134+
addopts = [
135+
"-vvv",
136+
"--junitxml=junit.xml",
137+
]
121138
testpaths = "physics_workload/tests"
122139

123140
[tool.ruff]
124141
line-length = 150
125142

126143
[tool.ruff.lint]
127-
extend-select = ["I"]
144+
extend-select = [
145+
"I",
146+
]
128147

129148
[tool.ruff.lint.isort]
130149
combine-as-imports = true
131150
default-section = "third-party"
151+
<<<<<<< before updating
132152
known-first-party = ["physics_workload", "app", "core", "users"]
133153
section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
134154

135155
[tool.ruff.lint.per-file-ignores]
136156
"__init__.py" = ["F401", "F403"]
137157
"*.py" = ["E731"]
158+
=======
159+
known-first-party = [
160+
"physics_workload",
161+
]
162+
section-order = [
163+
"future",
164+
"standard-library",
165+
"third-party",
166+
"first-party",
167+
"local-folder",
168+
]
169+
170+
[tool.ruff.lint.per-file-ignores]
171+
"__init__.py" = [
172+
"F401",
173+
"F403",
174+
]
175+
>>>>>>> after updating
138176

139177
[tool.yardang]
140178
title = "Teaching Time Tool"

0 commit comments

Comments
 (0)