Merge branch 'master' into feat/base-classses

.gitignore

@@ -1,126 +1,32 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-/.vs/slnx.sqlite-journal
-/.vs/slnx.sqlite
-.vscode/settings.json
-.vscode/launch.json
-# Containers code
-./test/containers/code
-#coverga
-coverage_html
-#venvwin
-venvwin
+# Ignore all
+*
+!*/
+
+# Add metadata and build files
+!.gitignore
+!.dockerignore
+!**/Dockerfile
+!**/Makefile
+!**/pyproject.toml
+!**/requirements*
+!**/pdm.lock
+!**/README.md
+!**/.keep
+
+# Add Python code
+!**/*.py
+**/.*_cache
+**/__pycache__
+
+# Add configs and scripts (but not env!)
+!**/*.graphql
+!**/*.json
+!**/*.sql
+!**/*.yaml
+!**/*.yml
+!**/*.j2
+!**/*.env.default
+
+# Docs
+!docs/**
+docs/_build

CHANGELOG.md

@@ -8,11 +8,12 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 ### Added
 
+- Python 3.12 support.
 - `BaseJSONProtocol` and `BaseWebsocketTransport` classes for plain JSON over WebSockets and custom protocols.
 
 ### Other
 
-- `websockets` library updated to 11.0.3.
+- `websockets` library updated to 12.0.
 - Use faster `orjson` library for JSON deserialization.
 
 ## [0.2.0] - 2023-04-07

pyproject.toml

@@ -15,6 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
     "Typing :: Typed",
@@ -35,8 +36,8 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.8,<3.12"
-websockets = "^11.0.3"
+python = ">=3.8,<4"
+websockets = "^12.0"
 aiohttp = "^3.7.4"
 msgpack = "^1.0.2"
 orjson = "^3.9.0"
@@ -58,13 +59,13 @@ force_single_line = true
 
 [tool.black]
 line-length = 120
-target-version = ["py38", "py39", "py310", "py311"]
+target-version = ["py38", "py39", "py310", "py311", "py312"]
 skip-string-normalization = true
 
 [tool.ruff]
 line-length = 120
 ignore = ["E501", "B905"]
-target-version = "py311"
+target-version = "py312"
 extend-select = ["B", "C4", "Q"]  # todo: G, PTH, RET, RUF, S, TCH
 flake8-quotes = {inline-quotes = "single", multiline-quotes = "double"}
 

requirements.txt

@@ -1,11 +1,11 @@
-aiohttp==3.8.4 ; python_version >= "3.8" and python_version < "3.12"
-aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.12"
-async-timeout==4.0.2 ; python_version >= "3.8" and python_version < "3.12"
-attrs==23.1.0 ; python_version >= "3.8" and python_version < "3.12"
-charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "3.12"
-frozenlist==1.3.3 ; python_version >= "3.8" and python_version < "3.12"
-idna==3.4 ; python_version >= "3.8" and python_version < "3.12"
-msgpack==1.0.5 ; python_version >= "3.8" and python_version < "3.12"
-multidict==6.0.4 ; python_version >= "3.8" and python_version < "3.12"
-websockets==11.0.3 ; python_version >= "3.8" and python_version < "3.12"
-yarl==1.9.2 ; python_version >= "3.8" and python_version < "3.12"
+aiohttp==3.9.1 ; python_version >= "3.8" and python_version < "4"
+aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "4"
+async-timeout==4.0.3 ; python_version >= "3.8" and python_version < "3.11"
+attrs==23.1.0 ; python_version >= "3.8" and python_version < "4"
+frozenlist==1.4.0 ; python_version >= "3.8" and python_version < "4"
+idna==3.6 ; python_version >= "3.8" and python_version < "4"
+msgpack==1.0.7 ; python_version >= "3.8" and python_version < "4"
+multidict==6.0.4 ; python_version >= "3.8" and python_version < "4"
+orjson==3.9.10 ; python_version >= "3.8" and python_version < "4"
+websockets==12.0 ; python_version >= "3.8" and python_version < "4"
+yarl==1.9.3 ; python_version >= "3.8" and python_version < "4"

src/pysignalr/protocol/messagepack.py

@@ -9,7 +9,7 @@
 from typing import Union
 from typing import cast
 
-import msgpack  # type: ignore[import]
+import msgpack  # type: ignore[import-untyped]
 import orjson
 
 from pysignalr.messages import CancelInvocationMessage

src/pysignalr/transport/websocket.py

@@ -148,7 +148,10 @@ async def _set_state(self, state: ConnectionState) -> None:
         self._state = state
 
     async def _get_connection(self) -> WebSocketClientProtocol:
-        await self._connected.wait()
+        try:
+            await asyncio.wait_for(self._connected.wait(), self._connection_timeout)
+        except asyncio.TimeoutError as e:
+            raise RuntimeError('The socket was never run') from e
         if not self._ws or self._ws.state != State.OPEN:
             raise RuntimeError('Connection is closed')
         return self._ws