Skip to content

Commit e5c9603

Browse files
committed
fix deprecated datetime.utcnow() and pytest return warnings
1 parent 7152981 commit e5c9603

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

investments/data_providers/cbr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def _fetch_currency_rates(self, currency: Currency):
6262
self._frames_loaded[frame_key] = df
6363
return
6464

65-
end_date = (datetime.datetime.utcnow() + datetime.timedelta(days=1)).strftime('%d/%m/%Y')
65+
end_date = (datetime.datetime.now(datetime.UTC) + datetime.timedelta(days=1)).strftime('%d/%m/%Y')
6666
r = requests.get(f'http://www.cbr.ru/scripts/XML_dynamic.asp?date_req1=01/01/{self._year_from}&date_req2={end_date}&VAL_NM_RQ={currency.cbr_code}', timeout=10)
6767

6868
tree = ET.fromstring(r.text)
@@ -77,7 +77,7 @@ def _fetch_currency_rates(self, currency: Currency):
7777

7878
df = pandas.DataFrame(rates_data, columns=['date', 'rate'])
7979
df.set_index(['date'], inplace=True)
80-
today = datetime.datetime.utcnow().date()
80+
today = datetime.datetime.now(datetime.UTC).date()
8181
df = df.reindex(pandas.date_range(df.index.min(), today))
8282
df['rate'] = df['rate'].ffill()
8383

tests/ibtax/prepare_trades_report_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from investments.money import Money
88
from investments.ticker import Ticker, TickerKind
99
from investments.trades_fifo import FinishedTrade
10-
from tests.trades_fifo_test import test_trades_precision
10+
from tests.trades_fifo_test import get_trades_precision_testcase
1111

1212

1313
def test_simple_trades():
@@ -83,7 +83,7 @@ def test_precision():
8383
8484
"""
8585

86-
test_case = test_trades_precision()
86+
test_case = get_trades_precision_testcase()
8787

8888
res: dict = prepare_trades_report(test_case, ExchangeRatesRUB()).to_dict()
8989

tests/trades_fifo_test.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def test_trades_fees_simple() -> None:
9999
assert sell_trade.fee_per_piece.amount == Decimal('-0.101812674')
100100

101101

102-
def test_trades_precision() -> List[FinishedTrade]:
102+
def get_trades_precision_testcase() -> List[FinishedTrade]:
103103
ticker = Ticker(symbol='VT', kind=TickerKind.Stock)
104104
test_case = [
105105
Trade(
@@ -120,7 +120,11 @@ def test_trades_precision() -> List[FinishedTrade]:
120120
)
121121
]
122122

123-
finished_trades = TradesAnalyzer(test_case).finished_trades
123+
return TradesAnalyzer(test_case).finished_trades
124+
125+
126+
def test_trades_precision():
127+
finished_trades = get_trades_precision_testcase()
124128

125129
buy_trade: FinishedTrade = finished_trades[0]
126130
assert buy_trade.price.amount == Decimal('80.62')
@@ -129,5 +133,3 @@ def test_trades_precision() -> List[FinishedTrade]:
129133
sell_trade: FinishedTrade = finished_trades[1]
130134
assert sell_trade.price.amount == Decimal('81.82')
131135
assert sell_trade.fee_per_piece.amount == Decimal('-0.101812674')
132-
133-
return finished_trades

0 commit comments

Comments
 (0)