Skip to content

Commit dd403bb

Browse files
authored
Merge pull request #804 from bashtage/ruff-clean
CLN: Ruff clean
2 parents e9f1072 + 132cb58 commit dd403bb

66 files changed

Lines changed: 1098 additions & 899 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coveragerc

Lines changed: 0 additions & 42 deletions
This file was deleted.

.flake8

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[flake8]
2+
# Leave at 99 for now
3+
max-line-length = 99
4+
ignore = E203,W503,BLK100

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ to improve performance)
1313
| **Continuous Integration** | [![Build Status](https://dev.azure.com/kevinksheppard0207/kevinksheppard/_apis/build/status/bashtage.arch?branchName=main)](https://dev.azure.com/kevinksheppard0207/kevinksheppard/_build/latest?definitionId=1&branchName=main) |
1414
| **Coverage** | [![codecov](https://codecov.io/gh/bashtage/arch/branch/main/graph/badge.svg)](https://codecov.io/gh/bashtage/arch) |
1515
| **Code Quality** | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/93f6fd90209842bf97fd20fda8db70ef)](https://www.codacy.com/manual/bashtage/arch?utm_source=github.com&utm_medium=referral&utm_content=bashtage/arch&utm_campaign=Badge_Grade) |
16-
| | [![codebeat badge](https://codebeat.co/badges/18a78c15-d74b-4820-b56d-72f7e4087532)](https://codebeat.co/projects/github-com-bashtage-arch-main) |
1716
| **Citation** | [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.593254.svg)](https://doi.org/10.5281/zenodo.593254) |
1817
| **Documentation** | [![Documentation Status](https://readthedocs.org/projects/arch/badge/?version=latest)](https://arch.readthedocs.org/en/latest/) |
1918

arch/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55

66
def doc() -> None:
7-
import webbrowser
7+
import webbrowser # noqa: PLC0415
88

99
webbrowser.open("https://bashtage.github.io/arch/")
1010

1111

12-
__all__ = ["arch_model", "__version__", "doc", "test", "version_tuple"]
12+
__all__ = ["__version__", "arch_model", "doc", "test", "version_tuple"]

arch/bootstrap/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222

2323
__all__ = [
24-
"IIDBootstrap",
24+
"MCS",
25+
"SPA",
2526
"CircularBlockBootstrap",
26-
"MovingBlockBootstrap",
27-
"StationaryBootstrap",
27+
"IIDBootstrap",
2828
"IndependentSamplesBootstrap",
29-
"SPA",
29+
"MovingBlockBootstrap",
3030
"RealityCheck",
31+
"StationaryBootstrap",
3132
"StepM",
32-
"MCS",
3333
"_samplers_python",
3434
"optimal_block_length",
3535
]

arch/bootstrap/base.py

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import numpy as np
1212
from numpy.random import Generator, RandomState
1313
import pandas as pd
14-
import scipy.stats as stats
14+
from scipy import stats
1515

1616
from arch.typing import (
1717
AnyArray,
@@ -36,11 +36,11 @@
3636
)
3737

3838
__all__ = [
39-
"IIDBootstrap",
40-
"StationaryBootstrap",
4139
"CircularBlockBootstrap",
42-
"MovingBlockBootstrap",
40+
"IIDBootstrap",
4341
"IndependentSamplesBootstrap",
42+
"MovingBlockBootstrap",
43+
"StationaryBootstrap",
4444
"optimal_block_length",
4545
]
4646

@@ -64,10 +64,10 @@ def _get_random_integers(
6464
prng: Generator | RandomState, upper: int, *, size: int = 1
6565
) -> Int64Array1D:
6666
if isinstance(prng, Generator):
67-
return cast(Int64Array1D, prng.integers(upper, size=size, dtype=np.int64))
67+
return cast("Int64Array1D", prng.integers(upper, size=size, dtype=np.int64))
6868
else:
6969
assert isinstance(prng, RandomState)
70-
return cast(Int64Array1D, prng.randint(upper, size=size, dtype=np.int64))
70+
return cast("Int64Array1D", prng.randint(upper, size=size, dtype=np.int64))
7171

7272

7373
def _single_optimal_block(x: Float64Array) -> tuple[float, float]:
@@ -198,7 +198,7 @@ def optimal_block_length(x: ArrayLike1D | ArrayLike2D) -> pd.DataFrame:
198198
elif isinstance(x, pd.Series):
199199
idx = [x.name]
200200
else:
201-
idx = [i for i in range(x_arr.shape[1])]
201+
idx = list(range(x_arr.shape[1]))
202202
return pd.DataFrame(opt, index=idx, columns=["stationary", "circular"])
203203

204204

@@ -263,13 +263,15 @@ def _loo_jackknife(
263263
args_copy: list[ArrayLike] = []
264264
for arg in args:
265265
if isinstance(arg, (pd.Series, pd.DataFrame)):
266-
args_copy.append(cast(Union[pd.Series, pd.DataFrame], arg.iloc[items]))
266+
args_copy.append(
267+
cast("Union[pd.Series, pd.DataFrame]", arg.iloc[items])
268+
)
267269
else:
268270
args_copy.append(arg[items])
269271
kwargs_copy: dict[str, ArrayLike] = {}
270272
for k, v in kwargs.items():
271273
if isinstance(v, (pd.Series, pd.DataFrame)):
272-
kwargs_copy[k] = cast(Union[pd.Series, pd.DataFrame], v.iloc[items])
274+
kwargs_copy[k] = cast("Union[pd.Series, pd.DataFrame]", v.iloc[items])
273275
else:
274276
kwargs_copy[k] = v[items]
275277
if extra_kwargs is not None:
@@ -412,10 +414,10 @@ def __init__(
412414
if args:
413415
self._num_items = len(args[0])
414416
elif kwargs:
415-
key = list(kwargs.keys())[0]
417+
key = next(iter(kwargs.keys()))
416418
self._num_items = len(kwargs[key])
417419
all_args = list(args)
418-
all_args.extend([v for v in kwargs.values()])
420+
all_args.extend(list(kwargs.values()))
419421
if self._common_size_required:
420422
for arg in all_args:
421423
if len(arg) != self._num_items:
@@ -510,7 +512,7 @@ def state(self, value: RandomStateState | Mapping[str, Any]) -> None:
510512
self._generator.bit_generator.state = value
511513
else:
512514
assert isinstance(self._generator, RandomState)
513-
self._generator.set_state(cast(RandomStateState, value))
515+
self._generator.set_state(cast("RandomStateState", value))
514516

515517
def reset(self, use_seed: bool = True) -> None:
516518
"""
@@ -689,12 +691,11 @@ def conf_int(
689691
studentize_reps = studentize_reps if method == studentized else 0
690692
if sampling in ("semi", "semi-parametric", "semiparametric"):
691693
sampling = "semiparametric"
692-
else:
693-
if sampling not in ("nonparametric", "parametric"):
694-
raise ValueError(
695-
'sampling must be one of "nonparametric", "parametric", "semi", '
696-
'"semi-parametric", or "semiparametric"'
697-
)
694+
elif sampling not in ("nonparametric", "parametric"):
695+
raise ValueError(
696+
'sampling must be one of "nonparametric", "parametric", "semi", '
697+
'"semi-parametric", or "semiparametric"'
698+
)
698699
_reuse = False
699700
if reuse:
700701
# check conditions for reuse
@@ -717,7 +718,7 @@ def conf_int(
717718
reps,
718719
extra_kwargs,
719720
std_err_func=std_err_func,
720-
studentize_reps=studentize_reps, # noqa
721+
studentize_reps=studentize_reps,
721722
sampling=sampling,
722723
)
723724

@@ -755,7 +756,7 @@ def conf_int(
755756
values = results
756757
if method == studentized:
757758
# studentized uses studentized parameter estimates
758-
values = cast(Float64Array, studentized_results)
759+
values = cast("Float64Array", studentized_results)
759760

760761
if method in ("debiased", "bc", "bias-corrected", "bca"):
761762
# bias corrected uses modified percentiles, but is
@@ -1164,7 +1165,7 @@ def _resample(self) -> tuple[tuple[ArrayLike, ...], dict[str, ArrayLike]]:
11641165
"""
11651166
Resample all data using the values in _index
11661167
"""
1167-
indices = cast(Union[Int64Array, tuple[Int64Array, ...]], self._index)
1168+
indices = cast("Union[Int64Array, tuple[Int64Array, ...]]", self._index)
11681169
pos_data: list[NDArray | pd.DataFrame | pd.Series] = []
11691170
for values in self._args:
11701171
if isinstance(values, (pd.Series, pd.DataFrame)):
@@ -1338,7 +1339,7 @@ def _resample(self) -> tuple[tuple[ArrayLike, ...], dict[str, ArrayLike]]:
13381339
Resample all data using the values in _index
13391340
"""
13401341
pos_indices, kw_indices = cast(
1341-
tuple[list[Int64Array], dict[str, Int64Array]], self._index
1342+
"tuple[list[Int64Array], dict[str, Int64Array]]", self._index
13421343
)
13431344
pos_data: list[NDArray | pd.DataFrame | pd.Series] = []
13441345
for i, values in enumerate(self._args):
@@ -1502,9 +1503,9 @@ def update_indices(self) -> Int64Array1D:
15021503
indices %= self._num_items
15031504

15041505
if indices.shape[0] > self._num_items:
1505-
return cast(Int64Array1D, indices[: self._num_items])
1506+
return cast("Int64Array1D", indices[: self._num_items])
15061507
else:
1507-
return cast(Int64Array1D, indices)
1508+
return cast("Int64Array1D", indices)
15081509

15091510

15101511
class StationaryBootstrap(CircularBlockBootstrap):
@@ -1701,7 +1702,7 @@ def update_indices(self) -> Int64Array1D:
17011702
indices = indices.flatten()
17021703

17031704
if indices.shape[0] > self._num_items:
1704-
return cast(Int64Array1D, indices[: self._num_items])
1705+
return cast("Int64Array1D", indices[: self._num_items])
17051706
else:
17061707
return indices
17071708

0 commit comments

Comments
 (0)