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

Commit 7d57414

Browse files
author
David Robertson
committed
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
1 parent 211becb commit 7d57414

11 files changed

+3033
-400
lines changed

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# things to include
55
!docker
66
!synapse
7-
!MANIFEST.in
87
!README.rst
9-
!setup.py
108

119
**/__pycache__

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ _trial_temp*/
1515
.DS_Store
1616
__pycache__/
1717

18+
# We do want the poetry lockfile. TODO: is there a good reason for ignoring
19+
# '*.lock' above? If not, let's nuke it.
20+
!poetry.lock
21+
1822
# stuff that is likely to exist when you run a server locally
1923
/*.db
2024
/*.log

MANIFEST.in

Lines changed: 0 additions & 54 deletions
This file was deleted.

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN \
4646
&& rm -rf /var/lib/apt/lists/*
4747

4848
# Copy just what we need to pip install
49-
COPY MANIFEST.in README.rst setup.py /synapse/
49+
COPY MANIFEST.in README.rst /synapse/
5050
COPY synapse/__init__.py /synapse/synapse/__init__.py
5151
COPY synapse/python_dependencies.py /synapse/synapse/python_dependencies.py
5252

mypy.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ no_implicit_optional = True
1212

1313
files =
1414
scripts-dev/,
15-
setup.py,
1615
synapse/,
1716
tests/
1817

0 commit comments

Comments
 (0)