chore(deps): migrate to RxPY v4; set minimal Python version to 3.7 (#472)

Author: bednar

.circleci/config.yml

@@ -33,17 +33,14 @@ commands:
           paths:
             - ".venv"
             - "~/.cache/pip"
-            # - "/usr/local/lib/python3.8/site-packages"
-            # - "/usr/local/lib/python3.7/site-packages"
-            # - "/usr/local/lib/python3.6/site-packages"
             - "/usr/local/lib/site-python"
           when: always
 jobs:
   tests-python:
     parameters:
       python-image:
         type: string
-        default: &default-python "cimg/python:3.6"
+        default: &default-python "cimg/python:3.7"
       influxdb-image:
         type: string
         default: &default-influxdb "influxdb:latest"
@@ -154,6 +151,7 @@ jobs:
             pip install -e . --user
             pip install sphinx==1.8.5 --user
             pip install sphinx_rtd_theme --user
+            pip install jinja2==3.0.3 --user
             cd docs
             python -m sphinx -T -E -b html -d _build/doctrees -D language=en . _build/html
   check-aws-lambda-layer:
@@ -180,16 +178,13 @@ workflows:
       - check-examples
       - check-sphinx
       - tests-python:
-          name: test-3.6
+          name: test-3.7
       - tests-python:
-          name: test-3.6-without-ciso8601
+          name: test-3.7-without-ciso8601
           enabled-ciso-8601: false
       - tests-python:
-          name: test-3.6-influxdb-nightly
+          name: test-3.7-influxdb-nightly
           influxdb-image: "quay.io/influxdb/influxdb:nightly"
-      - tests-python:
-          name: test-3.7
-          python-image: "cimg/python:3.7"
       - tests-python:
           name: test-3.8
           python-image: "cimg/python:3.8"

.readthedocs.yml

@@ -1,7 +1,7 @@
 build:
   image: latest
 python:
-  version: 3.6
+  version: 3.7
   pip_install: true
   extra_requirements:
     - docs

CHANGELOG.md

@@ -1,4 +1,12 @@
-## 1.32.0[unreleased]
+## 1.32.0 [unreleased]
+
+:warning: This release drop supports for Python 3.6. As of 2021-12-23, 3.6 has reached the end-of-life phase of its release cycle. 3.6.15 was the final security release. For more info see: https://peps.python.org/pep-0494/#lifespan
+
+### Dependencies
+1. [#472](https://github.com/influxdata/influxdb-client-python/pull/472): Update `RxPY` to `4.0.4`
+
+### Others
+1. [#472](https://github.com/influxdata/influxdb-client-python/pull/472): Drop supports for Python 3.6
 
 ## 1.31.0 [2022-07-29]
 

README.rst

@@ -92,7 +92,7 @@ Installation
 
 InfluxDB python library uses `RxPY <https://github.com/ReactiveX/RxPY>`__ - The Reactive Extensions for Python (RxPY).
 
-**Python 3.6** or later is required.
+**Python 3.7** or later is required.
 
 .. note::
 
@@ -451,8 +451,8 @@ The batching is configurable by ``write_options``\ :
     from datetime import datetime, timedelta
 
     import pandas as pd
-    import rx
-    from rx import operators as ops
+    import reactivex as rx
+    from reactivex import operators as ops
 
     from influxdb_client import InfluxDBClient, Point, WriteOptions
 
@@ -795,8 +795,8 @@ If you would like to import gigabytes of data then use our multiprocessing examp
    from collections import OrderedDict
    from csv import DictReader
 
-   import rx
-   from rx import operators as ops
+   import reactivex as rx
+   from reactivex import operators as ops
 
    from influxdb_client import InfluxDBClient, Point, WriteOptions
 
@@ -899,8 +899,8 @@ Efficiency write data from IOT sensor
    from datetime import timedelta
 
    import psutil as psutil
-   import rx
-   from rx import operators as ops
+   import reactivex as rx
+   from reactivex import operators as ops
 
    from influxdb_client import InfluxDBClient, WriteApi, WriteOptions
 
@@ -1370,7 +1370,7 @@ How to use Asyncio
 ^^^^^^^^^^^^^^^^^^
 .. marker-asyncio-start
 
-Starting from version 1.27.0 for Python 3.6+ the ``influxdb-client`` package supports ``async/await`` based on
+Starting from version 1.27.0 for Python 3.7+ the ``influxdb-client`` package supports ``async/await`` based on
 `asyncio <https://docs.python.org/3/library/asyncio.html>`_ and `aiohttp <https://docs.aiohttp.org>`_.
 You can install ``aiohttp`` directly:
 

conda/meta.yaml

@@ -17,10 +17,10 @@ build:
 
 requirements:
   host:
-    - python >=3.6
+    - python >=3.7
     - pip
   run:
-    - python >=3.6
+    - python >=3.7
     - setuptools
 
 about:

examples/asynchronous_batching.py

@@ -4,9 +4,9 @@
 import asyncio
 from csv import DictReader
 
-import rx
-from rx import operators as ops
-from rx.scheduler.eventloop import AsyncIOScheduler
+import reactivex as rx
+from reactivex import operators as ops
+from reactivex.scheduler.eventloop import AsyncIOScheduler
 
 from influxdb_client import Point
 from influxdb_client.client.influxdb_client_async import InfluxDBClientAsync

examples/import_data_set.py

@@ -7,8 +7,8 @@
 from collections import OrderedDict
 from csv import DictReader
 
-import rx
-from rx import operators as ops
+import reactivex as rx
+from reactivex import operators as ops
 
 from influxdb_client import Point, InfluxDBClient, WriteOptions
 

examples/import_data_set_multiprocessing.py

@@ -12,8 +12,8 @@
 from multiprocessing import Value
 from urllib.request import urlopen
 
-import rx
-from rx import operators as ops
+import reactivex as rx
+from reactivex import operators as ops
 
 from influxdb_client import Point, InfluxDBClient, WriteOptions
 from influxdb_client.client.write_api import WriteType

examples/import_data_set_sync_batching.py

@@ -4,8 +4,8 @@
 
 from csv import DictReader
 
-import rx
-from rx import operators as ops
+import reactivex as rx
+from reactivex import operators as ops
 
 from influxdb_client import InfluxDBClient, Point
 from influxdb_client.client.write.retry import WritesRetry

examples/iot_sensor.py

@@ -6,8 +6,8 @@
 from datetime import timedelta
 
 import psutil as psutil
-import rx
-from rx import operators as ops
+import reactivex as rx
+from reactivex import operators as ops
 
 from influxdb_client import WriteApi, WriteOptions
 from influxdb_client.client.influxdb_client import InfluxDBClient

examples/rx_playground.py

@@ -3,11 +3,10 @@
 from random import random
 from threading import current_thread
 
-import rx
-from rx import operators as ops
-from rx.core import GroupedObservable
-from rx.scheduler import ThreadPoolScheduler
-from rx.subject import Subject
+import reactivex as rx
+from reactivex import operators as ops, GroupedObservable
+from reactivex.scheduler import ThreadPoolScheduler
+from reactivex.subject import Subject
 
 
 class _WriterKey(object):

influxdb_client/client/write_api.py

@@ -10,10 +10,10 @@
 from time import sleep
 from typing import Union, Any, Iterable, NamedTuple
 
-import rx
-from rx import operators as ops, Observable
-from rx.scheduler import ThreadPoolScheduler
-from rx.subject import Subject
+import reactivex as rx
+from reactivex import operators as ops, Observable
+from reactivex.scheduler import ThreadPoolScheduler
+from reactivex.subject import Subject
 
 from influxdb_client import WritePrecision
 from influxdb_client.client._base import _BaseWriteApi, _HAS_DATACLASS

notebooks/realtime-stream.ipynb

@@ -39,8 +39,8 @@
     "\n",
     "import hvplot.streamz\n",
     "import pandas as pd\n",
-    "import rx\n",
-    "from rx import operators as ops\n",
+    "import reactivex as rx\n",
+    "from reactivex import operators as ops\n",
     "\n",
     "from streamz.dataframe import Random, DataFrame\n",
     "from streamz import Stream\n",
@@ -61,7 +61,7 @@
     "                                    f'{query}')) \\\n",
     "        .pipe(ops.map(lambda query: client.query_api().query_data_frame(query, data_frame_index=['_time']))) \\\n",
     "        .pipe(ops.map(lambda data_frame: data_frame.drop(columns=['result', 'table']))) \\\n",
-    "        .subscribe(observer=lambda data_frame: sink.emit(data_frame), on_error=lambda error: print(error))\n",
+    "        .subscribe(on_next=lambda data_frame: sink.emit(data_frame), on_error=lambda error: print(error))\n",
     "    pass"
    ]
   },

notebooks/stock_predictions_import_data.py

@@ -9,8 +9,8 @@
 
 import ciso8601
 import requests
-import rx
-from rx import operators as ops
+import reactivex as rx
+from reactivex import operators as ops
 
 from influxdb_client import InfluxDBClient, WriteOptions
 from influxdb_client.client.write.point import EPOCH

setup.py

@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 requires = [
-    'rx >= 3.0.1',
+    'reactivex >= 4.0.4',
     'certifi >= 14.05.14',
     'python_dateutil >= 2.5.3',
     'setuptools >= 21.0.0',
@@ -64,13 +64,12 @@
     long_description_content_type="text/x-rst",
     packages=find_packages(exclude=('tests*',)),
     test_suite='tests',
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     include_package_data=True,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

tests/test_QueryApiDataFrame.py

@@ -2,10 +2,10 @@
 
 import httpretty
 import pytest
-import rx
+import reactivex as rx
 from pandas import DataFrame
 from pandas._libs.tslibs.timestamps import Timestamp
-from rx import operators as ops
+from reactivex import operators as ops
 
 from influxdb_client import InfluxDBClient, Point, WritePrecision, WriteOptions
 from influxdb_client.client.warnings import MissingPivotFunction

tests/test_WriteApiBatching.py

@@ -9,8 +9,8 @@
 
 import httpretty
 import pytest
-import rx
-from rx import operators as ops
+import reactivex as rx
+from reactivex import operators as ops
 
 import influxdb_client
 from influxdb_client import WritePrecision, InfluxDBClient, VERSION