Skip to content

Commit 0441327

Browse files
authored
Use src-layout package structure (#16)
## 3.2.0 - 2025-08-07 ### Changed * Use src-layout package structure
1 parent 01745de commit 0441327

30 files changed

+879
-633
lines changed

.github/workflows/actions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- release
77
- main
8-
pull_request: []
8+
pull_request:
99
workflow_dispatch:
1010
tag: "Manual Run"
1111

@@ -34,7 +34,7 @@ jobs:
3434
uv pip install .[dev]
3535
3636
# Lint and test
37-
uv run --locked ruff check ./device_inductance
38-
uv run --locked pyright ./device_inductance
39-
MPLBACKEND="AGG" uv run --locked coverage run --source=./device_inductance -m pytest ./test --verbose
37+
uv run --locked ruff check ./src/device_inductance
38+
uv run --locked pyright ./src/device_inductance
39+
MPLBACKEND="AGG" uv run --locked coverage run --source=./src/device_inductance -m pytest ./test
4040
uv run --locked coverage report

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 3.2.0 - 2025-08-07
4+
5+
### Changed
6+
7+
* Use src-layout package structure
8+
39
## 3.1.0 - 2025-07-11
410

511
### Added

docs/api/components.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
::: device_inductance.circuits
66

77
::: device_inductance.structures
8+
options:
9+
show_submodules: true
810

911
::: device_inductance.sensors

docs/api/local.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Local Field Solve
2+
3+
::: device_inductance.local

docs/api/utils.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# Utility Functions
22

3+
::: device_inductance.grid
4+
35
::: device_inductance.utils

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Anti-Goals
158158

159159
Licensed under either of
160160

161-
* Apache License, Version 2.0, ([LICENSE-APACHE](../LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
162-
* MIT license ([LICENSE-MIT](../LICENSE-MIT) or http://opensource.org/licenses/MIT)
161+
* Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/cfs-energy/device_inductance/blob/release/LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
162+
* MIT license ([LICENSE-MIT](https://github.com/cfs-energy/device_inductance/blob/release/LICENSE-MIT) or http://opensource.org/licenses/MIT)
163163

164164
at your option.

mkdocs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ nav:
2929
- "Device": api/device.md
3030
- "Components": api/components.md
3131
- "Model Reduction": api/model_reduction.md
32+
- "Local Field Solve": api/local.md
3233
- "Boundary Tracing": api/contour.md
3334
- "Utility Functions": api/utils.md
3435

@@ -56,5 +57,5 @@ extra_css:
5657
- stylesheets/extra.css
5758

5859
watch:
59-
- device_inductance
60+
- src/device_inductance
6061

pyproject.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "device_inductance"
3-
version = "3.1.0"
3+
version = "3.2.0"
44
description = "Tokamak core inductance matrices and flux tables"
55
authors = [{ name = "Commonwealth Fusion Systems", email = "jlogan@cfs.energy" }]
66
requires-python = ">=3.10, <3.14"
@@ -31,10 +31,10 @@ dependencies = [
3131

3232
[project.optional-dependencies]
3333
dev = [
34-
"pytest==8.3.5",
35-
"coverage==7.8.0",
36-
"ruff==0.11.8",
37-
"pyright==1.1.402",
34+
"pytest==8.4.1",
35+
"coverage==7.10.2",
36+
"ruff==0.12.7",
37+
"pyright==1.1.403",
3838
"mktestdocs==0.2.4",
3939
"mkdocs>=1.6.0",
4040
"mkdocs-material>=9.6.12",
@@ -46,9 +46,6 @@ dev = [
4646
requires = ["setuptools"]
4747
build-backend = "setuptools.build_meta"
4848

49-
[tool.setuptools]
50-
packages = ["device_inductance"]
51-
5249
[tool.setuptools.package-data]
5350
device_inductance = ['py.typed']
5451

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def load_default_ods() -> ODS:
4949
""")
5050

5151
# NOTE: This should be rewritten to use importlib once omas supports loading raw text
52-
ods_filename = Path(__file__).parent / "../examples/OS_SPARC_Device_Description.json"
52+
ods_filename = Path(__file__).parent / "../../examples/OS_SPARC_Device_Description.json"
5353
with open(ods_filename) as f:
5454
ods = load_omas_json(f)
5555

0 commit comments

Comments
 (0)