asyncdbus 0.7.2__tar.gz → 0.8.0__tar.gz

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/Makefile

@@ -30,7 +30,7 @@ clean:
 	rm -rf `find -type d -name __pycache__`
 
 publish:
-	python3 setup.py sdist
+	python3 -m build --sdist
 	twine upload dist/${PYPI}-$(shell git describe --tags --exact-match).tar.gz
 	#python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
 
@@ -45,8 +45,6 @@ all: format lint test
 pypi:   tagged
 	if test -f dist/${PYPI}-$(shell git describe --tags --exact-match).tar.gz ; then \
 		echo "Source package exists."; \
-	elif test -f setup.py ; then \
-		python3 setup.py sdist bdist_wheel ; \
 	else \
 		python3 -mbuild -snw ; \
 	fi

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/PKG-INFO

@@ -1,43 +1,27 @@
 Metadata-Version: 2.4
 Name: asyncdbus
-Version: 0.7.2
+Version: 0.8.0
 Summary: A zero-dependency async DBus library
-Home-page: https://github.com/M-o-a-T/asyncdbus
-Author: Matthias Urlichs
-Author-email: matthias@urlichs.de
-License: MIT
-Classifier: Development Status :: 3 - Alpha
+Author-email: Matthias Urlichs <matthias@urlichs.de>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/M-o-a-T/asyncdbus
+Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: X11 Applications
 Classifier: Environment :: X11 Applications :: Gnome
 Classifier: Topic :: Desktop Environment :: Gnome
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Framework :: AsyncIO
 Classifier: Framework :: Trio
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Typing :: Typed
-Requires-Python: >=3.7.0
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: anyio>=3
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
+Requires-Dist: anyio>=4
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
 
 # asyncdbus
 

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/asyncdbus/__init__.py

@@ -10,7 +10,7 @@ from .message import Message
 from .message_bus import MessageBus
 from .proxy_object import ProxyObject, ProxyInterface
 from . import service
-from .signature import SignatureType, SignatureTree, Variant
+from .signature import SignatureType, SignatureTree, Variant, DbusType
 from .validators import (is_bus_name_valid, is_object_path_valid, is_interface_name_valid,
                          is_member_name_valid, assert_bus_name_valid, assert_object_path_valid,
                          assert_interface_name_valid, assert_member_name_valid)

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/asyncdbus/message_bus.py

@@ -994,7 +994,7 @@ class MessageBus:
                     sock.setblocking(False)
                     sock.connect(filename)
                 except (BlockingIOError, InterruptedError):
-                    await anyio.wait_socket_writable(sock)
+                    await anyio.wait_writable(sock)
                     e = sock.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
                     if e:
                         if err is None:
@@ -1020,7 +1020,7 @@ class MessageBus:
                     sock = socket.create_connection((ip_addr, ip_port))
                     sock.setblocking(False)
                 except (BlockingIOError, InterruptedError):
-                    await anyio.wait_socket_writable(sock)
+                    await anyio.wait_writable(sock)
                     e = sock.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
                     if e:
                         if err is None:
@@ -1136,7 +1136,7 @@ class MessageBus:
         task_status.started()
         while True:
             # data = await self._sock.receive()
-            await anyio.wait_socket_readable(self._sock)
+            await anyio.wait_readable(self._sock)
             if self._sock is None:
                 return
             data, aux, *_ = self._sock.recvmsg(8192, 4096)
@@ -1154,7 +1154,7 @@ class MessageBus:
             buf = memoryview(buf)
             done = 0
             while done < len(buf) or (unix_fds and self._negotiate_unix_fd):
-                await anyio.wait_socket_writable(self._sock)
+                await anyio.wait_writable(self._sock)
                 if self._sock is None:
                     raise EOFError
                 if unix_fds and self._negotiate_unix_fd:
@@ -1171,7 +1171,7 @@ class MessageBus:
     async def _auth_readline(self):
         buf = b''
         while buf[-2:] != b'\r\n':
-            await anyio.wait_socket_readable(self._sock)
+            await anyio.wait_readable(self._sock)
             data = self._sock.recv(1024)
             if not data:
                 raise EOFError
