Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-influxdb for openSUSE:Factory
checked in at 2024-09-11 16:56:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-influxdb (Old)
and /work/SRC/openSUSE:Factory/.python-influxdb.new.17570 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-influxdb"
Wed Sep 11 16:56:50 2024 rev:16 rq:1200102 version:5.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-influxdb/python-influxdb.changes
2024-03-13 22:18:34.792274662 +0100
+++
/work/SRC/openSUSE:Factory/.python-influxdb.new.17570/python-influxdb.changes
2024-09-11 16:57:44.951937129 +0200
@@ -1,0 +2,7 @@
+Wed Sep 11 10:54:28 UTC 2024 - Daniel Garcia <[email protected]>
+
+- Update to 5.3.2:
+ * Correctly serialize nanosecond dataframe timestamps (#926)
+- Refresh all patches and skip broken test with numpy >= 2
+
+-------------------------------------------------------------------
Old:
----
influxdb-5.3.1.tar.gz
New:
----
influxdb-5.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-influxdb.spec ++++++
--- /var/tmp/diff_new_pack.u7ZXol/_old 2024-09-11 16:57:45.427957014 +0200
+++ /var/tmp/diff_new_pack.u7ZXol/_new 2024-09-11 16:57:45.431957181 +0200
@@ -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 @@
-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}
++++++ influxdb-5.3.1.tar.gz -> influxdb-5.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/influxdb-5.3.1/PKG-INFO new/influxdb-5.3.2/PKG-INFO
--- old/influxdb-5.3.1/PKG-INFO 2020-11-11 22:23:18.000000000 +0100
+++ new/influxdb-5.3.2/PKG-INFO 2024-04-18 23:45:02.637745000 +0200
@@ -1,191 +1,9 @@
Metadata-Version: 2.1
Name: influxdb
-Version: 5.3.1
+Version: 5.3.2
Summary: InfluxDB client
Home-page: https://github.com/influxdb/influxdb-python
License: MIT License
-Description: InfluxDB-Python
- ===============
-
- .. image::
https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
- :target: https://travis-ci.org/influxdata/influxdb-python
- .. image::
https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
- :target: http://influxdb-python.readthedocs.org/
- :alt: Documentation Status
-
- .. image::
https://img.shields.io/coveralls/influxdata/influxdb-python.svg
- :target: https://coveralls.io/r/influxdata/influxdb-python
- :alt: Coverage
-
- .. image:: https://img.shields.io/pypi/v/influxdb.svg
- :target: https://pypi.python.org/pypi/influxdb
- :alt: PyPI Status
-
- InfluxDB-Python is a client for interacting with InfluxDB_.
-
- Development of this library is maintained by:
-
- +-----------+-------------------------------+
- | Github ID | URL |
- +===========+===============================+
- | @aviau | (https://github.com/aviau) |
- +-----------+-------------------------------+
- | @xginn8 | (https://github.com/xginn8) |
- +-----------+-------------------------------+
- | @sebito91 | (https://github.com/sebito91) |
- +-----------+-------------------------------+
-
- .. _readme-about:
-
- InfluxDB is an open-source distributed time series database, find more
about InfluxDB_ at https://docs.influxdata.com/influxdb/latest
-
-
- .. _installation:
-
- InfluxDB pre v1.1.0 users
- -------------------------
-
- This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3,
v1.5.4, v1.6.4, and 1.7.4.
-
- Those users still on InfluxDB v0.8.x users may still use the legacy
client by importing ``from influxdb.influxdb08 import InfluxDBClient``.
-
- Installation
- ------------
-
- Install, upgrade and uninstall influxdb-python with these commands::
-
- $ pip install influxdb
- $ pip install --upgrade influxdb
- $ pip uninstall influxdb
-
- On Debian/Ubuntu, you can install it with this command::
-
- $ sudo apt-get install python-influxdb
-
- Dependencies
- ------------
-
- The influxdb-python distribution is supported and tested on Python
2.7, 3.5, 3.6, 3.7, PyPy and PyPy3.
-
- **Note:** Python <3.5 are currently untested. See ``.travis.yml``.
-
- Main dependency is:
-
- - Requests: HTTP library for human beings
(http://docs.python-requests.org/)
-
-
- Additional dependencies are:
-
- - pandas: for writing from and reading to DataFrames
(http://pandas.pydata.org/)
- - Sphinx: Tool to create and manage the documentation
(http://sphinx-doc.org/)
- - Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
- - Mock: to mock tests (https://pypi.python.org/pypi/mock)
-
-
- Documentation
- -------------
-
- Documentation is available at
https://influxdb-python.readthedocs.io/en/latest/.
-
- You will need Sphinx_ installed to generate the documentation.
-
- The documentation can be generated by running::
-
- $ tox -e docs
-
-
- Generated documentation can be found in the *docs/build/html/*
directory.
-
-
- Examples
- --------
-
- Here's a basic example (for more see the examples directory)::
-
- $ python
-
- >>> from influxdb import InfluxDBClient
-
- >>> json_body = [
- {
- "measurement": "cpu_load_short",
- "tags": {
- "host": "server01",
- "region": "us-west"
- },
- "time": "2009-11-10T23:00:00Z",
- "fields": {
- "value": 0.64
- }
- }
- ]
-
- >>> client = InfluxDBClient('localhost', 8086, 'root', 'root',
'example')
-
- >>> client.create_database('example')
-
- >>> client.write_points(json_body)
-
- >>> result = client.query('select value from cpu_load_short;')
-
- >>> print("Result: {0}".format(result))
-
-
- Testing
- -------
-
- Make sure you have tox by running the following::
-
- $ pip install tox
-
- To test influxdb-python with multiple version of Python, you can use
Tox_::
-
- $ tox
-
-
- Support
- -------
-
- For issues with, questions about, or feedback for InfluxDB_, please
look into
- our community page: http://influxdb.com/community/.
-
- We are also lurking on the following:
-
- - #influxdb on irc.freenode.net
- - #influxdb on gophers.slack.com
-
-
- Development
- -----------
-
- All development is done on Github_. Use Issues_ to report
- problems or submit contributions.
-
- .. _Github: https://github.com/influxdb/influxdb-python/
- .. _Issues: https://github.com/influxdb/influxdb-python/issues
-
- Please note that we WILL get to your questions/issues/concerns as
quickly as possible. We maintain many
- software repositories and sometimes things may get pushed to the
backburner. Please don't take offense,
- we will do our best to reply as soon as possible!
-
-
- Source code
- -----------
-
- The source code is currently available on Github:
https://github.com/influxdata/influxdb-python
-
-
- TODO
- ----
-
- The TODO/Roadmap can be found in Github bug tracker:
https://github.com/influxdata/influxdb-python/issues
-
-
- .. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
- .. _Sphinx: http://sphinx.pocoo.org/
- .. _Tox: https://tox.readthedocs.org
-
-Platform: UNKNOWN
Classifier: Development Status :: 3 - Alpha
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
@@ -198,4 +16,208 @@
Classifier: Programming Language :: Python :: 3.6
Classifier: Topic :: Software Development :: Libraries
Classifier: Topic :: Software Development :: Libraries :: Python Modules
+License-File: LICENSE
+Requires-Dist: python-dateutil>=2.6.0
+Requires-Dist: pytz
+Requires-Dist: requests>=2.17.0
+Requires-Dist: six>=1.10.0
+Requires-Dist: msgpack
Provides-Extra: test
+Requires-Dist: nose; extra == "test"
+Requires-Dist: nose-cov; extra == "test"
+Requires-Dist: mock; extra == "test"
+Requires-Dist: requests-mock; extra == "test"
+
+The v1 client libraries for InfluxDB were typically developed and maintained by
+community members. For InfluxDB 3.0 users, this library is succeeded by the
+lightweight `v3 client library
<https://github.com/InfluxCommunity/influxdb3-python>`_.
+For InfluxDB 2.0 users, look at the `v2 client library
+<https://github.com/influxdata/influxdb-client-python>`_.
+
+If there are still users of this v1 client library, and they or somebody else
+are willing to keep them updated with security fixes at a minimum please reach
+out on the `Community Forums <https://community.influxdata.com/>`_ or
+`InfluxData Slack <https://influxdata.com/slack>`_.
+
+InfluxDB-Python
+===============
+
+.. image:: https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
+ :target: https://travis-ci.org/influxdata/influxdb-python
+.. image::
https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
+ :target: http://influxdb-python.readthedocs.org/
+ :alt: Documentation Status
+
+.. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg
+ :target: https://coveralls.io/r/influxdata/influxdb-python
+ :alt: Coverage
+
+.. image:: https://img.shields.io/pypi/v/influxdb.svg
+ :target: https://pypi.python.org/pypi/influxdb
+ :alt: PyPI Status
+
+InfluxDB-Python is a client for interacting with InfluxDB_.
+
+**Note: This library is for use with InfluxDB 1.x. For connecting to InfluxDB
2.x instances, please use the the** `influxdb-client-python
<https://github.com/influxdata/influxdb-client-python>`_ **client.**
+
+Development of this library is maintained by:
+
++-----------+-------------------------------+
+| Github ID | URL |
++===========+===============================+
+| @aviau | (https://github.com/aviau) |
++-----------+-------------------------------+
+| @xginn8 | (https://github.com/xginn8) |
++-----------+-------------------------------+
+| @sebito91 | (https://github.com/sebito91) |
++-----------+-------------------------------+
+
+.. _readme-about:
+
+InfluxDB is an open-source distributed time series database, find more about
InfluxDB_ at https://docs.influxdata.com/influxdb/latest
+
+
+.. _installation:
+
+InfluxDB pre v1.1.0 users
+-------------------------
+
+This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4,
v1.6.4, and 1.7.4.
+
+Those users still on InfluxDB v0.8.x users may still use the legacy client by
importing ``from influxdb.influxdb08 import InfluxDBClient``.
+
+Installation
+------------
+
+Install, upgrade and uninstall influxdb-python with these commands::
+
+ $ pip install influxdb
+ $ pip install --upgrade influxdb
+ $ pip uninstall influxdb
+
+On Debian/Ubuntu, you can install it with this command::
+
+ $ sudo apt-get install python-influxdb
+
+Dependencies
+------------
+
+The influxdb-python distribution is supported and tested on Python 2.7, 3.5,
3.6, 3.7, PyPy and PyPy3.
+
+**Note:** Python <3.5 are currently untested. See ``.travis.yml``.
+
+Main dependency is:
+
+- Requests: HTTP library for human beings (http://docs.python-requests.org/)
+
+
+Additional dependencies are:
+
+- pandas: for writing from and reading to DataFrames
(http://pandas.pydata.org/)
+- Sphinx: Tool to create and manage the documentation (http://sphinx-doc.org/)
+- Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
+- Mock: to mock tests (https://pypi.python.org/pypi/mock)
+
+
+Documentation
+-------------
+
+Documentation is available at
https://influxdb-python.readthedocs.io/en/latest/.
+
+You will need Sphinx_ installed to generate the documentation.
+
+The documentation can be generated by running::
+
+ $ tox -e docs
+
+
+Generated documentation can be found in the *docs/build/html/* directory.
+
+
+Examples
+--------
+
+Here's a basic example (for more see the examples directory)::
+
+ $ python
+
+ >>> from influxdb import InfluxDBClient
+
+ >>> json_body = [
+ {
+ "measurement": "cpu_load_short",
+ "tags": {
+ "host": "server01",
+ "region": "us-west"
+ },
+ "time": "2009-11-10T23:00:00Z",
+ "fields": {
+ "value": 0.64
+ }
+ }
+ ]
+
+ >>> client = InfluxDBClient('localhost', 8086, 'root', 'root', 'example')
+
+ >>> client.create_database('example')
+
+ >>> client.write_points(json_body)
+
+ >>> result = client.query('select value from cpu_load_short;')
+
+ >>> print("Result: {0}".format(result))
+
+
+Testing
+-------
+
+Make sure you have tox by running the following::
+
+ $ pip install tox
+
+To test influxdb-python with multiple version of Python, you can use Tox_::
+
+ $ tox
+
+
+Support
+-------
+
+For issues with, questions about, or feedback for InfluxDB_, please look into
+our community page: http://influxdb.com/community/.
+
+We are also lurking on the following:
+
+- #influxdb on irc.freenode.net
+- #influxdb on gophers.slack.com
+
+
+Development
+-----------
+
+All development is done on Github_. Use Issues_ to report
+problems or submit contributions.
+
+.. _Github: https://github.com/influxdb/influxdb-python/
+.. _Issues: https://github.com/influxdb/influxdb-python/issues
+
+Please note that we WILL get to your questions/issues/concerns as quickly as
possible. We maintain many
+software repositories and sometimes things may get pushed to the backburner.
Please don't take offense,
+we will do our best to reply as soon as possible!
+
+
+Source code
+-----------
+
+The source code is currently available on Github:
https://github.com/influxdata/influxdb-python
+
+
+TODO
+----
+
+The TODO/Roadmap can be found in Github bug tracker:
https://github.com/influxdata/influxdb-python/issues
+
+
+.. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
+.. _Sphinx: http://sphinx.pocoo.org/
+.. _Tox: https://tox.readthedocs.org
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/influxdb-5.3.1/README.rst
new/influxdb-5.3.2/README.rst
--- old/influxdb-5.3.1/README.rst 2020-04-08 18:30:41.000000000 +0200
+++ new/influxdb-5.3.2/README.rst 2024-04-17 15:12:44.000000000 +0200
@@ -1,3 +1,14 @@
+The v1 client libraries for InfluxDB were typically developed and maintained by
+community members. For InfluxDB 3.0 users, this library is succeeded by the
+lightweight `v3 client library
<https://github.com/InfluxCommunity/influxdb3-python>`_.
+For InfluxDB 2.0 users, look at the `v2 client library
+<https://github.com/influxdata/influxdb-client-python>`_.
+
+If there are still users of this v1 client library, and they or somebody else
+are willing to keep them updated with security fixes at a minimum please reach
+out on the `Community Forums <https://community.influxdata.com/>`_ or
+`InfluxData Slack <https://influxdata.com/slack>`_.
+
InfluxDB-Python
===============
@@ -17,6 +28,8 @@
InfluxDB-Python is a client for interacting with InfluxDB_.
+**Note: This library is for use with InfluxDB 1.x. For connecting to InfluxDB
2.x instances, please use the the** `influxdb-client-python
<https://github.com/influxdata/influxdb-client-python>`_ **client.**
+
Development of this library is maintained by:
+-----------+-------------------------------+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/influxdb-5.3.1/influxdb/__init__.py
new/influxdb-5.3.2/influxdb/__init__.py
--- old/influxdb-5.3.1/influxdb/__init__.py 2020-11-11 22:02:54.000000000
+0100
+++ new/influxdb-5.3.2/influxdb/__init__.py 2024-04-17 15:13:37.000000000
+0200
@@ -18,4 +18,4 @@
]
-__version__ = '5.3.1'
+__version__ = '5.3.2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/influxdb-5.3.1/influxdb/_dataframe_client.py
new/influxdb-5.3.2/influxdb/_dataframe_client.py
--- old/influxdb-5.3.1/influxdb/_dataframe_client.py 2020-11-11
20:10:37.000000000 +0100
+++ new/influxdb-5.3.2/influxdb/_dataframe_client.py 2024-04-17
15:12:44.000000000 +0200
@@ -372,10 +372,10 @@
# Make array of timestamp ints
if isinstance(dataframe.index, pd.PeriodIndex):
- time = ((dataframe.index.to_timestamp().values.astype(np.int64) /
+ time = ((dataframe.index.to_timestamp().values.astype(np.int64) //
precision_factor).astype(np.int64).astype(str))
else:
- time = ((pd.to_datetime(dataframe.index).values.astype(np.int64) /
+ time = ((pd.to_datetime(dataframe.index).values.astype(np.int64) //
precision_factor).astype(np.int64).astype(str))
# If tag columns exist, make an array of formatted tag keys and values
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/influxdb-5.3.1/influxdb/client.py
new/influxdb-5.3.2/influxdb/client.py
--- old/influxdb-5.3.1/influxdb/client.py 2020-11-11 20:10:37.000000000
+0100
+++ new/influxdb-5.3.2/influxdb/client.py 2024-04-16 16:22:32.000000000
+0200
@@ -20,6 +20,7 @@
import msgpack
import requests
import requests.exceptions
+from requests.adapters import HTTPAdapter
from six.moves.urllib.parse import urlparse
from influxdb.line_protocol import make_lines, quote_ident, quote_literal
@@ -87,6 +88,11 @@
:param headers: headers to add to Requests, will add 'Content-Type'
and 'Accept' unless these are already present, defaults to {}
:type headers: dict
+ :param socket_options: use custom tcp socket options,
+ If not specified, then defaults are loaded from
+ ``HTTPConnection.default_socket_options``
+ :type socket_options: list
+
:raises ValueError: if cert is provided but ssl is disabled (set to False)
"""
@@ -109,6 +115,7 @@
gzip=False,
session=None,
headers=None,
+ socket_options=None,
):
"""Construct a new InfluxDBClient object."""
self.__host = host
@@ -128,9 +135,10 @@
session = requests.Session()
self._session = session
- adapter = requests.adapters.HTTPAdapter(
+ adapter = _SocketOptionsAdapter(
pool_connections=int(pool_size),
- pool_maxsize=int(pool_size)
+ pool_maxsize=int(pool_size),
+ socket_options=socket_options
)
if use_udp:
@@ -179,7 +187,7 @@
def __enter__(self):
"""Enter function as used by context manager."""
- pass
+ return self
def __exit__(self, _exc_type, _exc_value, _traceback):
"""Exit function as used by context manager."""
@@ -328,7 +336,10 @@
_try = 0
while retry:
try:
- auth = (self._username, self._password)
+ if "Authorization" in headers:
+ auth = (None, None)
+ else:
+ auth = (self._username, self._password)
response = self._session.request(
method=method,
url=url,
@@ -626,7 +637,7 @@
# http://code.activestate.com/recipes/303279-getting-items-in-batches/
iterator = iter(iterable)
while True:
- try: # Try get the first element in the iterator...
+ try: # Try get the first element in the iterator...
head = (next(iterator),)
except StopIteration:
return # ...so that we can stop if there isn't one
@@ -1249,3 +1260,16 @@
timestamp += datetime.timedelta(microseconds=(epoch_ns / 1000))
return timestamp.isoformat() + 'Z'
return msgpack.ExtType(code, data)
+
+
+class _SocketOptionsAdapter(HTTPAdapter):
+ """_SocketOptionsAdapter injects socket_options into HTTP Adapter."""
+
+ def __init__(self, *args, **kwargs):
+ self.socket_options = kwargs.pop("socket_options", None)
+ super(_SocketOptionsAdapter, self).__init__(*args, **kwargs)
+
+ def init_poolmanager(self, *args, **kwargs):
+ if self.socket_options is not None:
+ kwargs["socket_options"] = self.socket_options
+ super(_SocketOptionsAdapter, self).init_poolmanager(*args, **kwargs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/influxdb-5.3.1/influxdb/tests/client_test.py
new/influxdb-5.3.2/influxdb/tests/client_test.py
--- old/influxdb-5.3.1/influxdb/tests/client_test.py 2020-11-11
20:10:37.000000000 +0100
+++ new/influxdb-5.3.2/influxdb/tests/client_test.py 2024-04-16
16:22:32.000000000 +0200
@@ -33,6 +33,7 @@
import requests_mock
from nose.tools import raises
+from urllib3.connection import HTTPConnection
from influxdb import InfluxDBClient
from influxdb.resultset import ResultSet
@@ -1398,7 +1399,7 @@
InfluxDBClient('host', '80/redir', 'username', 'password')
def test_chunked_response(self):
- """Test chunked reponse for TestInfluxDBClient object."""
+ """Test chunked response for TestInfluxDBClient object."""
example_response = \
u'{"results":[{"statement_id":0,"series":[{"columns":["key"],' \
'"values":[["cpu"],["memory"],["iops"],["network"]],"partial":' \
@@ -1498,6 +1499,40 @@
self.assertEqual(m.last_request.headers["Authorization"],
"my-token")
+ def test_custom_socket_options(self):
+ """Test custom socket options."""
+ test_socket_options = HTTPConnection.default_socket_options + \
+ [(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+ (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 60),
+ (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 15)]
+
+ cli = InfluxDBClient(username=None, password=None,
+ socket_options=test_socket_options)
+
+ self.assertEquals(cli._session.adapters.get("http://";).socket_options,
+ test_socket_options)
+ self.assertEquals(cli._session.adapters.get("http://";).poolmanager.
+ connection_pool_kw.get("socket_options"),
+ test_socket_options)
+
+ connection_pool = cli._session.adapters.get("http://";).poolmanager \
+ .connection_from_url(
+ url="http://localhost:8086";)
+ new_connection = connection_pool._new_conn()
+ self.assertEquals(new_connection.socket_options, test_socket_options)
+
+ def test_none_socket_options(self):
+ """Test default socket options."""
+ cli = InfluxDBClient(username=None, password=None)
+ self.assertEquals(cli._session.adapters.get("http://";).socket_options,
+ None)
+ connection_pool = cli._session.adapters.get("http://";).poolmanager \
+ .connection_from_url(
+ url="http://localhost:8086";)
+ new_connection = connection_pool._new_conn()
+ self.assertEquals(new_connection.socket_options,
+ HTTPConnection.default_socket_options)
+
class FakeClient(InfluxDBClient):
"""Set up a fake client instance of InfluxDBClient."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/influxdb-5.3.1/influxdb/tests/dataframe_client_test.py
new/influxdb-5.3.2/influxdb/tests/dataframe_client_test.py
--- old/influxdb-5.3.1/influxdb/tests/dataframe_client_test.py 2020-11-11
20:10:37.000000000 +0100
+++ new/influxdb-5.3.2/influxdb/tests/dataframe_client_test.py 2024-04-17
15:12:44.000000000 +0200
@@ -877,7 +877,7 @@
{"measurement": "network",
"tags": {"direction": ""},
"columns": ["time", "value"],
- "values":[["2009-11-10T23:00:00Z", 23422]]
+ "values": [["2009-11-10T23:00:00Z", 23422]]
},
{"measurement": "network",
"tags": {"direction": "in"},
@@ -1274,3 +1274,75 @@
self.assertListEqual(["time", "host"],
list(_data_frame.index.names))
+
+ def test_dataframe_nanosecond_precision(self):
+ """Test nanosecond precision."""
+ for_df_dict = {
+ "nanFloats": [1.1, float('nan'), 3.3, 4.4],
+ "onlyFloats": [1.1, 2.2, 3.3, 4.4],
+ "strings": ['one_one', 'two_two', 'three_three', 'four_four']
+ }
+ df = pd.DataFrame.from_dict(for_df_dict)
+ df['time'] = ['2019-10-04 06:27:19.850557111+00:00',
+ '2019-10-04 06:27:19.850557184+00:00',
+ '2019-10-04 06:27:42.251396864+00:00',
+ '2019-10-04 06:27:42.251396974+00:00']
+ df['time'] = pd.to_datetime(df['time'], unit='ns')
+ df = df.set_index('time')
+
+ expected = (
+ b'foo nanFloats=1.1,onlyFloats=1.1,strings="one_one"
1570170439850557111\n' # noqa E501 line too long
+ b'foo onlyFloats=2.2,strings="two_two" 1570170439850557184\n' #
noqa E501 line too long
+ b'foo nanFloats=3.3,onlyFloats=3.3,strings="three_three"
1570170462251396864\n' # noqa E501 line too long
+ b'foo nanFloats=4.4,onlyFloats=4.4,strings="four_four"
1570170462251396974\n' # noqa E501 line too long
+ )
+
+ with requests_mock.Mocker() as m:
+ m.register_uri(
+ requests_mock.POST,
+ "http://localhost:8086/write";,
+ status_code=204
+ )
+
+ cli = DataFrameClient(database='db')
+ cli.write_points(df, 'foo', time_precision='n')
+
+ self.assertEqual(m.last_request.body, expected)
+
+ def test_dataframe_nanosecond_precision_one_microsecond(self):
+ """Test nanosecond precision within one microsecond."""
+ # 1 microsecond = 1000 nanoseconds
+ start = np.datetime64('2019-10-04T06:27:19.850557000')
+ end = np.datetime64('2019-10-04T06:27:19.850558000')
+
+ # generate timestamps with nanosecond precision
+ timestamps = np.arange(
+ start,
+ end + np.timedelta64(1, 'ns'),
+ np.timedelta64(1, 'ns')
+ )
+ # generate values
+ values = np.arange(0.0, len(timestamps))
+
+ df = pd.DataFrame({'value': values}, index=timestamps)
+ with requests_mock.Mocker() as m:
+ m.register_uri(
+ requests_mock.POST,
+ "http://localhost:8086/write";,
+ status_code=204
+ )
+
+ cli = DataFrameClient(database='db')
+ cli.write_points(df, 'foo', time_precision='n')
+
+ lines = m.last_request.body.decode('utf-8').split('\n')
+ self.assertEqual(len(lines), 1002)
+
+ for index, line in enumerate(lines):
+ if index == 1001:
+ self.assertEqual(line, '')
+ continue
+ self.assertEqual(
+ line,
+ f"foo value={index}.0 157017043985055{7000 + index:04}"
+ )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/influxdb-5.3.1/influxdb.egg-info/PKG-INFO
new/influxdb-5.3.2/influxdb.egg-info/PKG-INFO
--- old/influxdb-5.3.1/influxdb.egg-info/PKG-INFO 2020-11-11
22:23:18.000000000 +0100
+++ new/influxdb-5.3.2/influxdb.egg-info/PKG-INFO 2024-04-18
23:45:02.000000000 +0200
@@ -1,191 +1,9 @@
Metadata-Version: 2.1
Name: influxdb
-Version: 5.3.1
+Version: 5.3.2
Summary: InfluxDB client
Home-page: https://github.com/influxdb/influxdb-python
License: MIT License
-Description: InfluxDB-Python
- ===============
-
- .. image::
https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
- :target: https://travis-ci.org/influxdata/influxdb-python
- .. image::
https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
- :target: http://influxdb-python.readthedocs.org/
- :alt: Documentation Status
-
- .. image::
https://img.shields.io/coveralls/influxdata/influxdb-python.svg
- :target: https://coveralls.io/r/influxdata/influxdb-python
- :alt: Coverage
-
- .. image:: https://img.shields.io/pypi/v/influxdb.svg
- :target: https://pypi.python.org/pypi/influxdb
- :alt: PyPI Status
-
- InfluxDB-Python is a client for interacting with InfluxDB_.
-
- Development of this library is maintained by:
-
- +-----------+-------------------------------+
- | Github ID | URL |
- +===========+===============================+
- | @aviau | (https://github.com/aviau) |
- +-----------+-------------------------------+
- | @xginn8 | (https://github.com/xginn8) |
- +-----------+-------------------------------+
- | @sebito91 | (https://github.com/sebito91) |
- +-----------+-------------------------------+
-
- .. _readme-about:
-
- InfluxDB is an open-source distributed time series database, find more
about InfluxDB_ at https://docs.influxdata.com/influxdb/latest
-
-
- .. _installation:
-
- InfluxDB pre v1.1.0 users
- -------------------------
-
- This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3,
v1.5.4, v1.6.4, and 1.7.4.
-
- Those users still on InfluxDB v0.8.x users may still use the legacy
client by importing ``from influxdb.influxdb08 import InfluxDBClient``.
-
- Installation
- ------------
-
- Install, upgrade and uninstall influxdb-python with these commands::
-
- $ pip install influxdb
- $ pip install --upgrade influxdb
- $ pip uninstall influxdb
-
- On Debian/Ubuntu, you can install it with this command::
-
- $ sudo apt-get install python-influxdb
-
- Dependencies
- ------------
-
- The influxdb-python distribution is supported and tested on Python
2.7, 3.5, 3.6, 3.7, PyPy and PyPy3.
-
- **Note:** Python <3.5 are currently untested. See ``.travis.yml``.
-
- Main dependency is:
-
- - Requests: HTTP library for human beings
(http://docs.python-requests.org/)
-
-
- Additional dependencies are:
-
- - pandas: for writing from and reading to DataFrames
(http://pandas.pydata.org/)
- - Sphinx: Tool to create and manage the documentation
(http://sphinx-doc.org/)
- - Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
- - Mock: to mock tests (https://pypi.python.org/pypi/mock)
-
-
- Documentation
- -------------
-
- Documentation is available at
https://influxdb-python.readthedocs.io/en/latest/.
-
- You will need Sphinx_ installed to generate the documentation.
-
- The documentation can be generated by running::
-
- $ tox -e docs
-
-
- Generated documentation can be found in the *docs/build/html/*
directory.
-
-
- Examples
- --------
-
- Here's a basic example (for more see the examples directory)::
-
- $ python
-
- >>> from influxdb import InfluxDBClient
-
- >>> json_body = [
- {
- "measurement": "cpu_load_short",
- "tags": {
- "host": "server01",
- "region": "us-west"
- },
- "time": "2009-11-10T23:00:00Z",
- "fields": {
- "value": 0.64
- }
- }
- ]
-
- >>> client = InfluxDBClient('localhost', 8086, 'root', 'root',
'example')
-
- >>> client.create_database('example')
-
- >>> client.write_points(json_body)
-
- >>> result = client.query('select value from cpu_load_short;')
-
- >>> print("Result: {0}".format(result))
-
-
- Testing
- -------
-
- Make sure you have tox by running the following::
-
- $ pip install tox
-
- To test influxdb-python with multiple version of Python, you can use
Tox_::
-
- $ tox
-
-
- Support
- -------
-
- For issues with, questions about, or feedback for InfluxDB_, please
look into
- our community page: http://influxdb.com/community/.
-
- We are also lurking on the following:
-
- - #influxdb on irc.freenode.net
- - #influxdb on gophers.slack.com
-
-
- Development
- -----------
-
- All development is done on Github_. Use Issues_ to report
- problems or submit contributions.
-
- .. _Github: https://github.com/influxdb/influxdb-python/
- .. _Issues: https://github.com/influxdb/influxdb-python/issues
-
- Please note that we WILL get to your questions/issues/concerns as
quickly as possible. We maintain many
- software repositories and sometimes things may get pushed to the
backburner. Please don't take offense,
- we will do our best to reply as soon as possible!
-
-
- Source code
- -----------
-
- The source code is currently available on Github:
https://github.com/influxdata/influxdb-python
-
-
- TODO
- ----
-
- The TODO/Roadmap can be found in Github bug tracker:
https://github.com/influxdata/influxdb-python/issues
-
-
- .. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
- .. _Sphinx: http://sphinx.pocoo.org/
- .. _Tox: https://tox.readthedocs.org
-
-Platform: UNKNOWN
Classifier: Development Status :: 3 - Alpha
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
@@ -198,4 +16,208 @@
Classifier: Programming Language :: Python :: 3.6
Classifier: Topic :: Software Development :: Libraries
Classifier: Topic :: Software Development :: Libraries :: Python Modules
+License-File: LICENSE
+Requires-Dist: python-dateutil>=2.6.0
+Requires-Dist: pytz
+Requires-Dist: requests>=2.17.0
+Requires-Dist: six>=1.10.0
+Requires-Dist: msgpack
Provides-Extra: test
+Requires-Dist: nose; extra == "test"
+Requires-Dist: nose-cov; extra == "test"
+Requires-Dist: mock; extra == "test"
+Requires-Dist: requests-mock; extra == "test"
+
+The v1 client libraries for InfluxDB were typically developed and maintained by
+community members. For InfluxDB 3.0 users, this library is succeeded by the
+lightweight `v3 client library
<https://github.com/InfluxCommunity/influxdb3-python>`_.
+For InfluxDB 2.0 users, look at the `v2 client library
+<https://github.com/influxdata/influxdb-client-python>`_.
+
+If there are still users of this v1 client library, and they or somebody else
+are willing to keep them updated with security fixes at a minimum please reach
+out on the `Community Forums <https://community.influxdata.com/>`_ or
+`InfluxData Slack <https://influxdata.com/slack>`_.
+
+InfluxDB-Python
+===============
+
+.. image:: https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
+ :target: https://travis-ci.org/influxdata/influxdb-python
+.. image::
https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
+ :target: http://influxdb-python.readthedocs.org/
+ :alt: Documentation Status
+
+.. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg
+ :target: https://coveralls.io/r/influxdata/influxdb-python
+ :alt: Coverage
+
+.. image:: https://img.shields.io/pypi/v/influxdb.svg
+ :target: https://pypi.python.org/pypi/influxdb
+ :alt: PyPI Status
+
+InfluxDB-Python is a client for interacting with InfluxDB_.
+
+**Note: This library is for use with InfluxDB 1.x. For connecting to InfluxDB
2.x instances, please use the the** `influxdb-client-python
<https://github.com/influxdata/influxdb-client-python>`_ **client.**
+
+Development of this library is maintained by:
+
++-----------+-------------------------------+
+| Github ID | URL |
++===========+===============================+
+| @aviau | (https://github.com/aviau) |
++-----------+-------------------------------+
+| @xginn8 | (https://github.com/xginn8) |
++-----------+-------------------------------+
+| @sebito91 | (https://github.com/sebito91) |
++-----------+-------------------------------+
+
+.. _readme-about:
+
+InfluxDB is an open-source distributed time series database, find more about
InfluxDB_ at https://docs.influxdata.com/influxdb/latest
+
+
+.. _installation:
+
+InfluxDB pre v1.1.0 users
+-------------------------
+
+This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4,
v1.6.4, and 1.7.4.
+
+Those users still on InfluxDB v0.8.x users may still use the legacy client by
importing ``from influxdb.influxdb08 import InfluxDBClient``.
+
+Installation
+------------
+
+Install, upgrade and uninstall influxdb-python with these commands::
+
+ $ pip install influxdb
+ $ pip install --upgrade influxdb
+ $ pip uninstall influxdb
+
+On Debian/Ubuntu, you can install it with this command::
+
+ $ sudo apt-get install python-influxdb
+
+Dependencies
+------------
+
+The influxdb-python distribution is supported and tested on Python 2.7, 3.5,
3.6, 3.7, PyPy and PyPy3.
+
+**Note:** Python <3.5 are currently untested. See ``.travis.yml``.
+
+Main dependency is:
+
+- Requests: HTTP library for human beings (http://docs.python-requests.org/)
+
+
+Additional dependencies are:
+
+- pandas: for writing from and reading to DataFrames
(http://pandas.pydata.org/)
+- Sphinx: Tool to create and manage the documentation (http://sphinx-doc.org/)
+- Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
+- Mock: to mock tests (https://pypi.python.org/pypi/mock)
+
+
+Documentation
+-------------
+
+Documentation is available at
https://influxdb-python.readthedocs.io/en/latest/.
+
+You will need Sphinx_ installed to generate the documentation.
+
+The documentation can be generated by running::
+
+ $ tox -e docs
+
+
+Generated documentation can be found in the *docs/build/html/* directory.
+
+
+Examples
+--------
+
+Here's a basic example (for more see the examples directory)::
+
+ $ python
+
+ >>> from influxdb import InfluxDBClient
+
+ >>> json_body = [
+ {
+ "measurement": "cpu_load_short",
+ "tags": {
+ "host": "server01",
+ "region": "us-west"
+ },
+ "time": "2009-11-10T23:00:00Z",
+ "fields": {
+ "value": 0.64
+ }
+ }
+ ]
+
+ >>> client = InfluxDBClient('localhost', 8086, 'root', 'root', 'example')
+
+ >>> client.create_database('example')
+
+ >>> client.write_points(json_body)
+
+ >>> result = client.query('select value from cpu_load_short;')
+
+ >>> print("Result: {0}".format(result))
+
+
+Testing
+-------
+
+Make sure you have tox by running the following::
+
+ $ pip install tox
+
+To test influxdb-python with multiple version of Python, you can use Tox_::
+
+ $ tox
+
+
+Support
+-------
+
+For issues with, questions about, or feedback for InfluxDB_, please look into
+our community page: http://influxdb.com/community/.
+
+We are also lurking on the following:
+
+- #influxdb on irc.freenode.net
+- #influxdb on gophers.slack.com
+
+
+Development
+-----------
+
+All development is done on Github_. Use Issues_ to report
+problems or submit contributions.
+
+.. _Github: https://github.com/influxdb/influxdb-python/
+.. _Issues: https://github.com/influxdb/influxdb-python/issues
+
+Please note that we WILL get to your questions/issues/concerns as quickly as
possible. We maintain many
+software repositories and sometimes things may get pushed to the backburner.
Please don't take offense,
+we will do our best to reply as soon as possible!
+
+
+Source code
+-----------
+
+The source code is currently available on Github:
https://github.com/influxdata/influxdb-python
+
+
+TODO
+----
+
+The TODO/Roadmap can be found in Github bug tracker:
https://github.com/influxdata/influxdb-python/issues
+
+
+.. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
+.. _Sphinx: http://sphinx.pocoo.org/
+.. _Tox: https://tox.readthedocs.org
++++++ influxdb-pr845-pandas-future.patch ++++++
--- /var/tmp/diff_new_pack.u7ZXol/_old 2024-09-11 16:57:45.543961860 +0200
+++ /var/tmp/diff_new_pack.u7ZXol/_new 2024-09-11 16:57:45.547962026 +0200
@@ -7,10 +7,10 @@
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 @@
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
++++++ python-influxdb-new-pandas.patch ++++++
--- /var/tmp/diff_new_pack.u7ZXol/_old 2024-09-11 16:57:45.559962527 +0200
+++ /var/tmp/diff_new_pack.u7ZXol/_new 2024-09-11 16:57:45.567962861 +0200
@@ -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 @@
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 @@
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 @@
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())))
++++++ python-influxdb-no-six.patch ++++++
--- /var/tmp/diff_new_pack.u7ZXol/_old 2024-09-11 16:57:45.579963363 +0200
+++ /var/tmp/diff_new_pack.u7ZXol/_new 2024-09-11 16:57:45.579963363 +0200
@@ -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 @@
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 @@
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 @@
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 @@
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
++++++ python-influxdb-remove-nose.patch ++++++
--- /var/tmp/diff_new_pack.u7ZXol/_old 2024-09-11 16:57:45.591963865 +0200
+++ /var/tmp/diff_new_pack.u7ZXol/_new 2024-09-11 16:57:45.595964031 +0200
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
@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 @@
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
