Fix build (#729)

* Fix build by pining pyyaml to 5.3.1

see yaml/pyyaml#724 for the origin of the
error. We can remove this once pyyaml 7.0 is released.

* Fix unit tests

* Upgrade pip in code-quality ci job

* Upgrade pip in code-quality ci job

* Bump pre-commit checks

* Update actions cache

* Update pyyaml to and Python deps

* Fix typing issues

* Python 3.7 deprecated

---------

Co-authored-by: Romain Picard <[email protected]>

Author: dbrattli

.github/workflows/python-package.yml

@@ -22,6 +22,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          pip install --upgrade pip
           pip install poetry
           poetry install
 
@@ -73,7 +74,7 @@ jobs:
           python-version: "3.12"
 
       - name: Cache Poetry
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pypoetry

.pre-commit-config.yaml

@@ -4,33 +4,33 @@ repos:
           - --remove-all-unused-imports
           - --in-place
         id: autoflake
-    repo: https://github.com/humitos/mirrors-autoflake
-    rev: v1.1
+    repo: https://github.com/PyCQA/autoflake
+    rev: v2.3.1
   - hooks:
       - id: isort
     repo: https://github.com/timothycrosley/isort
-    rev: 5.10.1
+    rev: 5.13.2
   - hooks:
       - id: black
     repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 24.10.0
   - hooks:
       - id: flake8
         exclude: (^docs/|^examples/|^notebooks/|^tests/)
     repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 7.1.1
   - hooks:
       - id: pyright
         name: pyright
         entry: pyright
         language: node
         pass_filenames: false
         types: [python]
-        additional_dependencies: ["[email protected].286"]
+        additional_dependencies: ["[email protected].388"]
     repo: local
   - hooks:
       - id: mypy
         exclude: (^docs/|^examples/|^notebooks/|^tests/|^reactivex/operators/_\w.*\.py$)
     repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.942
+    rev: v1.13.0
 

README.rst

@@ -28,7 +28,7 @@ ReactiveX for Python v4
 For v3.X please go to the `v3 branch
 <https://github.com/ReactiveX/RxPY/tree/release/v3.2.x>`_.
 
-ReactiveX for Python v4.x runs on `Python <http://www.python.org/>`_ 3.7 or above. To
+ReactiveX for Python v4.x runs on `Python <http://www.python.org/>`_ 3.8 or above. To
 install:
 
 .. code:: console

examples/autocomplete/bottle_autocomplete.py

@@ -3,6 +3,7 @@
 - Requires besides bottle and gevent also the geventwebsocket pip package
 - Instead of a future we create the inner stream for flat_map_latest manually
 """
+
 import json
 
 import gevent

poetry.lock

@@ -15,7 +15,6 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -28,10 +27,11 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = ">= 3.7, < 4.0"
+python = ">= 3.8, < 4.0"
 typing-extensions = "^4.1.1"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.test.dependencies]
+pyyaml = "6.0.2"
 pytest-asyncio = "^0.18.1"
 pytest = "^7.0.1"
 coverage = "^6.3.2"
@@ -75,4 +75,3 @@ asyncio_mode = "strict"
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
-

pyproject.toml

@@ -185,22 +185,19 @@ def create(subscribe: typing.Subscription[_T]) -> Observable[_T]:
 @overload
 def combine_latest(
     __a: Observable[_A], __b: Observable[_B]
-) -> Observable[Tuple[_A, _B]]:
-    ...
+) -> Observable[Tuple[_A, _B]]: ...
 
 
 @overload
 def combine_latest(
     __a: Observable[_A], __b: Observable[_B], __c: Observable[_C]
-) -> Observable[Tuple[_A, _B, _C]]:
-    ...
+) -> Observable[Tuple[_A, _B, _C]]: ...
 
 
 @overload
 def combine_latest(
     __a: Observable[_A], __b: Observable[_B], __c: Observable[_C], __d: Observable[_D]
-) -> Observable[Tuple[_A, _B, _C, _D]]:
-    ...
+) -> Observable[Tuple[_A, _B, _C, _D]]: ...
 
 
 def combine_latest(*__sources: Observable[Any]) -> Observable[Any]:
@@ -289,7 +286,7 @@ def concat_with_iterable(sources: Iterable[Observable[_T]]) -> Observable[_T]:
 
 
 def defer(
-    factory: Callable[[abc.SchedulerBase], Union[Observable[_T], "Future[_T]"]]
+    factory: Callable[[abc.SchedulerBase], Union[Observable[_T], "Future[_T]"]],
 ) -> Observable[_T]:
     """Returns an observable sequence that invokes the specified
     factory function whenever a new observer subscribes.
@@ -382,22 +379,21 @@ def for_in(
 
 
 @overload
-def fork_join(__a: Observable[_A], __b: Observable[_B]) -> Observable[Tuple[_A, _B]]:
-    ...
+def fork_join(
+    __a: Observable[_A], __b: Observable[_B]
+) -> Observable[Tuple[_A, _B]]: ...
 
 
 @overload
 def fork_join(
     __a: Observable[_A], __b: Observable[_B], __c: Observable[_C]
-) -> Observable[Tuple[_A, _B, _C]]:
-    ...
+) -> Observable[Tuple[_A, _B, _C]]: ...
 
 
 @overload
 def fork_join(
     __a: Observable[_A], __b: Observable[_B], __c: Observable[_C], __d: Observable[_D]
-) -> Observable[Tuple[_A, _B, _C, _D]]:
-    ...
+) -> Observable[Tuple[_A, _B, _C, _D]]: ...
 
 
 @overload
