Update deprecated datetime.utcnow() (rtdip#748)

* Update datetime utcnow Signed-off-by: GBBBAS <[email protected]> * Update whitesource file Signed-off-by: GBBBAS <[email protected]> --------- Signed-off-by: GBBBAS <[email protected]>
GBBBAS · May 21, 2024 · 08bdb98 · 08bdb98
1 parent 5a796a0
commit 08bdb98
Show file tree

Hide file tree

Showing 20 changed files with 302 additions and 121 deletions.
diff --git a/.whitesource b/.whitesource
@@ -1,3 +1,14 @@
 {
-  "settingsInheritedFrom": "sede-x/whitesource-config@main"
+  "scanSettings": {
+    "baseBranches": []
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure",
+    "displayMode": "diff",
+    "useMendCheckNames": true
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW",
+    "issueType": "DEPENDENCY"
+  }
 }
diff --git a/src/sdk/python/rtdip_sdk/pipelines/sources/spark/iso/pjm_historical_load_iso.py b/src/sdk/python/rtdip_sdk/pipelines/sources/spark/iso/pjm_historical_load_iso.py
@@ -14,7 +14,7 @@
 
 import logging
 import time
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from io import BytesIO
 
 import pandas as pd
@@ -172,13 +172,17 @@ def _validate_options(self) -> bool:
                 f"Unable to parse End date. Please specify in {self.user_datetime_format} format."
             )
 
-        if start_date > datetime.utcnow() - timedelta(days=1):
+        if start_date > datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(
+            days=1
+        ):
             raise ValueError("Start date can't be in future.")
 
         if start_date > end_date:
             raise ValueError("Start date can't be ahead of End date.")
 
-        if end_date > datetime.utcnow() - timedelta(days=1):
+        if end_date > datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(
+            days=1
+        ):
             raise ValueError("End date can't be in future.")
 
         if self.sleep_duration < 0:

diff --git a/src/sdk/python/rtdip_sdk/pipelines/sources/spark/iso/pjm_historical_pricing_iso.py b/src/sdk/python/rtdip_sdk/pipelines/sources/spark/iso/pjm_historical_pricing_iso.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 import time
 import pandas as pd
@@ -142,13 +142,17 @@ def _validate_options(self) -> bool:
                 f"Unable to parse End date. Please specify in {self.user_datetime_format} format."
             )
 
-        if start_date > datetime.utcnow() - timedelta(days=1):
+        if start_date > datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(
+            days=1
+        ):
             raise ValueError("Start date can't be in future.")
 
         if start_date > end_date:
             raise ValueError("Start date can't be ahead of End date.")
 
-        if end_date > datetime.utcnow() - timedelta(days=1):
+        if end_date > datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(
+            days=1
+        ):
             raise ValueError("End date can't be in future.")
 
         return True
diff --git a/...dk/pipelines/transformers/spark/the_weather_company/raw_forecast_to_weather_data_model.py b/...dk/pipelines/transformers/spark/the_weather_company/raw_forecast_to_weather_data_model.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from datetime import datetime
+from datetime import datetime, timezone
 
 from pyspark.sql import DataFrame, SparkSession
 from pyspark.sql.functions import when, substring, lit, col, concat
@@ -91,7 +91,7 @@ def transform(self) -> DataFrame:
 
         self.pre_transform_validation()
 
