Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: matrix-org/synapse
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9b9750e
Choose a base ref
...
head repository: matrix-org/synapse
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6413bcd
Choose a head ref
  • 10 commits
  • 30 files changed
  • 5 contributors

Commits on Sep 30, 2022

  1. Update mypy and mypy-zope (#13925) 

    * Update mypy and mypy-zope

* Unignore assigning to LogRecord attributes

Presumably python/typeshed#8064 makes this ok

Cherry-picked from #13521

* Remove unused ignores due to mypy ParamSpec fixes

python/mypy#12668

Cherry-picked from #13521

* Remove additional unused ignores

* Fix new mypy complaints related to `assertGreater`

Presumably due to python/typeshed#8077

* Changelog

* Reword changelog

Co-authored-by: Patrick Cloke <[email protected]>

Co-authored-by: Patrick Cloke <[email protected]>
    @clokep
    David Robertson and clokep authored Sep 30, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6d543d6 View commit details

  2. Revert "Update mypy and mypy-zope (#13925)" 

    This reverts commit 6d543d6.
    David Robertson committed Sep 30, 2022

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    8e52cb0 View commit details

  3. Update mypy and mypy-zope, attempt 3 (#13993) 

    Co-authored-by: Patrick Cloke <[email protected]>
    @clokep
    David Robertson and clokep authored Sep 30, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    285d725 View commit details

  4. Skip filtering during push if there are no push actions (#13992)

    @erikjohnston
    erikjohnston authored Sep 30, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    535f8c8 View commit details

  5. Clarifications in user directory for users who share rooms tracking (#… 

    …13966)

Spawned while working on [`get_users_in_room` mis-uses](#13958 (comment)) and thinking we could use `get_local_users_in_room` here but we can't.

From first glance, it seemed like this was only using local users from all of the `is_mine_id(user_id)` checks but I see that it does actually use remote users. Just making things a little more clear here what it does and mentions remote users so maybe that will be more obvious in the future.
    @MadLittleMods
    MadLittleMods authored Sep 30, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad4c14e View commit details

Commits on Oct 1, 2022

  1. Fix get_users_in_room mis-use in `transfer_room_state_on_room_upgra… 

    …de` (#13960)

Spawning from looking into `get_users_in_room` while investigating #13942 (comment).

See #13575 (comment) for the original exploration around finding `get_users_in_room` mis-uses.

Related to the following PRs where we also cleaned up some `get_users_in_room` mis-uses:

 - #13605
 - #13608
 - #13606
 - #13958
    @MadLittleMods
    MadLittleMods authored Oct 1, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a52c40e View commit details

Commits on Oct 3, 2022

  1. Revert the general exception recording introduced in #13814 (#13969) 

    * Maybe not catch all errors to avoid things in the nature-of CancelledError

See #13815 (comment)

* Remove general exception tracking

* Add changelog
    @MadLittleMods
    MadLittleMods authored Oct 3, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2769ef4 View commit details

  2. Always build Rust extension in release mode (#14009) 

    Fixes #13990
    @erikjohnston
    erikjohnston authored Oct 3, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    343038c View commit details

  3. Protoype automatic changelogs for dependabot PRs (#13998)

    David Robertson authored Oct 3, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a441c4 View commit details

  4. Bump actions/checkout from 2 to 3 

    Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Oct 3, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6413bcd View commit details
23 changes: 23 additions & 0 deletions .github/workflows/dependabot_changelog.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Write changelog for dependabot PR
on:
pull_request:
types:
- opened

jobs:
add-changelog:
runs-on: 'ubuntu-latest'
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
- name: Write, commit and push changelog
run: |
echo "${{ github.event.pull_request.title }}." > "changelog.d/${{ github.event.pull_request.number }}".docker
git add changelog.d
git config user.email "github-actions[bot]@users.noreply.github.com"
git config user.name "GitHub Actions"
git commit -m "Changelog"
git push
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
name: GitHub Pages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup mdbook
uses: peaceiris/actions-mdbook@4b5ef36b314c2599664ca107bb8c02412548d79d # v1.1.14
12 changes: 6 additions & 6 deletions .github/workflows/latest_deps.yml
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ jobs:
mypy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
@@ -59,7 +59,7 @@ jobs:
postgres-version: "14"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
@@ -133,7 +133,7 @@ jobs:
BLACKLIST: ${{ matrix.workers && 'synapse-blacklist-with-workers' }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
@@ -182,8 +182,8 @@ jobs:
database: Postgres

steps:
- name: Run actions/checkout@v2 for synapse
uses: actions/checkout@v2
- name: Run actions/checkout@v3 for synapse
uses: actions/checkout@v3
with:
path: synapse

@@ -210,7 +210,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: JasonEtco/create-an-issue@5d9504915f79f9cc6d791934b8ef34f2353dd74d # v2.5.0, 2020-12-06
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/release-artifacts.yml
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
name: "Calculate list of debian distros"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
- id: set-distros
run: |
@@ -49,7 +49,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: src

34 changes: 17 additions & 17 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ jobs:
check-sampleconfig:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
- uses: matrix-org/setup-python-poetry@v1
with:
@@ -41,7 +41,7 @@ jobs:
check-schema-delta:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
- run: "pip install 'click==8.1.1' 'GitPython>=3.1.20'"
- run: scripts-dev/check_schema_delta.py --force-colors
@@ -54,15 +54,15 @@ jobs:
lint-crlf:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Check line endings
run: scripts-dev/check_line_terminators.sh

lint-newsfile:
if: ${{ github.base_ref == 'develop' || contains(github.base_ref, 'release-') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
@@ -75,7 +75,7 @@ jobs:
lint-pydantic:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: matrix-org/setup-python-poetry@v1
@@ -89,7 +89,7 @@ jobs:
if: ${{ needs.changes.outputs.rust == 'true' }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
@@ -107,7 +107,7 @@ jobs:
if: ${{ needs.changes.outputs.rust == 'true' }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
@@ -140,7 +140,7 @@ jobs:
needs: linting-done
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
- id: get-matrix
run: .ci/scripts/calculate_jobs.py
@@ -157,7 +157,7 @@ jobs:
job: ${{ fromJson(needs.calculate-test-jobs.outputs.trial_test_matrix) }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: sudo apt-get -qq install xmlsec1
- name: Set up PostgreSQL ${{ matrix.job.postgres-version }}
if: ${{ matrix.job.postgres-version }}
@@ -199,7 +199,7 @@ jobs:
needs: linting-done
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
@@ -270,7 +270,7 @@ jobs:
extras: ["all"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# Install libs necessary for PyPy to build binary wheels for dependencies
- run: sudo apt-get -qq install xmlsec1 libxml2-dev libxslt-dev
- uses: matrix-org/setup-python-poetry@v1
@@ -313,7 +313,7 @@ jobs:
job: ${{ fromJson(needs.calculate-test-jobs.outputs.sytest_test_matrix) }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Prepare test blacklist
run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers

@@ -361,7 +361,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: sudo apt-get -qq install xmlsec1 postgresql-client
- uses: matrix-org/setup-python-poetry@v1
with:
@@ -402,7 +402,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: sudo apt-get -qq install xmlsec1 postgresql-client
- uses: matrix-org/setup-python-poetry@v1
with:
@@ -444,8 +444,8 @@ jobs:
database: Postgres

steps:
- name: Run actions/checkout@v2 for synapse
uses: actions/checkout@v2
- name: Run actions/checkout@v3 for synapse
uses: actions/checkout@v3
with:
path: synapse

@@ -473,7 +473,7 @@ jobs:
- changes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
12 changes: 6 additions & 6 deletions .github/workflows/twisted_trunk.yml
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
@@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: sudo apt-get -qq install xmlsec1

- name: Install Rust
@@ -81,7 +81,7 @@ jobs:
- ${{ github.workspace }}:/src

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
@@ -138,8 +138,8 @@ jobs:
database: Postgres

steps:
- name: Run actions/checkout@v2 for synapse
uses: actions/checkout@v2
- name: Run actions/checkout@v3 for synapse
uses: actions/checkout@v3
with:
path: synapse

@@ -177,7 +177,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: JasonEtco/create-an-issue@5d9504915f79f9cc6d791934b8ef34f2353dd74d # v2.5.0, 2020-12-06
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions build_rust.py
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,9 @@ def build(setup_kwargs: Dict[str, Any]) -> None:
path=cargo_toml_path,
binding=Binding.PyO3,
py_limited_api=True,
# We force always building in release mode, as we can't tell the
# difference between using `poetry` in development vs production.
debug=False,
)
setup_kwargs.setdefault("rust_extensions", []).append(extension)
setup_kwargs["zip_safe"] = False
1 change: 1 addition & 0 deletions changelog.d/13925.misc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update mypy (0.950 -> 0.981) and mypy-zope (0.3.7 -> 0.3.11).
1 change: 1 addition & 0 deletions changelog.d/13960.misc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use dedicated `get_local_users_in_room(room_id)` function to find local users when calculating users to copy over during a room upgrade.
1 change: 1 addition & 0 deletions changelog.d/13966.misc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Refactor language in user directory `_track_user_joined_room` code to make it more clear that we use both local and remote users.
1 change: 1 addition & 0 deletions changelog.d/13969.misc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Revert catch-all exceptions being recorded as event pull attempt failures (only handle what we know about).
1 change: 1 addition & 0 deletions changelog.d/13992.misc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Speed up calculating push actions in large rooms.
1 change: 1 addition & 0 deletions changelog.d/13993.misc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update mypy (0.950 -> 0.981) and mypy-zope (0.3.7 -> 0.3.11).
1 change: 1 addition & 0 deletions changelog.d/13998.misc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prototype a workflow to automatically add changelogs to dependabot PRs.
1 change: 1 addition & 0 deletions changelog.d/14009.bugfix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug where Rust extension wasn't built in `release` mode when using `poetry install`.
Loading