@@ -407,8 +403,7 @@ def fork_join(
     __c: Observable[_C],
     __d: Observable[_D],
     __e: Observable[_E],
-) -> Observable[Tuple[_A, _B, _C, _D, _E]]:
-    ...
+) -> Observable[Tuple[_A, _B, _C, _D, _E]]: ...
 
 
 def fork_join(*sources: Observable[Any]) -> Observable[Any]:
@@ -920,7 +915,7 @@ def of(*args: _T) -> Observable[_T]:
 def on_error_resume_next(
     *sources: Union[
         Observable[_T], "Future[_T]", Callable[[Optional[Exception]], Observable[_T]]
-    ]
+    ],
 ) -> Observable[_T]:
     """Continues an observable sequence that is terminated normally or
     by an exception with the next observable sequence.
@@ -1213,8 +1208,8 @@ def to_async(
 
 
 def using(
-    resource_factory: Callable[[], abc.DisposableBase],
-    observable_factory: Callable[[abc.DisposableBase], Observable[_T]],
+    resource_factory: Callable[[], Optional[abc.DisposableBase]],
+    observable_factory: Callable[[Optional[abc.DisposableBase]], Observable[_T]],
 ) -> Observable[_T]:
     """Constructs an observable sequence that depends on a resource
     object, whose lifetime is tied to the resulting observable

reactivex/__init__.py

@@ -28,7 +28,7 @@ def set_disposable(self, value: DisposableBase) -> None:
             if not should_dispose:
                 self.current = value
 
-        if should_dispose and value is not None:
+        if should_dispose:
             value.dispose()
 
     disposable = property(get_disposable, set_disposable)

reactivex/disposable/multipleassignmentdisposable.py

@@ -37,7 +37,7 @@ def set_disposable(self, value: abc.DisposableBase) -> None:
         if old is not None:
             old.dispose()
 
-        if should_dispose and value is not None:
+        if should_dispose:
             value.dispose()
 
     disposable = property(get_disposable, set_disposable)

reactivex/disposable/serialdisposable.py

@@ -41,8 +41,8 @@ def alias(name: str, doc: str, fun: Callable[_P, _T]) -> Callable[_P, _T]:
     args = (_fun.__code__, _fun.__globals__)
     kwargs = {"name": name, "argdefs": _fun.__defaults__, "closure": _fun.__closure__}
     alias_ = FunctionType(*args, **kwargs)  # type: ignore
-    alias_ = update_wrapper(alias_, _fun)
-    alias_.__kwdefaults__ = _fun.__kwdefaults__
+    alias_ = update_wrapper(alias_, _fun)  # type: ignore
+    alias_.__kwdefaults__ = _fun.__kwdefaults__  # type: ignore
     alias_.__doc__ = doc
     alias_.__annotations__ = _fun.__annotations__
     return cast(Callable[_P, _T], alias_)