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
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8dc02f9
DEBUG: always run twisted trunk; don't raise bugs
Mar 30, 2022
211becb
DEBUG: build all debs
Mar 30, 2022
7d57414
DEPS: Specify deps in pyproject.toml
Feb 18, 2022
53e804f
DEPS: Add missing dependency on importlib_metadata
Mar 29, 2022
c50da48
DEPS: Dirty duplication to make `all` work
Mar 4, 2022
87ecb33
BUILDS: `poetry` in Synapse docker image
Mar 8, 2022
d820ff2
BUILDS: `poetry` in deb virtualenvs
H-Shay Mar 30, 2022
e53e99e
CI: Use common linting workflow
Mar 3, 2022
3de49f4
CI: Fix the "main" trial test runs
Mar 4, 2022
03e5c93
CI: Fix the portdb job to run under poetry
Mar 9, 2022
6ab6f61
CI: Fix the export-data job to run under poetry
Mar 9, 2022
0d8a54a
CI: Fix the olddeps job to run under poetry
Mar 10, 2022
d3386af
CI: Fix Twisted trunk to run under poetry
squahtx Mar 14, 2022
b03ffaa
Changelog
Feb 21, 2022
5f8db3e
DOCS: recommend poetry where appropriate
Mar 30, 2022
680dbc8
Undebug various changes
Mar 30, 2022
a3fb2b8
Fix typos spotted by Sean
Mar 31, 2022
4c780ab
Batch of suggestsion from Brendan, part 1
Mar 31, 2022
8469bd8
Batch of suggestsion from Brendan, part 2
Mar 31, 2022
5dc21d9
Recommend synapse_homeserver entrypoint in README
Mar 31, 2022
e60c8f3
More clearly explain which extras are omitted from `all`.
Mar 31, 2022
6fd43c4
Explain where requirements.txt comes from.
Mar 31, 2022
45a23c0
olddeps: echo patch to confirm sed is sensible
Mar 31, 2022
e96fd31
Olddeps: leave a TODO for caret bounds
Mar 31, 2022
d2df831
Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry
Mar 31, 2022
0af56b8
Olddeps: cat patched pyproject, instead of diffing
Apr 1, 2022
2ff7fbf
Docker: `pip install --user poetry` path fix
Apr 1, 2022
18f91a7
Only upgrade pip in dhvirtualenv
Apr 4, 2022
f0d72ac
Install and run poetry export in dpkg-buildpackage
callahad Apr 6, 2022
60a6671
Merge branch 'develop' into dmr/pyproject-poetry
callahad Apr 6, 2022
a653c20
Bump locked version of prometheus-client to 0.14.0
callahad Apr 7, 2022
232a270
Clarify a CI workflow step for Twisted trunk
callahad Apr 7, 2022
9225764
Inline CI steps for installing Twisted trunk
callahad Apr 7, 2022
99892e7
Merge branch 'develop' into dmr/pyproject-poetry
callahad Apr 7, 2022
872dfb8
Minor tweaks to comments in response to reviews
callahad Apr 7, 2022
379944c
Merge branch 'develop' into dmr/pyproject-poetry
callahad Apr 8, 2022
fb611f1
Merge branch 'develop' into dmr/pyproject-poetry
Apr 11, 2022
0cf4705
Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry
Apr 12, 2022
988ff61
Include some dockerfile changes from develop
Apr 14, 2022
badd5cf
We don't need README to export
Apr 14, 2022
443b94f
Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry
Apr 14, 2022
cbdbcb0
Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry
Apr 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# things to include
!docker
!synapse
!MANIFEST.in
!README.rst
!setup.py

**/__pycache__
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ _trial_temp*/
.DS_Store
__pycache__/

# We do want the poetry lockfile. TODO: is there a good reason for ignoring
# '*.lock' above? If not, let's nuke it.
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
!poetry.lock

# stuff that is likely to exist when you run a server locally
/*.db
/*.log
Expand Down
54 changes: 0 additions & 54 deletions MANIFEST.in

This file was deleted.

2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN \
&& rm -rf /var/lib/apt/lists/*

# Copy just what we need to pip install
COPY MANIFEST.in README.rst setup.py /synapse/
COPY MANIFEST.in README.rst /synapse/
babolivier marked this conversation as resolved.
Show resolved Hide resolved
COPY synapse/__init__.py /synapse/synapse/__init__.py
COPY synapse/python_dependencies.py /synapse/synapse/python_dependencies.py

Expand Down
1 change: 0 additions & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ no_implicit_optional = True

files =
scripts-dev/,
setup.py,
synapse/,
tests/

Expand Down
Loading