Skip to content

CI: Fix CI errors #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies:
- numpydoc
- pydata-sphinx-theme>=0.15.0
# Lint
- ruff>=0.3.0
- ruff>=0.11.5
# Benchmarks
- asv>=0.6.0
# Misc tools
- ipython
- ipython
24 changes: 13 additions & 11 deletions numpy_financial/_financial.py
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ def irr(values, *, raise_exceptions=False, selection_logic=_irr_default_selectio
User may insert their own customised function for selection
of IRR values.The function should accept a one-dimensional array
of numbers and return a number.


Returns
-------
Expand Down Expand Up @@ -803,7 +803,7 @@ def irr(values, *, raise_exceptions=False, selection_logic=_irr_default_selectio
0.0886
>>> npf.irr([[-100, 0, 0, 74], [-100, 100, 0, 7]]).round(5)
array([-0.0955 , 0.06206])

"""
values = np.atleast_2d(values)
if values.ndim != 2:
Expand Down Expand Up @@ -852,7 +852,7 @@ def irr(values, *, raise_exceptions=False, selection_logic=_irr_default_selectio
# If only one real solution
elif len(eirr) == 1:
irr_results[i] = eirr[0]
else:
else:
irr_results[i] = selection_logic(eirr)

return _ufunc_like(irr_results)
Expand Down Expand Up @@ -986,7 +986,7 @@ def mirr(values, finance_rate, reinvest_rate, *, raise_exceptions=False):

.. math::

MIRR =
MIRR =
\\left( \\frac{{FV_{positive}}}{{PV_{negative}}} \\right)^{\\frac{{1}}{{n-1}}}
* (1+r) - 1

Expand All @@ -1000,8 +1000,8 @@ def mirr(values, finance_rate, reinvest_rate, *, raise_exceptions=False):
--------
>>> import numpy_financial as npf

Consider a project with an initial investment of -$100
and projected cash flows of $50, -$60, and $70 at the end of each period.
Consider a project with an initial investment of -$100
and projected cash flows of $50, -$60, and $70 at the end of each period.
The project has a finance rate of 10% and a reinvestment rate of 12%.

>>> npf.mirr([-100, 50, -60, 70], 0.10, 0.12)
Expand All @@ -1028,17 +1028,17 @@ def mirr(values, finance_rate, reinvest_rate, *, raise_exceptions=False):
>>> npf.mirr([-100, -50, -60, -70], 0.10, 0.12)
nan

Finally, let's explore the situation where all cash flows are positive,
Finally, let's explore the situation where all cash flows are positive,
and the `raise_exceptions` parameter is set to True.

>>> npf.mirr([
... 100, 50, 60, 70],
... 0.10, 0.12,
... 100, 50, 60, 70],
... 0.10, 0.12,
... raise_exceptions=True
... ) #doctest: +NORMALIZE_WHITESPACE
Traceback (most recent call last):
...
numpy_financial._financial.NoRealSolutionError:
numpy_financial._financial.NoRealSolutionError:
No real solution exists for MIRR since all cashflows are of the same sign.
"""
values_inner = np.atleast_2d(values).astype(np.float64)
Expand All @@ -1055,7 +1055,9 @@ def mirr(values, finance_rate, reinvest_rate, *, raise_exceptions=False):
out = np.empty(out_shape)

for i, v in enumerate(values_inner):
for j, (rr, fr) in enumerate(zip(reinvest_rate_inner, finance_rate_inner)):
for j, (rr, fr) in enumerate(
zip(reinvest_rate_inner, finance_rate_inner, strict=True)
):
pos = v > 0
neg = v < 0

Expand Down
4 changes: 2 additions & 2 deletions numpy_financial/tests/test_financial.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
def assert_decimal_close(actual, expected, tol=Decimal("1e-7")):
# Check if both actual and expected are iterable (like arrays)
if hasattr(actual, "__iter__") and hasattr(expected, "__iter__"):
for a, e in zip(actual, expected):
for a, e in zip(actual, expected, strict=True):
assert abs(a - e) <= tol
else:
# For single value comparisons
Expand Down Expand Up @@ -760,7 +760,7 @@ def test_npv_irr_congruence(self):
assert_allclose(
npf.npv(npf.irr(cashflows), cashflows),
0,
atol=1e-10,
atol=1e-9,
rtol=0,
)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ doc = [
"myst-parser>=2.0.0",
]
dev = [
"ruff>=0.3.0",
"ruff>=0.11.5",
"asv>=0.6.0",
]

Expand Down
Loading