Skip to content

Commit

Permalink
Switched to Black for code formatting and updated type annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
agronholm committed May 12, 2022
1 parent b691039 commit c1bd3b4
Show file tree
Hide file tree
Showing 58 changed files with 3,560 additions and 1,971 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ repos:
- id: pyupgrade
args: [ "--py36-plus", "--keep-mock" ]

- repo: https://github.com/pre-commit/mirrors-autopep8
rev: v1.6.0
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: autopep8
- id: black

- repo: https://github.com/pycqa/isort
rev: 5.10.1
Expand Down
37 changes: 17 additions & 20 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,31 @@
from packaging.version import parse

extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx_autodoc_typehints'
"sphinx.ext.autodoc",
"sphinx.ext.intersphinx",
"sphinx_autodoc_typehints",
]

templates_path = ['_templates']
source_suffix = '.rst'
master_doc = 'index'
project = 'AnyIO'
author = 'Alex Grönholm'
copyright = '2018, ' + author
templates_path = ["_templates"]
source_suffix = ".rst"
master_doc = "index"
project = "AnyIO"
author = "Alex Grönholm"
copyright = "2018, " + author

v = parse(get_version('anyio'))
v = parse(get_version("anyio"))
version = v.base_version
release = v.public

language = None

exclude_patterns = ['_build']
pygments_style = 'sphinx'
autodoc_default_options = {
'members': True,
'show-inheritance': True
}
exclude_patterns = ["_build"]
pygments_style = "sphinx"
autodoc_default_options = {"members": True, "show-inheritance": True}
todo_include_todos = False

html_theme = 'sphinx_rtd_theme'
html_static_path = ['_static']
htmlhelp_basename = 'anyiodoc'
html_theme = "sphinx_rtd_theme"
html_static_path = ["_static"]
htmlhelp_basename = "anyiodoc"

intersphinx_mapping = {'python': ('https://docs.python.org/3/', None)}
intersphinx_mapping = {"python": ("https://docs.python.org/3/", None)}
1 change: 1 addition & 0 deletions docs/versionhistory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ This library adheres to `Semantic Versioning 2.0 <http:https://semver.org/>`_.
**UNRELEASED**

- Fixed ``TypeError`` in ``get_current_task()`` on asyncio when using a custom ``Task`` factory
- Updated type annotations on ``open_process()`` to accept bytes and sequences of bytes

**3.5.0**

Expand Down
8 changes: 2 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ version_scheme = "post-release"
local_scheme = "dirty-tag"

[tool.isort]
src_paths = ["src"]
skip_gitignore = true
line_length = 99
multi_line_output = 4

[tool.autopep8]
max_line_length = 99
profile = "black"

[tool.flake8]
max-line-length = 99
ignore = ["E203", "W503"]

[tool.mypy]
python_version = "3.9"
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
from setuptools import setup

setup(
use_scm_version=True,
setup_requires=['setuptools_scm']
)
setup(use_scm_version=True, setup_requires=["setuptools_scm"])
227 changes: 139 additions & 88 deletions src/anyio/__init__.py
Original file line number Diff line number Diff line change
@@ -1,116 +1,167 @@
__all__ = (
'maybe_async',
'maybe_async_cm',
'run',
'sleep',
'sleep_forever',
'sleep_until',
'current_time',
'get_all_backends',
'get_cancelled_exc_class',
'BrokenResourceError',
'BrokenWorkerProcess',
'BusyResourceError',
'ClosedResourceError',
'DelimiterNotFound',
'EndOfStream',
'ExceptionGroup',
'IncompleteRead',
'TypedAttributeLookupError',
'WouldBlock',
'AsyncFile',
'Path',
'open_file',
'wrap_file',
'aclose_forcefully',
'open_signal_receiver',
'connect_tcp',
'connect_unix',
'create_tcp_listener',
'create_unix_listener',
'create_udp_socket',
'create_connected_udp_socket',
'getaddrinfo',
'getnameinfo',
'wait_socket_readable',
'wait_socket_writable',
'create_memory_object_stream',
'run_process',
'open_process',
'create_lock',
'CapacityLimiter',
'CapacityLimiterStatistics',
'Condition',
'ConditionStatistics',
'Event',
'EventStatistics',
'Lock',
'LockStatistics',
'Semaphore',
'SemaphoreStatistics',
'create_condition',
'create_event',
'create_semaphore',
'create_capacity_limiter',
'open_cancel_scope',
'fail_after',
'move_on_after',
'current_effective_deadline',
'TASK_STATUS_IGNORED',
'CancelScope',
'create_task_group',
'TaskInfo',
'get_current_task',
'get_running_tasks',
'wait_all_tasks_blocked',
'run_sync_in_worker_thread',
'run_async_from_thread',
'run_sync_from_thread',
'current_default_worker_thread_limiter',
'create_blocking_portal',
'start_blocking_portal',
'typed_attribute',
'TypedAttributeSet',
'TypedAttributeProvider'
"maybe_async",
"maybe_async_cm",
"run",
"sleep",
"sleep_forever",
"sleep_until",
"current_time",
"get_all_backends",
"get_cancelled_exc_class",
"BrokenResourceError",
"BrokenWorkerProcess",
"BusyResourceError",
"ClosedResourceError",
"DelimiterNotFound",
"EndOfStream",
"ExceptionGroup",
"IncompleteRead",
"TypedAttributeLookupError",
"WouldBlock",
"AsyncFile",
"Path",
"open_file",
"wrap_file",
"aclose_forcefully",
"open_signal_receiver",
"connect_tcp",
"connect_unix",
"create_tcp_listener",
"create_unix_listener",
"create_udp_socket",
"create_connected_udp_socket",
"getaddrinfo",
"getnameinfo",
"wait_socket_readable",
"wait_socket_writable",
"create_memory_object_stream",
"run_process",
"open_process",
"create_lock",
"CapacityLimiter",
"CapacityLimiterStatistics",
"Condition",
"ConditionStatistics",
"Event",
"EventStatistics",
"Lock",
"LockStatistics",
"Semaphore",
"SemaphoreStatistics",
"create_condition",
"create_event",
"create_semaphore",
"create_capacity_limiter",
"open_cancel_scope",
"fail_after",
"move_on_after",
"current_effective_deadline",
"TASK_STATUS_IGNORED",
"CancelScope",
"create_task_group",
"TaskInfo",
"get_current_task",
"get_running_tasks",
"wait_all_tasks_blocked",
"run_sync_in_worker_thread",
"run_async_from_thread",
"run_sync_from_thread",
"current_default_worker_thread_limiter",
"create_blocking_portal",
"start_blocking_portal",
"typed_attribute",
"TypedAttributeSet",
"TypedAttributeProvider",
)

from typing import Any

from ._core._compat import maybe_async, maybe_async_cm
from ._core._eventloop import (
current_time, get_all_backends, get_cancelled_exc_class, run, sleep, sleep_forever,
sleep_until)
current_time,
get_all_backends,
get_cancelled_exc_class,
run,
sleep,
sleep_forever,
sleep_until,
)
from ._core._exceptions import (
BrokenResourceError, BrokenWorkerProcess, BusyResourceError, ClosedResourceError,
DelimiterNotFound, EndOfStream, ExceptionGroup, IncompleteRead, TypedAttributeLookupError,
WouldBlock)
BrokenResourceError,
BrokenWorkerProcess,
BusyResourceError,
ClosedResourceError,
DelimiterNotFound,
EndOfStream,
ExceptionGroup,
IncompleteRead,
TypedAttributeLookupError,
WouldBlock,
)
from ._core._fileio import AsyncFile, Path, open_file, wrap_file
from ._core._resources import aclose_forcefully
from ._core._signals import open_signal_receiver
from ._core._sockets import (
connect_tcp, connect_unix, create_connected_udp_socket, create_tcp_listener, create_udp_socket,
create_unix_listener, getaddrinfo, getnameinfo, wait_socket_readable, wait_socket_writable)
connect_tcp,
connect_unix,
create_connected_udp_socket,
create_tcp_listener,
create_udp_socket,
create_unix_listener,
getaddrinfo,
getnameinfo,
wait_socket_readable,
wait_socket_writable,
)
from ._core._streams import create_memory_object_stream
from ._core._subprocesses import open_process, run_process
from ._core._synchronization import (
CapacityLimiter, CapacityLimiterStatistics, Condition, ConditionStatistics, Event,
EventStatistics, Lock, LockStatistics, Semaphore, SemaphoreStatistics, create_capacity_limiter,
create_condition, create_event, create_lock, create_semaphore)
CapacityLimiter,
CapacityLimiterStatistics,
Condition,
ConditionStatistics,
Event,
EventStatistics,
Lock,
LockStatistics,
Semaphore,
SemaphoreStatistics,
create_capacity_limiter,
create_condition,
create_event,
create_lock,
create_semaphore,
)
from ._core._tasks import (
TASK_STATUS_IGNORED, CancelScope, create_task_group, current_effective_deadline, fail_after,
move_on_after, open_cancel_scope)
from ._core._testing import TaskInfo, get_current_task, get_running_tasks, wait_all_tasks_blocked
TASK_STATUS_IGNORED,
CancelScope,
create_task_group,
current_effective_deadline,
fail_after,
move_on_after,
open_cancel_scope,
)
from ._core._testing import (
TaskInfo,
get_current_task,
get_running_tasks,
wait_all_tasks_blocked,
)
from ._core._typedattr import TypedAttributeProvider, TypedAttributeSet, typed_attribute

# Re-exported here, for backwards compatibility
# isort: off
from .to_thread import current_default_worker_thread_limiter, run_sync_in_worker_thread
from .from_thread import (
create_blocking_portal, run_async_from_thread, run_sync_from_thread, start_blocking_portal)
create_blocking_portal,
run_async_from_thread,
run_sync_from_thread,
start_blocking_portal,
)

# Re-export imports so they look like they live directly in this package
key: str
value: Any
for key, value in list(locals().items()):
if getattr(value, '__module__', '').startswith('anyio.'):
if getattr(value, "__module__", "").startswith("anyio."):
value.__module__ = __name__
Loading

0 comments on commit c1bd3b4

Please sign in to comment.