-        processed_date = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+        processed_date = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
 
         df = (
             self.data.withColumn("WeatherDay", substring("FcstValidLocal", 0, 10))

diff --git a/tests/api/v1/test_api_circular_average.py b/tests/api/v1/test_api_circular_average.py
@@ -15,7 +15,7 @@
 import pytest
 from pytest_mock import MockerFixture
 import pandas as pd
-from datetime import datetime
+from datetime import datetime, timezone
 from tests.api.v1.api_test_objects import (
     CIRCULAR_AVERAGE_MOCKED_PARAMETER_DICT,
     CIRCULAR_AVERAGE_MOCKED_PARAMETER_ERROR_DICT,
@@ -36,7 +36,11 @@
 
 async def test_api_circular_average_get_success(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.5]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.5],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -49,7 +53,8 @@ async def test_api_circular_average_get_success(mocker: MockerFixture):
     actual = response.text
     expected = test_data.to_json(orient="table", index=False, date_unit="ns")
     expected = (
-        expected.rstrip("}") + ',"pagination":{"limit":null,"offset":null,"next":null}}'
+        expected.replace(',"tz":"UTC"', "").rstrip("}")
+        + ',"pagination":{"limit":null,"offset":null,"next":null}}'
     )
 
     assert response.status_code == 200
@@ -58,7 +63,11 @@ async def test_api_circular_average_get_success(mocker: MockerFixture):
 
 async def test_api_circular_average_get_validation_error(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -79,7 +88,11 @@ async def test_api_circular_average_get_validation_error(mocker: MockerFixture):
 
 async def test_api_circular_average_get_error(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(
         mocker, MOCK_METHOD, test_data, Exception("Error Connecting to Database")
@@ -99,7 +112,11 @@ async def test_api_circular_average_get_error(mocker: MockerFixture):
 
 async def test_api_circular_average_post_success(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.5]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.5],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -113,7 +130,8 @@ async def test_api_circular_average_post_success(mocker: MockerFixture):
     actual = response.text
     expected = test_data.to_json(orient="table", index=False, date_unit="ns")
     expected = (
-        expected.rstrip("}") + ',"pagination":{"limit":null,"offset":null,"next":null}}'
+        expected.replace(',"tz":"UTC"', "").rstrip("}")
+        + ',"pagination":{"limit":null,"offset":null,"next":null}}'
     )
 
     assert response.status_code == 200
@@ -122,7 +140,11 @@ async def test_api_circular_average_post_success(mocker: MockerFixture):
 
 async def test_api_circular_average_post_validation_error(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -144,7 +166,11 @@ async def test_api_circular_average_post_validation_error(mocker: MockerFixture)
 
 async def test_api_circular_average_post_error(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(
         mocker, MOCK_METHOD, test_data, Exception("Error Connecting to Database")

diff --git a/tests/api/v1/test_api_circular_standard_deviation.py b/tests/api/v1/test_api_circular_standard_deviation.py
@@ -15,7 +15,7 @@
 import pytest
 from pytest_mock import MockerFixture
 import pandas as pd
-from datetime import datetime
+from datetime import datetime, timezone
 from tests.api.v1.api_test_objects import (
     CIRCULAR_AVERAGE_MOCKED_PARAMETER_DICT,
     CIRCULAR_AVERAGE_MOCKED_PARAMETER_ERROR_DICT,
@@ -38,7 +38,11 @@
 
 async def test_api_circular_standard_deviation_get_success(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.5]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.5],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -51,7 +55,8 @@ async def test_api_circular_standard_deviation_get_success(mocker: MockerFixture
     actual = response.text
     expected = test_data.to_json(orient="table", index=False, date_unit="ns")
     expected = (
-        expected.rstrip("}") + ',"pagination":{"limit":null,"offset":null,"next":null}}'
+        expected.replace(',"tz":"UTC"', "").rstrip("}")
+        + ',"pagination":{"limit":null,"offset":null,"next":null}}'
     )
 
     assert response.status_code == 200
@@ -62,7 +67,11 @@ async def test_api_circular_standard_deviation_get_validation_error(
     mocker: MockerFixture,
 ):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -83,7 +92,11 @@ async def test_api_circular_standard_deviation_get_validation_error(
 
 async def test_api_circular_standard_deviation_get_error(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(
         mocker, MOCK_METHOD, test_data, Exception("Error Connecting to Database")
@@ -103,7 +116,11 @@ async def test_api_circular_standard_deviation_get_error(mocker: MockerFixture):
 
 async def test_api_circular_standard_deviation_post_success(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.5]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.5],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -117,7 +134,8 @@ async def test_api_circular_standard_deviation_post_success(mocker: MockerFixtur
     actual = response.text
     expected = test_data.to_json(orient="table", index=False, date_unit="ns")
     expected = (
-        expected.rstrip("}") + ',"pagination":{"limit":null,"offset":null,"next":null}}'
+        expected.replace(',"tz":"UTC"', "").rstrip("}")
+        + ',"pagination":{"limit":null,"offset":null,"next":null}}'
     )
 
     assert response.status_code == 200
@@ -128,7 +146,11 @@ async def test_api_circular_standard_deviation_post_validation_error(
     mocker: MockerFixture,
 ):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
 
@@ -150,7 +172,11 @@ async def test_api_circular_standard_deviation_post_validation_error(
 
 async def test_api_circular_standard_deviation_post_error(mocker: MockerFixture):
     test_data = pd.DataFrame(
-        {"EventTime": [datetime.utcnow()], "TagName": ["TestTag"], "Value": [1.01]}
+        {
+            "EventTime": [datetime.now(timezone.utc)],
+            "TagName": ["TestTag"],
+            "Value": [1.01],
+        }
     )
     mocker = mocker_setup(
         mocker, MOCK_METHOD, test_data, Exception("Error Connecting to Database")