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

[WIP] Use Poetry to manage Synapse's dependencies #12337

Closed
wants to merge 42 commits into from
Closed

[WIP] Use Poetry to manage Synapse's dependencies #12337

wants to merge 42 commits into from

Commits on Mar 30, 2022

  1. DEBUG: always run twisted trunk; don't raise bugs

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    8dc02f9 View commit details
    Browse the repository at this point in the history

  2. DEBUG: build all debs

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    211becb View commit details
    Browse the repository at this point in the history

  3. DEPS: Specify deps in pyproject.toml 

    - Nuke python_dependencies and setup.py
- Allow commiting poetry.lock
- Initial lockfile pulling in the latest version of deps at the time of locking
    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    7d57414 View commit details
    Browse the repository at this point in the history

  4. DEPS: Add missing dependency on importlib_metadata 

    Missed in #12088. We got away with it because we were indirectly
importing it in other places. Without this, we encounter pain in `poetry
export`; and besides, we should be explicit about our direct
dependencies.
    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    53e804f View commit details
    Browse the repository at this point in the history

  5. DEPS: Dirty duplication to make all work 

    See comment in the toml file:

>  The duplication here is awful. I hate hate hate hate hate it.

I don't think that we're going to be adding many extras any time soon,
and I think this is the least bad option.
    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    c50da48 View commit details
    Browse the repository at this point in the history

  6. BUILDS: poetry in Synapse docker image

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    87ecb33 View commit details
    Browse the repository at this point in the history

  7. BUILDS: poetry in deb virtualenvs

    @H-Shay
    H-Shay authored and David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    d820ff2 View commit details
    Browse the repository at this point in the history

  8. CI: Use common linting workflow 

    After #12107 it's much easier for black, isort and flake8 to find the
scripts we want them to lint.
    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    e53e99e View commit details
    Browse the repository at this point in the history

  9. CI: Fix the "main" trial test runs

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    3de49f4 View commit details
    Browse the repository at this point in the history

  10. CI: Fix the portdb job to run under poetry

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    03e5c93 View commit details
    Browse the repository at this point in the history

  11. CI: Fix the export-data job to run under poetry

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    6ab6f61 View commit details
    Browse the repository at this point in the history

  12. CI: Fix the olddeps job to run under poetry

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    0d8a54a View commit details
    Browse the repository at this point in the history

  13. CI: Fix Twisted trunk to run under poetry 

    Signed-off-by: Sean Quah <seanq@element.io>
    @squahtx
    squahtx authored and David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    d3386af View commit details
    Browse the repository at this point in the history

  14. Changelog

    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    b03ffaa View commit details
    Browse the repository at this point in the history

  15. DOCS: recommend poetry where appropriate 

    In particular the documentaion for contributors should only advocate
poetry.

I am not thrilled at the propsect of now having N+1 installation
methods---but at the very least we ought to mention poetry here.
    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    5f8db3e View commit details
    Browse the repository at this point in the history

  16. Undebug various changes 

    - Stop always running twisted trunk on this branch
- Stop building all devs on this branch
- Run olddeps after linting
    David Robertson committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    680dbc8 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Fix typos spotted by Sean 

    Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
    @squahtx @babolivier
    3 people authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    a3fb2b8 View commit details
    Browse the repository at this point in the history

  2. Batch of suggestsion from Brendan, part 1 

    Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
    @babolivier
    David Robertson and babolivier authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    4c780ab View commit details
    Browse the repository at this point in the history

  3. Batch of suggestsion from Brendan, part 2 

    Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
    @babolivier
    David Robertson and babolivier authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    8469bd8 View commit details
    Browse the repository at this point in the history

  4. Recommend synapse_homeserver entrypoint in README

    David Robertson authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    5dc21d9 View commit details
    Browse the repository at this point in the history

  5. More clearly explain which extras are omitted from all. 

    Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
    @babolivier
    David Robertson and babolivier authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    e60c8f3 View commit details
    Browse the repository at this point in the history

  6. Explain where requirements.txt comes from.

    David Robertson committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    6fd43c4 View commit details
    Browse the repository at this point in the history

  7. olddeps: echo patch to confirm sed is sensible

    David Robertson committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    45a23c0 View commit details
    Browse the repository at this point in the history

  8. Olddeps: leave a TODO for caret bounds

    David Robertson committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    e96fd31 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry 

    Resolves conflicts from #12334 (merged to develop in 9a3f1f5)
    David Robertson committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    d2df831 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Olddeps: cat patched pyproject, instead of diffing

    David Robertson authored Apr 1, 2022
    Configuration menu
    Copy the full SHA
    0af56b8 View commit details
    Browse the repository at this point in the history

  2. Docker: pip install --user poetry path fix

    David Robertson committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    2ff7fbf View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Only upgrade pip in dhvirtualenv

    David Robertson committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    18f91a7 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Install and run poetry export in dpkg-buildpackage 

    Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    f0d72ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into dmr/pyproject-poetry 

    Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    60a6671 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2022

  1. Bump locked version of prometheus-client to 0.14.0 

    The typechecking fix in #12389 only works if your local copy of
prometheus-client is at least version 0.14. Otherwise, it fails with:

    synapse/metrics/_types.py:22: error: Module "prometheus_client.registry" has no attribute "Collector"  [attr-defined]

Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    a653c20 View commit details
    Browse the repository at this point in the history

  2. Clarify a CI workflow step for Twisted trunk 

    Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    232a270 View commit details
    Browse the repository at this point in the history

  3. Inline CI steps for installing Twisted trunk 

    Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    9225764 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into dmr/pyproject-poetry 

    Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    99892e7 View commit details
    Browse the repository at this point in the history

  5. Minor tweaks to comments in response to reviews 

    Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    872dfb8 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Merge branch 'develop' into dmr/pyproject-poetry 

    Signed-off-by: Dan Callahan <danc@element.io>
    @callahad
    callahad committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    379944c View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. Merge branch 'develop' into dmr/pyproject-poetry

    David Robertson authored Apr 11, 2022
    Configuration menu
    Copy the full SHA
    fb611f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2022

  1. Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry

    David Robertson committed Apr 12, 2022
    Configuration menu
    Copy the full SHA
    0cf4705 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. Include some dockerfile changes from develop 

    I think these may have been retained in merge confusion.
    David Robertson committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    988ff61 View commit details
    Browse the repository at this point in the history

  2. We don't need README to export 

    we did need it to `install` though, (I think?)
    David Robertson committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    badd5cf View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry

    David Robertson committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    443b94f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry

    David Robertson committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    cbdbcb0 View commit details
    Browse the repository at this point in the history