Skip to content

rosie: re-enable Rosie Disco service#2985

Open
oliver-sanders wants to merge 4 commits intometomi:masterfrom
oliver-sanders:re-instate-rosie-disco
Open

rosie: re-enable Rosie Disco service#2985
oliver-sanders wants to merge 4 commits intometomi:masterfrom
oliver-sanders:re-instate-rosie-disco

Conversation

@oliver-sanders
Copy link
Member

@oliver-sanders oliver-sanders commented Jan 16, 2026

  • Reinstate the Rosie Disco service:
    • This has been disabled for a while due to the removal of WSGI support in Tornado.
    • This PR removes the vestigial remains of WSGI support,
    • re-enables Rosie Disco,
    • reinstates tests,
    • and packages it.
  • Tests the rosie lookup "pretty" format:
    • This was added in rosie lookup: quick improvements #2903 to make up for the loss of the Rosie Go GUI.
    • However, it couldn't be tested at the time due to the lack of Rosie Disco!
    • Functional tests are added (unit tests already present).
  • Fixes some minor issues with rosie lookup "pretty" format:
    • Fixes some issues revealed by testing, mostly pertaining to the --format option.
    • No bug reports from users, this probably isn't used.
    • Will backport this part of the PR to a bugfix release later.
    • Also added support for the -H (no-header) option.

Comment on lines +18 to +21
- sqlalchemy >=1,<2
- tornado
Copy link
Member Author

Choose a reason for hiding this comment

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

Move rosie-only dependencies out of core dependencies:

$ git grep --name-only sqlalchemy -- metomi
metomi/rose/check_software.py
metomi/rosie/db.py
metomi/rosie/db_create.py
metomi/rosie/svn_post_commit.py

$ git grep --name-only tornado -- metomi
metomi/rose/check_software.py
metomi/rosie/ws.py

from tornado.ioloop import IOLoop, PeriodicCallback
import tornado.log
import tornado.web
import tornado.wsgi
Copy link
Member Author

Choose a reason for hiding this comment

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

Remove residual remains of WSGI support.

if port_is_busy "${TEST_ROSE_WS_PORT}"; then
pass "${TEST_KEY}"
TEST_ROSE_WS_URL="http://${HOSTNAME}:${TEST_ROSE_WS_PORT}/${NS}-${UTIL}"
TEST_ROSE_WS_URL="http://$(hostname -f):${TEST_ROSE_WS_PORT}/${NS}-${UTIL}"
Copy link
Member Author

Choose a reason for hiding this comment

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

For VDI test compat.

@oliver-sanders oliver-sanders marked this pull request as draft January 16, 2026 16:00
@oliver-sanders
Copy link
Member Author

Some long dormant tests are now running for the first time in a few years and need some TLC to recover from their long sleep.

@oliver-sanders oliver-sanders added this to the 2.7.0 milestone Jan 19, 2026
@oliver-sanders oliver-sanders self-assigned this Jan 19, 2026
@oliver-sanders oliver-sanders force-pushed the re-instate-rosie-disco branch 2 times, most recently from 518f3d2 to 4c18c96 Compare January 19, 2026 13:28
@oliver-sanders oliver-sanders force-pushed the re-instate-rosie-disco branch 2 times, most recently from 3c095b8 to 8ae98ae Compare February 2, 2026 11:32
* Remove vestigial remains of WSGI support (no longer an option via
  Tornado).
* Fix tests.
* Fix issues with pretty format:
  * Support `--format`:
    * Fix error if things which are not fields are added to `--format`.
    * Fix error displaying `access-list`.
    * Fix error displaying a field if it is undefined for the row.
  * Add support for `-H` option.
@oliver-sanders oliver-sanders marked this pull request as ready for review February 2, 2026 16:44
@oliver-sanders oliver-sanders requested a review from wxtim February 2, 2026 16:44
@oliver-sanders

This comment was marked as resolved.

@wxtim

This comment was marked as resolved.

Copy link
Contributor

@wxtim wxtim left a comment

Choose a reason for hiding this comment

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

Tested as working.

@wxtim wxtim self-requested a review February 5, 2026 08:17
wxtim

This comment was marked as resolved.

* Install all dependencies on Mac OS.
* But blacklist `t/rosie-lookup/00-basic.t` which isn't presently
  working.
@oliver-sanders
Copy link
Member Author

oliver-sanders commented Feb 5, 2026

The traceback for a missing DB config is "as was", but have put in a safeguard and a test to accompany in the last commit.

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.

2 participants