Skip to content

Commit 15fea9a

Browse files
committed
Revert "isort"
This reverts commit 853d939.
1 parent 853d939 commit 15fea9a

8 files changed

Lines changed: 83 additions & 35 deletions

tests/test_black_litterman.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
import pytest
44

55
from pypfopt import expected_returns, risk_models
6-
from pypfopt.black_litterman import (BlackLittermanModel,
7-
market_implied_prior_returns,
8-
market_implied_risk_aversion)
6+
from pypfopt.black_litterman import (
7+
BlackLittermanModel,
8+
market_implied_prior_returns,
9+
market_implied_risk_aversion,
10+
)
911
from tests.utilities_for_tests import get_data, get_market_caps, resource
1012

1113

tests/test_custom_objectives.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
import numpy as np
33
import pytest
44

5-
from pypfopt import (EfficientFrontier, exceptions, expected_returns,
6-
objective_functions, risk_models)
5+
from pypfopt import (
6+
EfficientFrontier,
7+
exceptions,
8+
expected_returns,
9+
objective_functions,
10+
risk_models,
11+
)
712
from pypfopt.base_optimizer import BaseConvexOptimizer
813
from tests.utilities_for_tests import get_data, setup_efficient_frontier
914

tests/test_efficient_frontier.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@
66
import pytest
77
import scipy.optimize as sco
88

9-
from pypfopt import (EfficientFrontier, exceptions, expected_returns,
10-
objective_functions, risk_models)
11-
from tests.utilities_for_tests import (get_cov_matrix, get_data,
12-
setup_efficient_frontier,
13-
simple_ef_weights)
9+
from pypfopt import (
10+
EfficientFrontier,
11+
exceptions,
12+
expected_returns,
13+
objective_functions,
14+
risk_models,
15+
)
16+
from tests.utilities_for_tests import (
17+
get_cov_matrix,
18+
get_data,
19+
setup_efficient_frontier,
20+
simple_ef_weights,
21+
)
1422

1523

1624
def test_data_source():

tests/test_efficient_semivariance.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
import pytest
33
from cvxpy.error import SolverError
44

5-
from pypfopt import (EfficientFrontier, EfficientSemivariance,
6-
expected_returns, objective_functions, risk_models)
5+
from pypfopt import (
6+
EfficientFrontier,
7+
EfficientSemivariance,
8+
expected_returns,
9+
objective_functions,
10+
risk_models,
11+
)
712
from tests.utilities_for_tests import get_data, setup_efficient_semivariance
813

914

tests/test_imports.py

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,46 @@
11
def test_import_modules():
2-
from pypfopt import (base_optimizer, black_litterman, cla,
3-
discrete_allocation, exceptions, expected_returns,
4-
hierarchical_portfolio, objective_functions, plotting,
5-
risk_models)
2+
from pypfopt import (
3+
base_optimizer,
4+
black_litterman,
5+
cla,
6+
discrete_allocation,
7+
exceptions,
8+
expected_returns,
9+
hierarchical_portfolio,
10+
objective_functions,
11+
plotting,
12+
risk_models,
13+
)
614

715

816
def test_explicit_import():
9-
from pypfopt.black_litterman import (BlackLittermanModel,
10-
market_implied_prior_returns,
11-
market_implied_risk_aversion)
17+
from pypfopt.black_litterman import (
18+
BlackLittermanModel,
19+
market_implied_prior_returns,
20+
market_implied_risk_aversion,
21+
)
1222
from pypfopt.cla import CLA
13-
from pypfopt.discrete_allocation import (DiscreteAllocation,
14-
get_latest_prices)
15-
from pypfopt.efficient_frontier import (EfficientCVaR, EfficientFrontier,
16-
EfficientSemivariance)
23+
from pypfopt.discrete_allocation import DiscreteAllocation, get_latest_prices
24+
from pypfopt.efficient_frontier import (
25+
EfficientCVaR,
26+
EfficientFrontier,
27+
EfficientSemivariance,
28+
)
1729
from pypfopt.hierarchical_portfolio import HRPOpt
1830
from pypfopt.risk_models import CovarianceShrinkage
1931

2032

2133
def test_import_toplevel():
22-
from pypfopt import (CLA, BlackLittermanModel, CovarianceShrinkage,
23-
DiscreteAllocation, EfficientCVaR, EfficientFrontier,
24-
EfficientSemivariance, HRPOpt, get_latest_prices,
25-
market_implied_prior_returns,
26-
market_implied_risk_aversion)
34+
from pypfopt import (
35+
CLA,
36+
BlackLittermanModel,
37+
CovarianceShrinkage,
38+
DiscreteAllocation,
39+
EfficientCVaR,
40+
EfficientFrontier,
41+
EfficientSemivariance,
42+
HRPOpt,
43+
get_latest_prices,
44+
market_implied_prior_returns,
45+
market_implied_risk_aversion,
46+
)

tests/test_objective_functions.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
import pandas as pd
33

44
from pypfopt import objective_functions
5-
from pypfopt.expected_returns import (mean_historical_return,
6-
returns_from_prices)
5+
from pypfopt.expected_returns import mean_historical_return, returns_from_prices
76
from pypfopt.risk_models import sample_cov
87
from tests.utilities_for_tests import get_data
98

tests/test_plotting.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@
77
import pandas as pd
88
import pytest
99

10-
from pypfopt import (CLA, EfficientFrontier, HRPOpt, expected_returns,
11-
plotting, risk_models)
10+
from pypfopt import (
11+
CLA,
12+
EfficientFrontier,
13+
HRPOpt,
14+
expected_returns,
15+
plotting,
16+
risk_models,
17+
)
1218
from tests.utilities_for_tests import get_data, setup_efficient_frontier
1319

1420

tests/utilities_for_tests.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55

66
from pypfopt import expected_returns, risk_models
77
from pypfopt.cla import CLA
8-
from pypfopt.efficient_frontier import (EfficientCDaR, EfficientCVaR,
9-
EfficientFrontier,
10-
EfficientSemivariance)
8+
from pypfopt.efficient_frontier import (
9+
EfficientCDaR,
10+
EfficientCVaR,
11+
EfficientFrontier,
12+
EfficientSemivariance,
13+
)
1114

1215

1316
def resource(name):

0 commit comments

Comments
 (0)