diff --git a/influxdb-5.3.1.tar.gz b/influxdb-5.3.1.tar.gz deleted file mode 100644 index 194f9fa..0000000 --- a/influxdb-5.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46f85e7b04ee4b3dee894672be6a295c94709003a7ddea8820deec2ac4d8b27a -size 67385 diff --git a/influxdb-5.3.2.tar.gz b/influxdb-5.3.2.tar.gz new file mode 100644 index 0000000..0c4a781 --- /dev/null +++ b/influxdb-5.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58c647f6043712dd86e9aee12eb4ccfbbb5415467bc9910a48aa8c74c1108970 +size 70792 diff --git a/influxdb-pr845-pandas-future.patch b/influxdb-pr845-pandas-future.patch index fb85658..0447125 100644 --- a/influxdb-pr845-pandas-future.patch +++ b/influxdb-pr845-pandas-future.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Fix FutureWarning from pandas influxdb/_dataframe_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: influxdb-5.3.1/influxdb/_dataframe_client.py +Index: influxdb-5.3.2/influxdb/_dataframe_client.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/_dataframe_client.py -+++ influxdb-5.3.1/influxdb/_dataframe_client.py +--- influxdb-5.3.2.orig/influxdb/_dataframe_client.py ++++ influxdb-5.3.2/influxdb/_dataframe_client.py @@ -305,7 +305,7 @@ class DataFrameClient(InfluxDBClient): 'time': np.int64(ts.value / precision_factor)} for ts, tag, (_, rec) in zip( @@ -20,10 +20,10 @@ Index: influxdb-5.3.1/influxdb/_dataframe_client.py dataframe[field_columns].iterrows() ) ] -Index: influxdb-5.3.1/influxdb/tests/dataframe_client_test.py +Index: influxdb-5.3.2/influxdb/tests/dataframe_client_test.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/tests/dataframe_client_test.py -+++ influxdb-5.3.1/influxdb/tests/dataframe_client_test.py +--- influxdb-5.3.2.orig/influxdb/tests/dataframe_client_test.py ++++ influxdb-5.3.2/influxdb/tests/dataframe_client_test.py @@ -334,7 +334,7 @@ class TestDataFrameClient(unittest.TestC ['some', "2", 2, None], # skip None ['', "2", 2, None], # all tags empty diff --git a/python-influxdb-new-pandas.patch b/python-influxdb-new-pandas.patch index bd19490..502dabd 100644 --- a/python-influxdb-new-pandas.patch +++ b/python-influxdb-new-pandas.patch @@ -1,7 +1,7 @@ -Index: influxdb-5.3.1/influxdb/tests/dataframe_client_test.py +Index: influxdb-5.3.2/influxdb/tests/dataframe_client_test.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/tests/dataframe_client_test.py -+++ influxdb-5.3.1/influxdb/tests/dataframe_client_test.py +--- influxdb-5.3.2.orig/influxdb/tests/dataframe_client_test.py ++++ influxdb-5.3.2/influxdb/tests/dataframe_client_test.py @@ -19,7 +19,10 @@ from .client_test import _mocked_session if not using_pypy: @@ -41,10 +41,10 @@ Index: influxdb-5.3.1/influxdb/tests/dataframe_client_test.py if pd1_dropna.index.tzinfo is None: pd1_dropna.index = pd1_dropna.index.tz_localize('UTC') -Index: influxdb-5.3.1/influxdb/tests/influxdb08/dataframe_client_test.py +Index: influxdb-5.3.2/influxdb/tests/influxdb08/dataframe_client_test.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/tests/influxdb08/dataframe_client_test.py -+++ influxdb-5.3.1/influxdb/tests/influxdb08/dataframe_client_test.py +--- influxdb-5.3.2.orig/influxdb/tests/influxdb08/dataframe_client_test.py ++++ influxdb-5.3.2/influxdb/tests/influxdb08/dataframe_client_test.py @@ -16,7 +16,10 @@ from .client_test import _mocked_session if not using_pypy: @@ -57,10 +57,10 @@ Index: influxdb-5.3.1/influxdb/tests/influxdb08/dataframe_client_test.py from influxdb.influxdb08 import DataFrameClient -Index: influxdb-5.3.1/influxdb/tests/server_tests/client_test_with_server.py +Index: influxdb-5.3.2/influxdb/tests/server_tests/client_test_with_server.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/tests/server_tests/client_test_with_server.py -+++ influxdb-5.3.1/influxdb/tests/server_tests/client_test_with_server.py +--- influxdb-5.3.2.orig/influxdb/tests/server_tests/client_test_with_server.py ++++ influxdb-5.3.2/influxdb/tests/server_tests/client_test_with_server.py @@ -34,7 +34,10 @@ warnings.simplefilter('error', FutureWar if not using_pypy: @@ -73,10 +73,10 @@ Index: influxdb-5.3.1/influxdb/tests/server_tests/client_test_with_server.py THIS_DIR = os.path.abspath(os.path.dirname(__file__)) -Index: influxdb-5.3.1/influxdb/_dataframe_client.py +Index: influxdb-5.3.2/influxdb/_dataframe_client.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/_dataframe_client.py -+++ influxdb-5.3.1/influxdb/_dataframe_client.py +--- influxdb-5.3.2.orig/influxdb/_dataframe_client.py ++++ influxdb-5.3.2/influxdb/_dataframe_client.py @@ -219,7 +219,7 @@ class DataFrameClient(InfluxDBClient): else: key = (name, tuple(sorted(tags.items()))) diff --git a/python-influxdb-no-six.patch b/python-influxdb-no-six.patch index 8c59499..9e1cd82 100644 --- a/python-influxdb-no-six.patch +++ b/python-influxdb-no-six.patch @@ -1,7 +1,7 @@ -Index: influxdb-5.3.1/influxdb.egg-info/requires.txt +Index: influxdb-5.3.2/influxdb.egg-info/requires.txt =================================================================== ---- influxdb-5.3.1.orig/influxdb.egg-info/requires.txt -+++ influxdb-5.3.1/influxdb.egg-info/requires.txt +--- influxdb-5.3.2.orig/influxdb.egg-info/requires.txt ++++ influxdb-5.3.2/influxdb.egg-info/requires.txt @@ -1,7 +1,6 @@ python-dateutil>=2.6.0 pytz @@ -10,23 +10,23 @@ Index: influxdb-5.3.1/influxdb.egg-info/requires.txt msgpack [test] -Index: influxdb-5.3.1/influxdb/client.py +Index: influxdb-5.3.2/influxdb/client.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/client.py -+++ influxdb-5.3.1/influxdb/client.py -@@ -20,7 +20,7 @@ from itertools import chain, islice - import msgpack +--- influxdb-5.3.2.orig/influxdb/client.py ++++ influxdb-5.3.2/influxdb/client.py +@@ -21,7 +21,7 @@ import msgpack import requests import requests.exceptions + from requests.adapters import HTTPAdapter -from six.moves.urllib.parse import urlparse +from urllib.parse import urlparse from influxdb.line_protocol import make_lines, quote_ident, quote_literal from influxdb.resultset import ResultSet -Index: influxdb-5.3.1/influxdb/helper.py +Index: influxdb-5.3.2/influxdb/helper.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/helper.py -+++ influxdb-5.3.1/influxdb/helper.py +--- influxdb-5.3.2.orig/influxdb/helper.py ++++ influxdb-5.3.2/influxdb/helper.py @@ -10,8 +10,6 @@ from collections import namedtuple, defa from datetime import datetime from warnings import warn @@ -45,10 +45,10 @@ Index: influxdb-5.3.1/influxdb/helper.py for point in data: json_point = { "measurement": series_name, -Index: influxdb-5.3.1/influxdb/influxdb08/client.py +Index: influxdb-5.3.2/influxdb/influxdb08/client.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/influxdb08/client.py -+++ influxdb-5.3.1/influxdb/influxdb08/client.py +--- influxdb-5.3.2.orig/influxdb/influxdb08/client.py ++++ influxdb-5.3.2/influxdb/influxdb08/client.py @@ -7,8 +7,7 @@ import json import socket import requests @@ -68,10 +68,10 @@ Index: influxdb-5.3.1/influxdb/influxdb08/client.py yield data_list[i:i + n] batch_size = kwargs.get('batch_size') -Index: influxdb-5.3.1/influxdb/line_protocol.py +Index: influxdb-5.3.2/influxdb/line_protocol.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/line_protocol.py -+++ influxdb-5.3.1/influxdb/line_protocol.py +--- influxdb-5.3.2.orig/influxdb/line_protocol.py ++++ influxdb-5.3.2/influxdb/line_protocol.py @@ -11,7 +11,6 @@ from numbers import Integral from pytz import UTC @@ -119,20 +119,20 @@ Index: influxdb-5.3.1/influxdb/line_protocol.py return str(data) return data -Index: influxdb-5.3.1/requirements.txt +Index: influxdb-5.3.2/requirements.txt =================================================================== ---- influxdb-5.3.1.orig/requirements.txt -+++ influxdb-5.3.1/requirements.txt +--- influxdb-5.3.2.orig/requirements.txt ++++ influxdb-5.3.2/requirements.txt @@ -1,5 +1,4 @@ python-dateutil>=2.6.0 pytz requests>=2.17.0 -six>=1.10.0 msgpack -Index: influxdb-5.3.1/influxdb/influxdb08/helper.py +Index: influxdb-5.3.2/influxdb/influxdb08/helper.py =================================================================== ---- influxdb-5.3.1.orig/influxdb/influxdb08/helper.py -+++ influxdb-5.3.1/influxdb/influxdb08/helper.py +--- influxdb-5.3.2.orig/influxdb/influxdb08/helper.py ++++ influxdb-5.3.2/influxdb/influxdb08/helper.py @@ -9,8 +9,6 @@ from __future__ import unicode_literals from collections import namedtuple, defaultdict from warnings import warn diff --git a/python-influxdb-remove-nose.patch b/python-influxdb-remove-nose.patch index 61055ba..a45af4f 100644 --- a/python-influxdb-remove-nose.patch +++ b/python-influxdb-remove-nose.patch @@ -1,7 +1,7 @@ -Index: influxdb-python-5.3.0/dev-requirements.txt +Index: influxdb-5.3.2/dev-requirements.txt =================================================================== ---- influxdb-python-5.3.0.orig/dev-requirements.txt 2020-04-10 21:38:30.000000000 +0200 -+++ influxdb-python-5.3.0/dev-requirements.txt 2020-07-08 16:29:19.466949905 +0200 +--- influxdb-5.3.2.orig/dev-requirements.txt ++++ influxdb-5.3.2/dev-requirements.txt @@ -1,5 +1,5 @@ requests>=2.17.0 -nose @@ -9,20 +9,19 @@ Index: influxdb-python-5.3.0/dev-requirements.txt mock pandas==0.20.1 Sphinx==1.5.5 -Index: influxdb-python-5.3.0/influxdb/tests/client_test.py +Index: influxdb-5.3.2/influxdb/tests/client_test.py =================================================================== ---- influxdb-python-5.3.0.orig/influxdb/tests/client_test.py 2020-04-10 21:38:30.000000000 +0200 -+++ influxdb-python-5.3.0/influxdb/tests/client_test.py 2020-07-08 17:17:34.760342375 +0200 -@@ -32,8 +32,6 @@ import requests +--- influxdb-5.3.2.orig/influxdb/tests/client_test.py ++++ influxdb-5.3.2/influxdb/tests/client_test.py +@@ -32,7 +32,6 @@ import requests import requests.exceptions import requests_mock -from nose.tools import raises -- - from influxdb import InfluxDBClient - from influxdb.resultset import ResultSet + from urllib3.connection import HTTPConnection -@@ -382,12 +380,12 @@ class TestInfluxDBClient(unittest.TestCa + from influxdb import InfluxDBClient +@@ -383,12 +382,12 @@ class TestInfluxDBClient(unittest.TestCa received_data.decode() ) @@ -38,7 +37,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_write_points_with_precision(self): """Test write points with precision for TestInfluxDBClient object.""" -@@ -540,12 +538,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -541,12 +540,12 @@ class TestInfluxDBClient(unittest.TestCa consistency='boo' ) @@ -54,7 +53,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_query(self): """Test query method for TestInfluxDBClient object.""" -@@ -650,11 +648,11 @@ class TestInfluxDBClient(unittest.TestCa +@@ -651,11 +650,11 @@ class TestInfluxDBClient(unittest.TestCa [example_object, example_object] ) @@ -69,7 +68,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_ping(self): """Test ping querying InfluxDB version.""" -@@ -696,11 +694,11 @@ class TestInfluxDBClient(unittest.TestCa +@@ -697,11 +696,11 @@ class TestInfluxDBClient(unittest.TestCa 'create database "123"' ) @@ -84,7 +83,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_drop_database(self): """Test drop database for TestInfluxDBClient object.""" -@@ -761,12 +759,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -762,12 +761,12 @@ class TestInfluxDBClient(unittest.TestCa [{'name': 'new_db_1'}, {'name': 'new_db_2'}] ) @@ -100,7 +99,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_get_list_measurements(self): """Test get list of measurements for TestInfluxDBClient object.""" -@@ -839,12 +837,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -840,12 +839,12 @@ class TestInfluxDBClient(unittest.TestCa self.cli.get_list_series(tags={'region': 'us-west'}), ['cpu_load_short,host=server01,region=us-west']) @@ -116,7 +115,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_create_retention_policy_default(self): """Test create default ret policy for TestInfluxDBClient object.""" -@@ -970,12 +968,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -971,12 +970,12 @@ class TestInfluxDBClient(unittest.TestCa 'alter retention policy "somename" on "db" default' ) @@ -132,7 +131,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_drop_retention_policy(self): """Test drop retention policy for TestInfluxDBClient object.""" -@@ -993,12 +991,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -994,12 +993,12 @@ class TestInfluxDBClient(unittest.TestCa 'drop retention policy "somename" on "db"' ) @@ -148,7 +147,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_get_list_retention_policies(self): """Test get retention policies for TestInfluxDBClient object.""" -@@ -1178,12 +1176,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1179,12 +1178,12 @@ class TestInfluxDBClient(unittest.TestCa 'grant all privileges to "test"' ) @@ -164,7 +163,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_revoke_admin_privileges(self): """Test revoke admin privs for TestInfluxDBClient object.""" -@@ -1202,12 +1200,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1203,12 +1202,12 @@ class TestInfluxDBClient(unittest.TestCa 'revoke all privileges from "test"' ) @@ -180,7 +179,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_grant_privilege(self): """Test grant privs for TestInfluxDBClient object.""" -@@ -1226,12 +1224,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1227,12 +1226,12 @@ class TestInfluxDBClient(unittest.TestCa 'grant read on "testdb" to "test"' ) @@ -196,7 +195,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_revoke_privilege(self): """Test revoke privs for TestInfluxDBClient object.""" -@@ -1250,12 +1248,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1251,12 +1250,12 @@ class TestInfluxDBClient(unittest.TestCa 'revoke read on "testdb" from "test"' ) @@ -212,7 +211,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_get_list_privileges(self): """Test get list of privs for TestInfluxDBClient object.""" -@@ -1277,12 +1275,12 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1278,12 +1277,12 @@ class TestInfluxDBClient(unittest.TestCa {'database': 'db3', 'privilege': 'NO PRIVILEGES'}] ) @@ -228,7 +227,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_get_list_continuous_queries(self): """Test getting a list of continuous queries.""" -@@ -1332,11 +1330,11 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1333,11 +1332,11 @@ class TestInfluxDBClient(unittest.TestCa ] ) @@ -243,7 +242,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_create_continuous_query(self): """Test continuous query creation.""" -@@ -1365,11 +1363,11 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1366,11 +1365,11 @@ class TestInfluxDBClient(unittest.TestCa '"6_months"."events" from "events" group by time(10m) end' ) @@ -258,7 +257,7 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_drop_continuous_query(self): """Test dropping a continuous query.""" -@@ -1386,11 +1384,11 @@ class TestInfluxDBClient(unittest.TestCa +@@ -1387,11 +1386,11 @@ class TestInfluxDBClient(unittest.TestCa 'drop continuous query "cq_name" on "db_name"' ) @@ -273,10 +272,10 @@ Index: influxdb-python-5.3.0/influxdb/tests/client_test.py def test_invalid_port_fails(self): """Test invalid port fail for TestInfluxDBClient object.""" -Index: influxdb-python-5.3.0/influxdb/tests/dataframe_client_test.py +Index: influxdb-5.3.2/influxdb/tests/dataframe_client_test.py =================================================================== ---- influxdb-python-5.3.0.orig/influxdb/tests/dataframe_client_test.py 2020-04-10 21:38:30.000000000 +0200 -+++ influxdb-python-5.3.0/influxdb/tests/dataframe_client_test.py 2020-07-08 17:17:34.760342375 +0200 +--- influxdb-5.3.2.orig/influxdb/tests/dataframe_client_test.py ++++ influxdb-5.3.2/influxdb/tests/dataframe_client_test.py @@ -13,7 +13,6 @@ import unittest import warnings import requests_mock @@ -401,10 +400,10 @@ Index: influxdb-python-5.3.0/influxdb/tests/dataframe_client_test.py def test_get_list_retention_policies(self): """Test get retention policies for TestInfluxDBClient object.""" -Index: influxdb-python-5.3.0/influxdb/tests/influxdb08/client_test.py +Index: influxdb-5.3.2/influxdb/tests/influxdb08/client_test.py =================================================================== ---- influxdb-python-5.3.0.orig/influxdb/tests/influxdb08/client_test.py 2020-04-10 21:38:30.000000000 +0200 -+++ influxdb-python-5.3.0/influxdb/tests/influxdb08/client_test.py 2020-07-08 17:18:55.132824390 +0200 +--- influxdb-5.3.2.orig/influxdb/tests/influxdb08/client_test.py ++++ influxdb-5.3.2/influxdb/tests/influxdb08/client_test.py @@ -13,7 +13,6 @@ import requests import requests.exceptions import requests_mock @@ -657,10 +656,10 @@ Index: influxdb-python-5.3.0/influxdb/tests/influxdb08/client_test.py @mock.patch('requests.Session.request') def test_request_retry(self, mock_request): -Index: influxdb-python-5.3.0/influxdb/tests/influxdb08/dataframe_client_test.py +Index: influxdb-5.3.2/influxdb/tests/influxdb08/dataframe_client_test.py =================================================================== ---- influxdb-python-5.3.0.orig/influxdb/tests/influxdb08/dataframe_client_test.py 2020-04-10 21:38:30.000000000 +0200 -+++ influxdb-python-5.3.0/influxdb/tests/influxdb08/dataframe_client_test.py 2020-07-08 17:18:52.852810717 +0200 +--- influxdb-5.3.2.orig/influxdb/tests/influxdb08/dataframe_client_test.py ++++ influxdb-5.3.2/influxdb/tests/influxdb08/dataframe_client_test.py @@ -10,8 +10,6 @@ import warnings import requests_mock @@ -718,10 +717,10 @@ Index: influxdb-python-5.3.0/influxdb/tests/influxdb08/dataframe_client_test.py def test_query_into_dataframe(self): """Test query into a dataframe.""" -Index: influxdb-python-5.3.0/test-requirements.txt +Index: influxdb-5.3.2/test-requirements.txt =================================================================== ---- influxdb-python-5.3.0.orig/test-requirements.txt 2020-04-10 21:38:30.000000000 +0200 -+++ influxdb-python-5.3.0/test-requirements.txt 2020-07-08 16:29:19.466949905 +0200 +--- influxdb-5.3.2.orig/test-requirements.txt ++++ influxdb-5.3.2/test-requirements.txt @@ -1,4 +1,4 @@ -nose -nose-cov diff --git a/python-influxdb.changes b/python-influxdb.changes index 53a1fb6..c17ffe1 100644 --- a/python-influxdb.changes +++ b/python-influxdb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 11 10:54:28 UTC 2024 - Daniel Garcia + +- Update to 5.3.2: + * Correctly serialize nanosecond dataframe timestamps (#926) +- Refresh all patches and skip broken test with numpy >= 2 + ------------------------------------------------------------------- Fri Mar 8 15:47:41 UTC 2024 - Ben Greiner diff --git a/python-influxdb.spec b/python-influxdb.spec index 2cb2564..e75009b 100644 --- a/python-influxdb.spec +++ b/python-influxdb.spec @@ -19,7 +19,7 @@ # Legacy package not compatible with Python 3.12. Move your consuming library to a more modern version! %define skip_python312 1 Name: python-influxdb -Version: 5.3.1 +Version: 5.3.2 Release: 0 Summary: InfluxDB client License: MIT @@ -82,6 +82,8 @@ sed -e 's/^import mock/from unittest import mock/' \ -i influxdb/tests/*.py influxdb/tests/*/*.py # https://github.com/influxdata/influxdb-python/issues/884 donttest="test_write_points_from_dataframe_with_nan_json or test_write_points_from_dataframe_with_tags_and_nan_json" +# don't work with numpy 2 +donttest+=" or test_multiquery_into_dataframe_dropna" %pytest influxdb -k "not ($donttest)" %files %{python_files}