@@ -1179,7 +1179,7 @@ class MessageBus:
         return buf[:-2].decode()
 
     async def _authenticate(self):
-        await anyio.wait_socket_writable(self._sock)
+        await anyio.wait_writable(self._sock)
         done = self._sock.send(b'\0')
         if not done:
             raise EOFError
@@ -1189,13 +1189,13 @@ class MessageBus:
         if first_line is not None:
             if not isinstance(first_line, str):
                 raise AuthError('authenticator response is %r not str' % (first_line))
-            await anyio.wait_socket_writable(self._sock)
+            await anyio.wait_writable(self._sock)
             done = self._sock.send(Authenticator._format_line(first_line))
 
         while True:
             response = self._auth._receive_line(await self._auth_readline())
             if response is not None:
-                await anyio.wait_socket_writable(self._sock)
+                await anyio.wait_writable(self._sock)
                 done = self._sock.send(Authenticator._format_line(response))
             if response == 'BEGIN':
                 break

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/asyncdbus/service.py

@@ -6,7 +6,7 @@ from ._private.util import signature_contains_type, replace_fds_with_idx, replac
 
 from functools import wraps
 import inspect
-from typing import no_type_check_decorator, Dict, List, Any
+from typing import Dict, List, Any
 import copy
 
 
@@ -30,6 +30,8 @@ class _Method:
             sig = param.annotation
             if hasattr(sig, 'tree'):
                 sig = sig.tree.signature
+            if sig.startswith("DbusType[") and sig[-1]=="]":
+                sig= sig[9:-1]
             if sig and sig[0] in "'\"":
                 sig = sig[1:-1]
             in_signature += sig
@@ -88,7 +90,6 @@ def method(name: str = None, disabled: bool = False):
     if type(disabled) is not bool:
         raise TypeError('disabled must be a bool')
 
-    @no_type_check_decorator
     def decorator(fn):
         @wraps(fn)
         def wrapped(*args, **kwargs):
@@ -163,7 +164,6 @@ def signal(name: str = None, disabled: bool = False):
     if type(disabled) is not bool:
         raise TypeError('disabled must be a bool')
 
-    @no_type_check_decorator
     def decorator(fn):
         fn_name = name if name else fn.__name__
         signal = _Signal(fn, fn_name, disabled)
