Skip to content

[Fixes #633] Handle thesauri autoload and packaging#634

Merged
giohappy merged 1 commit into
masterfrom
633_thesauri
Jun 17, 2026
Merged

[Fixes #633] Handle thesauri autoload and packaging#634
giohappy merged 1 commit into
masterfrom
633_thesauri

Conversation

@etj

@etj etj commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

@etj etj requested a review from mattiagiupponi June 17, 2026 14:52
@etj etj self-assigned this Jun 17, 2026
Copilot AI review requested due to automatic review settings June 17, 2026 14:52

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds runtime initialization and packaging support for GeoNode thesauri so thesaurus RDF assets can be included in distributions and automatically loaded at container startup (per #633 and upstream GeoNode behavior).

Changes:

  • Introduces a new invoke task to run manage.py thesaurus autoload.
  • Calls the new thesauri autoload task during the Docker entrypoint startup sequence.
  • Configures setuptools to include **/thesauri/*.rdf files in built packages.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
src/tasks.py Adds an invoke task to autoload thesauri via Django management command.
src/entrypoint.sh Runs thesauri autoload as part of the non-celery startup path.
src/pyproject.toml Includes RDF thesauri files as package data for distribution.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/tasks.py
Comment on lines +199 to +207
def loadthesauri(ctx):
print("**************************thesauri*******************************")
try:
ctx.run(
f"python manage.py thesaurus autoload --settings={_localsettings()}",
pty=True,
)
except Exception:
pass
@giohappy giohappy merged commit d9c8cd4 into master Jun 17, 2026
6 checks passed
@giohappy giohappy deleted the 633_thesauri branch June 17, 2026 15:26
@github-actions

Copy link
Copy Markdown

The backport to 5.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.1.x 5.1.x
# Navigate to the new working tree
cd .worktrees/backport-5.1.x
# Create a new branch
git switch --create backport-634-to-5.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d9c8cd440d9a032670e754ad93e52def3289b70f
# Push it to GitHub
git push --set-upstream origin backport-634-to-5.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1.x

Then, create a pull request where the base branch is 5.1.x and the compare/head branch is backport-634-to-5.1.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants