summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-04-20 19:16:49 +0100
committerGitHub <noreply@github.com>2022-04-20 18:16:49 +0000
commit09b4f6e46d3cbc3d93c52a7b76db17f178167b3e (patch)
tree78eeedc25000b585c14708f41df9be385402a085
parentMerge branch 'master' into develop (diff)
downloadsynapse-09b4f6e46d3cbc3d93c52a7b76db17f178167b3e.tar.xz
Remove leftover references to setup.py (#12514)
* Remove leftover references to setup.py

Missed in #12478.

* Changelog
-rw-r--r--changelog.d/12514.misc1
-rw-r--r--mypy.ini4
-rwxr-xr-xscripts-dev/lint.sh2
3 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/12514.misc b/changelog.d/12514.misc
new file mode 100644

index 0000000000..061a604a1e --- /dev/null +++ b/changelog.d/12514.misc
@@ -0,0 +1 @@ +Use poetry-core instead of setuptools to build wheels. diff --git a/mypy.ini b/mypy.ini
index b2c3b1524c..a663bf6975 100644 --- a/mypy.ini +++ b/mypy.ini
@@ -233,8 +233,8 @@ disallow_untyped_defs = True ;; The `typeshed` project maintains stubs here: ;; https://github.com/python/typeshed/tree/master/stubs ;; and for each package `foo` there's a corresponding `types-foo` package on PyPI, -;; which we can pull in as a dev dependency by adding to `setup.py`'s -;; `CONDITIONAL_REQUIREMENTS["mypy"]` list. +;; which we can pull in as a dev dependency by adding to `pyproject.toml`'s +;; `[tool.poetry.dev-dependencies]` list. [mypy-authlib.*] ignore_missing_imports = True diff --git a/scripts-dev/lint.sh b/scripts-dev/lint.sh
index 91a704d982..377348b107 100755 --- a/scripts-dev/lint.sh +++ b/scripts-dev/lint.sh
@@ -91,7 +91,7 @@ else files=( "synapse" "docker" "tests" "scripts-dev" - "contrib" "setup.py" "synmark" "stubs" ".ci" + "contrib" "synmark" "stubs" ".ci" ) fi fi