Skip to content

fix: remove redundant force-include that breaks newer hatchling #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coketaste merged 4 commits into from
Jun 3, 2026
Merged

fix: remove redundant force-include that breaks newer hatchling #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ce5b32
The scripts directory is already auto-included since it's under src/m…
gargrahul Jun 2, 2026
aa4dedc
Update pyproject.toml
gargrahul Jun 2, 2026
fd749c0
fix: use hatch artifacts to include scripts/ excluded by .gitignore
coketaste Jun 3, 2026
e74a0b2
chore: add v2.1.1 changelog entry
coketaste Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.1.1] - 2026-06-02

### Fixed

- **`tools/` build context conditionally included**: `docker build` now only passes `--build-context tools=./scripts/common/tools` when the `tools` directory actually exists, preventing build failures in environments where the directory is absent (e.g. clean checkouts before `madengine run` populates `scripts/common/`).

- **SLURM env var escaping**: Switched from `shlex.quote()` to double-quote escaping for env var values in generated SBATCH wrapper scripts. `shlex.quote()` produced single-quoted strings that broke paths with spaces and special characters (e.g. directories with embedded variables); double-quoting is more portable for shell assignment in SLURM batch contexts.

- **Hatch package artifacts include `scripts/`**: `pyproject.toml` now uses `[tool.hatch.build.artifacts]` to force-include the `scripts/` directory in the built wheel, ensuring pre/post scripts and tools bundled under `src/madengine/scripts/` are present in installed environments even though `.gitignore` excludes them from source tracking. Removes the previous `force-include` directive that caused `duplicate file` errors with newer hatchling versions.

## [2.1.0] - 2026-05-28

### Added
Expand Down
9 changes: 5 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ all = [
]

[tool.hatch.build.targets.wheel]

[tool.hatch.build.targets.wheel.force-include]
"src/madengine/scripts" = "madengine/scripts"
"src/madengine/deployment/templates" = "madengine/deployment/templates"
# scripts/ is listed in .gitignore (to exclude external MAD project scripts/ dirs during dev).
# artifacts bypasses VCS exclusion without risk of duplicate-file errors from force-include.
artifacts = [
"src/madengine/scripts/**",
]

[tool.hatch.version]
source = "versioningit"
Expand Down