Conversation
Use the new Ubuntu 26.04 as the base image for: * computing the new Python constraints; * building the `builder` image; * building the `odklite` image.
One of the things the update-constraints.sh script must do is to get a list of the Python packages that are installed as *Debian packages* (i.e. installed via `apt-get` rather than via `pip`). For now this is done by `find`ing and `grep`ing the contents of the Python dist-packages directory, but we can instead just use `pip` to do that. Much easier and much less prone to errors.
With Ubuntu 26.04, we must explicitly install `python-setuptools` (which is deprecated and therefore no longer automatically installed, but some of the packages we are dependent on still need it). We must also explicitly install `typing-extensions` in ODKLite, because it is installed in ODKBuild (and therefore _not_ installed when we install all our Python packages).
The x86_64 version of Konclude has a runtime dependency on libpcre3, which is no longer provided by Ubuntu 26.04. We circumvent the issue by using the "Docker build" of Konclude 0.7.0-1138, which is statically linked against the library so that we don't need the shared library at runtime. The arm64 version is not affected, because it was not built against libpcre3 to begin with.
ODK versions up to 1.6 had included two small helper scripts: * check-rdfxml, to check RDF/XML artefacts for correctness; * context2csv, to convert a JSON-based context file to a CSV file. In ODK 1.7, as part of the migration to the ODK-Core system, those scripts were consolidated into a single `odk-helper` script. Makefiles generated with ODK 1.7 will automatically call this new `odk-helper` script. But of course, Makefiles that were generated with a pre-1.7 ODK will still attempt to call the original individual scripts. To make sure that standard workflows from a pre-1.7 ODK instance can still be run with a ODK 1.7 image, we must provide wrapper scripts, which is what we do here. closes #1339
Another thing that has changed with the switch to ODK-Core is the location of: * the ROBOT plugins (from /tools/robot-plugins to /odk/resources/robot/plugins); * the templates (from /tools/templates to within the ODK-Core Python package). In 1.7-generated Makefiles, we have explicit variables to refer to these locations, but in pre-1.7 Makefiles, they were hardcoded. So to allow pre-1.7 repositories to keep working with a ODK 1.7 image prior to being updated, we need symlinks linking the old locations to the new ones.
We do _not_ to `exec` the odk-helper script here, because we need the final `rm` command to be executed once the script has finished.
ODK-Core now depends specifically on linkml >= 1.10.0, so we need to recompute the Python constraints.
Contributor
Author
|
@matentzn This is primarily intended for you, in case you want to actually test the changes in the mentioned PRs, instead of simply reviewing them. :) |
Contributor
Author
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
1 participant
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.
/!\ Do not merge, for development purpose only!
This PR combines the following three ongoing PRs:
into a single branch, for easier testing. Those PRs are all independent of each other but they do overlap (especially regarding Python constraints).
A build of ODKFull from that branch has been tested to successfully build