@@ -296,7 +296,6 @@ def dbus_property(access: PropertyAccess = PropertyAccess.READWRITE,
     if type(disabled) is not bool:
         raise TypeError('disabled must be a bool')
 
-    @no_type_check_decorator
     def decorator(fn):
         options = {'name': name, 'access': access, 'disabled': disabled}
         return _Property(fn, options=options)

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/asyncdbus/signature.py

@@ -5,6 +5,13 @@ from typing import Any, List as _List, Union, Tuple as _Tuple, Dict as _Dict, Ge
 from functools import lru_cache
 
 
+class DbusType:
+    """
+    A wrapper so our signatures work with the rest of Python's typing
+    infrastructure.
+    """
+    pass
+
 class SignatureType:
     """A class that represents a single complete type within a signature.
 
@@ -59,6 +66,8 @@ class SignatureType:
     def _parse_next(signature):
         if not signature or signature in ('""',"''"):
             return (None, '')
+        if signature.startswith("DbusType[") and signature[-1]=="]":
+            signature = signature[9:-1]
         if signature[0] in "'\"":
             signature = signature[1:-1]
 

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/asyncdbus.egg-info/PKG-INFO

@@ -1,43 +1,27 @@
 Metadata-Version: 2.4
 Name: asyncdbus
-Version: 0.7.2
+Version: 0.8.0
 Summary: A zero-dependency async DBus library
-Home-page: https://github.com/M-o-a-T/asyncdbus
-Author: Matthias Urlichs
-Author-email: matthias@urlichs.de
-License: MIT
-Classifier: Development Status :: 3 - Alpha
+Author-email: Matthias Urlichs <matthias@urlichs.de>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/M-o-a-T/asyncdbus
+Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: X11 Applications
 Classifier: Environment :: X11 Applications :: Gnome
 Classifier: Topic :: Desktop Environment :: Gnome
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Framework :: AsyncIO
 Classifier: Framework :: Trio
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Typing :: Typed
-Requires-Python: >=3.7.0
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: anyio>=3
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
+Requires-Dist: anyio>=4
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
 
 # asyncdbus
 

{asyncdbus-0.7.2 → asyncdbus-0.8.0}/asyncdbus.egg-info/SOURCES.txt

@@ -8,10 +8,10 @@ LICENSE
 MANIFEST.in
 Makefile
 README.md
+pyproject.toml
 pytest.ini
 requirements-dev.txt
 requirements.txt
-setup.py
 asyncdbus/__init__.py
 asyncdbus/auth.py
 asyncdbus/constants.py

asyncdbus-0.8.0/asyncdbus.egg-info/requires.txt

@@ -0,0 +1 @@
+anyio>=4

asyncdbus-0.8.0/pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+requires = ["setuptools>=77", "setuptools-scm>=8"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "asyncdbus"
+description = "A zero-dependency async DBus library"
+readme = "README.md"
+license = "MIT"
+license-files = ["LICENSE"]
+authors = [{ name = "Matthias Urlichs", email = "matthias@urlichs.de" }]
+requires-python = ">=3.10"
+dependencies = ["anyio >= 4"]
+dynamic = ["version"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: X11 Applications",
+    "Environment :: X11 Applications :: Gnome",
+    "Topic :: Desktop Environment :: Gnome",
+    "Topic :: Software Development :: Embedded Systems",
+    "Framework :: AsyncIO",
+    "Framework :: Trio",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Typing :: Typed",
+]
+
+[project.urls]
+Homepage = "https://github.com/M-o-a-T/asyncdbus"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = ["asyncdbus*"]
+
+[tool.setuptools.package-data]
+asyncdbus = ["py.typed"]
+
+[tool.setuptools_scm]
+version_scheme = "guess-next-dev"
+local_scheme = "dirty-tag"

asyncdbus-0.7.2/asyncdbus.egg-info/requires.txt

@@ -1 +0,0 @@
-anyio>=3

asyncdbus-0.7.2/setup.py

@@ -1,71 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import io
-import os
-
-from setuptools import setup
-
-# Package meta-data.
-DESCRIPTION = 'A zero-dependency async DBus library'
-REQUIRES_PYTHON = '>=3.7.0'
-
-# What packages are required for this module to be executed?
-REQUIRED = ["anyio>=3"]
-
-# What packages are optional?
-EXTRAS = {}
-
-# The rest you shouldn't have to touch too much :)
-# ------------------------------------------------
-# Except, perhaps the License and Trove Classifiers!
-# If you do change the License, remember to change the Trove Classifier for that!
-
-here = os.path.abspath(os.path.dirname(__file__))
-
-__title__ = 'asyncdbus'
-__description__ = 'A zero-dependency async DBus library'
-__url__ = 'https://github.com/M-o-a-T/asyncdbus'
-__author__ = 'Matthias Urlichs'
-__author_email__ = 'matthias@urlichs.de'
-__license__ = 'MIT'
-__copyright__ = 'Copyright 2019 Tony Crisci, 2021 Matthias Urlichs'
-
-with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
-    long_description = '\n' + f.read()
-
-setup(
-    name=__title__,
-    use_scm_version={"version_scheme": "guess-next-dev", "local_scheme": "dirty-tag"},
-    setup_requires=["setuptools_scm"],
-    description=DESCRIPTION,
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    author=__author__,
-    author_email=__author_email__,
-    python_requires=REQUIRES_PYTHON,
-    url=__url__,
-    packages=["asyncdbus"],
-    install_requires=REQUIRED,
-    extras_require=EXTRAS,
-    include_package_data=True,
-    license='MIT',
-    classifiers=[
-        # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
-        'Development Status :: 3 - Alpha',
-        'Environment :: X11 Applications',
-        'Environment :: X11 Applications :: Gnome',
-        'Topic :: Desktop Environment :: Gnome',
-        'Topic :: Software Development :: Embedded Systems',
-        'Framework :: AsyncIO',
-        'Framework :: Trio',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
-        'Typing :: Typed'
-    ])