Merge branch 'master' into master

matleg · web-flow · commit faafb362e503 · 2025-10-02T13:59:40.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-## 1.49.0 [unreleased]
+## 1.50.0 [unreleased]
+
+### Features
+
+1. [696](https://github.com/influxdata/influxdb-client-python/pull/696): Move "setuptools" package to build dependency.
+
+## 1.49.0 [2025-05-22]
 
 ### Bug Fixes
 
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,14 +1,14 @@
 {% set name = "influxdb_client" %}
-{% set version = "1.48.0" %}
+{% set version = "1.49.0" %}
 
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
-  url: https://files.pythonhosted.org/packages/11/47/b756380917cb4b968bd871fc006128e2cc9897fb1ab4bcf7d108f9601e78/influxdb_client-1.48.0.tar.gz
-  sha256: 414d5b5eff7d2b6b453f33e2826ea9872ea04a11996ba9c8604b0c1df57c8559
+  url: https://files.pythonhosted.org/packages/2a/f3/9c418215cf399529175ed5b198d15a21c2e29f28d90932107634b375c9ee/influxdb_client-1.49.0.tar.gz
+  sha256: 4a53a218adef6ac9458bfbd31fa08c76194f70310c6b4e01f53d804bd2c48e03
 
 build:
   number: 0
diff --git a/influxdb_client/client/influxdb_client.py b/influxdb_client/client/influxdb_client.py
@@ -265,15 +265,15 @@ def retry(self, conf: (str, str, str), data: str, exception: InfluxDBError):
 
         :param write_options: Write API configuration
         :param point_settings: settings to store default tags
-        :key success_callback: The callable ``callback`` to run after successfully writen a batch.
+        :key success_callback: The callable ``callback`` to run after having successfully written a batch.
 
                                The callable must accept two arguments:
                                     - `Tuple`: ``(bucket, organization, precision)``
                                     - `str`: written data
 
                                **[batching mode]**
 
-        :key error_callback: The callable ``callback`` to run after unsuccessfully writen a batch.
+        :key error_callback: The callable ``callback`` to run after having unsuccessfully written a batch.
 
                              The callable must accept three arguments:
                                 - `Tuple`: ``(bucket, organization, precision)``
diff --git a/influxdb_client/version.py b/influxdb_client/version.py
@@ -1,3 +1,3 @@
 """Version of the Client that is used in User-Agent header."""
 
-VERSION = '1.49.0dev0'
+VERSION = '1.50.0dev0'
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=21.0.0"]
+build-backend = "setuptools.build_meta"
diff --git a/setup.py b/setup.py
@@ -8,7 +8,6 @@
     'reactivex >= 4.0.4',
     'certifi >= 14.05.14',
     'python_dateutil >= 2.5.3',
-    'setuptools >= 21.0.0',
     'urllib3 >= 1.26.0'
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""Version of the Client that is used in User-Agent header."""`
`2`	`2`
`3`		`-VERSION = '1.49.0dev0'`
	`3`	`+VERSION = '1.50.0dev0'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[build-system]`
	`2`	`+requires = ["setuptools>=21.0.0"]`
	`3`	`+build-backend = "setuptools.build_meta"`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`'reactivex >= 4.0.4',`
`9`	`9`	`'certifi >= 14.05.14',`
`10`	`10`	`'python_dateutil >= 2.5.3',`
`11`		`- 'setuptools >= 21.0.0',`
`12`	`11`	`'urllib3 >= 1.26.0'`
`13`	`12`	`]`
`14`	`13`