Repository navigation
Conversation
Detect chemfiles and readcon-core with Meson feature options, define SEAMS_HAS_CHEMFILES and SEAMS_HAS_READCON when they are found, and expose has_chemfiles and has_readcon to Lua and Fennel. Tests read a .con, a PDB, and a GRO file and skip only when the matching query is false.
Install chemfiles 0.10.4 and readcon-core v0.14.10, require both readers at configure time, assert the feature queries, and run the test suite.
Add the Org developer guide for tests, the FAQ, and the cocogitto plus towncrier release onto LuaRocks. List the binding's analyses in the rockspec and Nix metadata, and record Ruhila Goswami's ORCID with the software authors.
has_chemfiles and has_readcon report the chemfiles_dep and readcon_dep results from the seams-core subproject. A dependency lookup in this project is not used, so a missing system library does not hide the readcon-core wrap fallback.
The job still installs readcon-core v0.14.10, the revision in the current seams-core wrap. A later wrap has to follow seams-core's floor, which is >=0.16.2 in seams-core v2.14.1.
The pre-bump hook is cogapp over ci/version/files.txt. The version field in meson.build is the source of those copies.
Ruhila Goswami was not a software author on the base revision, so the added entry is removed. Amrita Goswami's entry is unchanged.
meson rewrite sets the project() version before cogapp copies it. The version module reads that keyword with meson introspect.
The has_chemfiles and has_readcon notes are outside the release fix.
The rockspec ran DESTDIR=$(PREFIX) meson install, which put every
file under the rock directory's usr/local tree instead of the
LuaRocks module paths. require("dseams") failed after luarocks make.
The install command copies dseams.lua, yoda.lua, and the Fennel
sources to $(LUADIR) and dseams_core.so to $(LIBDIR). CI installs
the rock into a local tree and requires it from a fresh interpreter.
Meson tried lua5.4 before lua5.3, and the header search did the same
under /usr/include. A LuaRocks build for 5.3, with both pkg-config
files visible, compiled against 5.4 and installed that module under
lib/lua/5.3. The rockspec asks $(LUA), the interpreter LuaRocks
selected, for its version and passes that to -Dlua_version. That
option accepts only the requested version, and the lua.h copied into
the build is taken from the same version. LuaRocks 3.8 does not
define $(LUA_VERSION), so the interpreter is the source that works
on that release and on later ones.
The rock ships dseams.fnl and yoda.fnl. They are loaded with
fennel.dofile, and the docs say not to compile dseams.fnl as the
dseams module. Meson install ships the vendored fennel.lua for that
dofile. The rock did not, and it did not depend on fennel, so a
LuaRocks install could not load the .fnl files. Compiling them
during the build would replace that dofile path with a second Lua
module. The rock depends on fennel 1.5.3, the compiler already
vendored for the CLI.
readChemfiles and readCon were declared in lua_api.hpp whenever
SEAMS_HAS_* was set. lua_api.cpp defines them only when that macro
is set and DSEAMS_DISABLE_* is not. A build with the reader disabled
declared a function it did not define. The header now uses the same
condition as the definition.
Edit links were built from GITHUB_HEAD_REF. A pull request from a
fork has a head branch that does not exist in d-SEAMS/yodaStruct, so
those links 404. Pull-request builds use GITHUB_SHA, which names a
commit in the base repository. Push builds publish the site for a
branch. A blob URL pinned to a commit does not open GitHub's editor,
so a push uses GITHUB_REF_NAME, which is main or develop.
The build, docs, and Nix workflows run for develop as well as main.
The readers job installs cargo-c 0.10.26 and caches cargo-capi,
cargo-cbuild, cargo-cinstall, and cargo-ctest, plus the crate
metadata cargo uses to remember an install. cargo install does not
produce a binary named cargo-c, so a cache of that path restored
nothing and the job compiled cargo-c every time. The cache key is
the cargo-c version: an unrelated workflow edit keeps the binaries,
and a version bump does not reuse them.
The developer guide wrote .con with Markdown backticks in Org. That
is Org verbatim markup now, and the RST export was regenerated.
meson.build picked the test interpreter with a fixed search for lua5.4, lua-5.4, lua5.3, then lua, whatever lua_version said. With Lua 5.3 and 5.4 both installed, -Dlua_version=5.3 linked liblua5.3 and then ran every test under lua5.4, and all 11 tests died with SIGSEGV. The interpreter now follows the Lua dependency Meson resolved. The ABI is the major.minor of lua_dep's version, and configure stops if that disagrees with an explicit lua_version. The candidates are lua<abi>, lua-<abi>, then lua. Each one found is run to print its _VERSION, and only a candidate that reports the linked ABI is used, because lua and the versioned names can be links to another release. Candidates that report another version are named in the configure output, and the summary shows the linked ABI and the chosen interpreter. A new lua_abi_match test runs example_lua/library/abi_match.lua with the linked ABI as its argument. The script fails when the interpreter reports another version, and checks this before it requires dseams_core, because loading the module into the other Lua crashes inside liblua before an error can be raised. After the require it reads /proc/self/maps where that exists and fails if a shared liblua of another version is mapped. If only interpreters of the wrong version are on PATH, lua_abi_match is still registered with the first of them, so meson test fails with a message instead of losing its Lua tests. With no Lua interpreter at all the tests are absent, as before.
The build_test job installs only conda's Lua 5.4, so nothing in CI configures -Dlua_version=5.3, and nothing runs where a second Lua could be picked by mistake. The new lua_abi job runs on Ubuntu 24.04 with the apt packages for Lua 5.3 and 5.4 installed together. Each matrix entry configures with -Dlua_version set to its version, builds, and checks that readelf lists that version's liblua as NEEDED by dseams_core.so. It then runs meson test and checks that the test log holds the lua_abi_match line naming the same version for the interpreter and the linked library. A build or test run that mixes the two versions fails the job.
The rockspec required fennel == 1.5.3. LuaRocks already publishes fennel 1.6.0 and 1.6.1, so installing dseams into a tree that held fennel 1.6.1 built 1.5.3, removed 1.6.1, and broke any other rock in that tree that needs fennel 1.6. The dependency is now fennel >= 1.5.3, < 2.0. The lower bound is the compiler vendored for the CLI, and it also keeps LuaRocks away from the 1.5.0 and 1.5.1 rockspecs, which point at a git:// URL that no longer serves. dseams.fnl and yoda.fnl only use local, fn, and table literals, and with fennel 1.5.3 and with 1.6.1 both files load through fennel.dofile on Lua 5.3 and 5.4 and read an XYZ file through the wrapped read. A tree that already has either version keeps it.
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces #42 with a rebased series on current main.
cog bumpwrites it withmeson rewrite, regenerates the version copies with cogapp and builds the changelog with towncrier.