summary refs log tree commit diff
diff options
context:
space:
mode:
authorShay <hillerys@element.io>2021-12-23 20:22:15 -0800
committerGitHub <noreply@github.com>2021-12-23 20:22:15 -0800
commitfcfe67578f70bb4f150b83cfad708f5bc0474c1e (patch)
treed261c90da64b3788b05d54e7fcec873c467effcd
parentFix mypy error with opentracing.tags. (#11622) (diff)
downloadsynapse-fcfe67578f70bb4f150b83cfad708f5bc0474c1e.tar.xz
Update to the current version of Black and run it on Synapse codebase (#11596)
* update black version

* run updated version of black on code

* newsfragment

* enumerate python versions
-rw-r--r--changelog.d/11596.misc1
-rw-r--r--pyproject.toml2
-rwxr-xr-xsetup.py2
-rw-r--r--synapse/logging/context.py1
-rw-r--r--synapse/util/caches/lrucache.py1
5 files changed, 3 insertions, 4 deletions
diff --git a/changelog.d/11596.misc b/changelog.d/11596.misc
new file mode 100644

index 0000000000..3064bc632d --- /dev/null +++ b/changelog.d/11596.misc
@@ -0,0 +1 @@ +Update black version and run it on all the files. \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml
index 8bca1fa4ef..963f149c6a 100644 --- a/pyproject.toml +++ b/pyproject.toml
@@ -35,7 +35,7 @@ showcontent = true [tool.black] -target-version = ['py36'] +target-version = ['py37', 'py38', 'py39', 'py310'] exclude = ''' ( diff --git a/setup.py b/setup.py
index e113da6782..fbb0133016 100755 --- a/setup.py +++ b/setup.py
@@ -96,7 +96,7 @@ CONDITIONAL_REQUIREMENTS["all"] = list(ALL_OPTIONAL_REQUIREMENTS) # We pin black so that our tests don't start failing on new releases. CONDITIONAL_REQUIREMENTS["lint"] = [ "isort==5.7.0", - "black==21.6b0", + "black==21.12b0", "flake8-comprehensions", "flake8-bugbear==21.3.2", "flake8", diff --git a/synapse/logging/context.py b/synapse/logging/context.py
index 25e78cc82f..d4ee893376 100644 --- a/synapse/logging/context.py +++ b/synapse/logging/context.py
@@ -68,7 +68,6 @@ try: def get_thread_resource_usage() -> "Optional[resource.struct_rusage]": return resource.getrusage(RUSAGE_THREAD) - except Exception: # If the system doesn't support resource.getrusage(RUSAGE_THREAD) then we # won't track resource usage. diff --git a/synapse/util/caches/lrucache.py b/synapse/util/caches/lrucache.py
index eb96f7e665..3f11a2f9dd 100644 --- a/synapse/util/caches/lrucache.py +++ b/synapse/util/caches/lrucache.py
@@ -69,7 +69,6 @@ try: sizer.exclude_refs((), None, "") return sizer.asizeof(val, limit=100 if recurse else 0) - except ImportError: def _get_size_of(val: Any, *, recurse: bool = True) -> int: