Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fully-qualified PersistedEventPosition when returning RoomsForUser #17265

Merged
merged 7 commits into from
Jun 4, 2024

Commits on Jun 3, 2024

  1. Configuration menu
    Copy the full SHA
    271a196 View commit details
    Browse the repository at this point in the history
  2. Fix circular imports when running specific tests

    Before:
    ```
    $ SYNAPSE_POSTGRES=1 SYNAPSE_POSTGRES_USER=postgres SYNAPSE_TEST_LOG_LEVEL=INFO poetry run trial tests.replication.storage.test_events
    [...]
    Traceback (most recent call last):
      File "pypoetry/virtualenvs/matrix-synapse-xCtC9ulO-py3.12/lib/python3.12/site-packages/twisted/trial/runner.py", line 711, in loadByName
        return self.suiteFactory([self.findByName(name, recurse=recurse)])
      File "pypoetry/virtualenvs/matrix-synapse-xCtC9ulO-py3.12/lib/python3.12/site-packages/twisted/trial/runner.py", line 474, in findByName
        obj = reflect.namedModule(searchName)
      File "pypoetry/virtualenvs/matrix-synapse-xCtC9ulO-py3.12/lib/python3.12/site-packages/twisted/python/reflect.py", line 156, in namedModule
        topLevel = __import__(name)
      File "synapse/tests/replication/storage/test_events.py", line 33, in <module>
        from synapse.handlers.room import RoomEventSource
      File "synapse/synapse/handlers/room.py", line 74, in <module>
        from synapse.rest.admin._base import assert_user_is_admin
      File "synapse/synapse/rest/__init__.py", line 24, in <module>
        from synapse.rest import admin
      File "synapse/synapse/rest/admin/__init__.py", line 41, in <module>
        from synapse.handlers.pagination import PURGE_HISTORY_ACTION_NAME
      File "synapse/synapse/handlers/pagination.py", line 30, in <module>
        from synapse.handlers.room import ShutdownRoomParams, ShutdownRoomResponse
    builtins.ImportError: cannot import name 'ShutdownRoomParams' from partially initialized module 'synapse.handlers.room' (most likely due to a circular import) (synapse/synapse/handlers/room.py)
    ```
    MadLittleMods committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4155e18 View commit details
    Browse the repository at this point in the history
  3. Update usage

    MadLittleMods committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    939695d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    73c20d9 View commit details
    Browse the repository at this point in the history
  5. Fix random lints

    MadLittleMods committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    7b41f41 View commit details
    Browse the repository at this point in the history
  6. Add changelog

    MadLittleMods committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    09638ac View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Use keyword args (too many args)

    Co-authored-by: Erik Johnston <erikj@element.io>
    MadLittleMods and erikjohnston committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    cc35e42 View commit details
    Browse the repository at this point in the history