This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new f47a2a8af6 Refactor: Consolidate "import numpy as np" (#34111)
f47a2a8af6 is described below
commit f47a2a8af682d39085b0cd4f086300226f1a50e0
Author: Miroslav Šedivý <[email protected]>
AuthorDate: Thu Sep 7 02:10:04 2023 +0000
Refactor: Consolidate "import numpy as np" (#34111)
---
airflow/providers/oracle/hooks/oracle.py | 6 +++---
tests/providers/oracle/hooks/test_oracle.py | 10 +++++-----
tests/providers/salesforce/hooks/test_salesforce.py | 4 ++--
tests/serialization/serializers/test_serializers.py | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/airflow/providers/oracle/hooks/oracle.py
b/airflow/providers/oracle/hooks/oracle.py
index 2b6bfdb009..bbf98fb405 100644
--- a/airflow/providers/oracle/hooks/oracle.py
+++ b/airflow/providers/oracle/hooks/oracle.py
@@ -275,9 +275,9 @@ class OracleHook(DbApiHook):
:param replace: Whether to replace instead of insert
"""
try:
- import numpy
+ import numpy as np
except ImportError:
- numpy = None # type: ignore
+ np = None # type: ignore
if target_fields:
target_fields = ", ".join(target_fields)
@@ -297,7 +297,7 @@ class OracleHook(DbApiHook):
lst.append("'" + str(cell).replace("'", "''") + "'")
elif cell is None or isinstance(cell, float) and
math.isnan(cell): # coerce numpy NaN to NULL
lst.append("NULL")
- elif numpy and isinstance(cell, numpy.datetime64):
+ elif np and isinstance(cell, np.datetime64):
lst.append("'" + str(cell) + "'")
elif isinstance(cell, datetime):
lst.append(f"to_date('{cell:%Y-%m-%d
%H:%M:%S}','YYYY-MM-DD HH24:MI:SS')")
diff --git a/tests/providers/oracle/hooks/test_oracle.py
b/tests/providers/oracle/hooks/test_oracle.py
index 9f49618b45..fa40ffcccb 100644
--- a/tests/providers/oracle/hooks/test_oracle.py
+++ b/tests/providers/oracle/hooks/test_oracle.py
@@ -21,7 +21,7 @@ import json
from datetime import datetime
from unittest import mock
-import numpy
+import numpy as np
import oracledb
import pytest
@@ -290,8 +290,8 @@ class TestOracleHook:
(
"'basestr_with_quote",
None,
- numpy.NAN,
- numpy.datetime64("2019-01-24T01:02:03"),
+ np.NAN,
+ np.datetime64("2019-01-24T01:02:03"),
datetime(2019, 1, 24),
1,
10.24,
@@ -321,8 +321,8 @@ class TestOracleHook:
(
"'basestr_with_quote",
None,
- numpy.NAN,
- numpy.datetime64("2019-01-24T01:02:03"),
+ np.NAN,
+ np.datetime64("2019-01-24T01:02:03"),
datetime(2019, 1, 24),
1,
10.24,
diff --git a/tests/providers/salesforce/hooks/test_salesforce.py
b/tests/providers/salesforce/hooks/test_salesforce.py
index b670856a4a..2c437fdcb2 100644
--- a/tests/providers/salesforce/hooks/test_salesforce.py
+++ b/tests/providers/salesforce/hooks/test_salesforce.py
@@ -21,9 +21,9 @@ import os
from unittest import mock
from unittest.mock import Mock, patch
+import numpy as np
import pandas as pd
import pytest
-from numpy import nan
from pytest import param
from requests import Session as request_session
from simple_salesforce import Salesforce, api
@@ -340,7 +340,7 @@ class TestSalesforceHook:
@patch(
"pandas.DataFrame.from_records",
- return_value=pd.DataFrame({"test": [1, 2, 3], "dict": [nan, nan,
{"foo": "bar"}]}),
+ return_value=pd.DataFrame({"test": [1, 2, 3], "dict": [np.nan, np.nan,
{"foo": "bar"}]}),
)
def test_write_object_to_file_csv(self, mock_data_frame):
mock_data_frame.return_value.to_csv = Mock()
diff --git a/tests/serialization/serializers/test_serializers.py
b/tests/serialization/serializers/test_serializers.py
index 66f142e0ac..62ec8f3d9f 100644
--- a/tests/serialization/serializers/test_serializers.py
+++ b/tests/serialization/serializers/test_serializers.py
@@ -19,7 +19,7 @@ from __future__ import annotations
import datetime
import decimal
-import numpy
+import numpy as np
import pendulum.tz
import pytest
from pendulum import DateTime
@@ -81,7 +81,7 @@ class TestSerializers:
}
def test_numpy(self):
- i = numpy.int16(10)
+ i = np.int16(10)
e = serialize(i)
d = deserialize(e)
assert i == d
