Skip to content

Merge windows branch into skpkg-migration - #60

Merged
sbillinge merged 27 commits into
diffpy:skpkg-migrationfrom
SYMSCAE:merge-windows
Oct 29, 2026
Merged

sbillinge merged 27 commits into
diffpy:skpkg-migrationfrom
SYMSCAE:merge-windows

Conversation

@SYMSCAE

@SYMSCAE SYMSCAE commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

This PR merges Windows build support from the windows branch, adds fixes for Windows builds and tests, and implemented test matrix for C++. Most of the diff consists of mechanical C++ formatting changes made with clang-format, which is also added to the pre-commit hooks.

Tieqiong and others added 26 commits February 1, 2025 18:09
add: flags for linking libobjcryst
remove travis ci and local conda recipe
rename doc to docs
objcryst link name for linux
@SYMSCAE
SYMSCAE marked this pull request as ready for review October 28, 2026 23:54
@SYMSCAE

SYMSCAE commented Oct 28, 2026

Copy link
Copy Markdown
Contributor Author

@sbillinge PR ready for review. @cadenmyers13 Please see what's left for skpkg.

@sbillinge
sbillinge merged commit 9d7bd8b into diffpy:skpkg-migration Oct 29, 2026
1 check passed
@SYMSCAE
SYMSCAE deleted the merge-windows branch October 29, 2026 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants