Skip to content

Commit 44b7cd4

Browse files
committed
Merge branch 'release/0.14.1'
2 parents 144474a + fa658ed commit 44b7cd4

37 files changed

+2117
-1922
lines changed

Diff for: .github/FUNDING.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github: jorenham

Diff for: .github/dependabot.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,19 @@ updates:
77
- "github actions"
88
schedule:
99
interval: weekly
10+
groups:
11+
actions:
12+
patterns:
13+
- "*"
1014

1115
- package-ecosystem: pip
12-
versioning-strategy: lockfile-only
1316
directory: /
1417
target-branch: "dev"
1518
labels:
1619
- "dependencies"
1720
schedule:
1821
interval: weekly
22+
groups:
23+
actions:
24+
patterns:
25+
- "*"

Diff for: .github/workflows/ci.yml

+32-19
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: install poetry
28-
run: pipx install poetry
28+
run: |
29+
pipx install poetry
30+
poetry config virtualenvs.create true --local
31+
poetry config virtualenvs.in-project true --local
2932
3033
- uses: actions/setup-python@v5
3134
with:
@@ -36,38 +39,50 @@ jobs:
3639
run: poetry check
3740

3841
- name: poetry install
39-
run: >
40-
poetry install
41-
--without docs
42-
--without debug
43-
--with pandas
44-
--with numpy2
45-
--sync
42+
run: poetry install --without debug,docs --with pandas
4643

4744
- name: codespell
4845
run: poetry run codespell .
4946

5047
- name: ruff check
51-
run: poetry run ruff check --output-format=github .
48+
run: poetry run ruff check --output-format=github
49+
50+
- name: basedpyright
51+
run: poetry run basedpyright
5252

53-
- name: pyright
54-
run: poetry run pyright
53+
- name: basedpyright --verifytypes
54+
run: poetry run basedpyright --ignoreexternal --verifytypes optype
55+
56+
# TODO:
57+
# - uses: scientific-python/[email protected]
58+
# with:
59+
# plugins: sp-repo-review
5560

5661
test:
57-
timeout-minutes: 10
62+
timeout-minutes: 20
5863

5964
strategy:
6065
fail-fast: false
6166
matrix:
6267
os: [ubuntu-latest, windows-latest]
63-
python-version: ["3.10", "3.12"]
64-
numpy: ["1", "2"]
68+
python-version: ["3.10", "3.12", "3.13-dev"]
6569
pandas: ["without", "with"]
70+
exclude:
71+
- python-version: "3.12"
72+
pandas: "with"
73+
- python-version: "3.13-dev"
74+
pandas: "with"
75+
- python-version: "3.13-dev"
76+
os: windows-latest
6677

6778
runs-on: ${{ matrix.os }}
6879

6980
steps:
70-
- uses: actions/checkout@v4
81+
- name: install scipy deps
82+
if: ${{ matrix.python-version == '3.13-dev' }}
83+
run: sudo apt-get install libopenblas-dev
84+
85+
- uses: actions/[email protected]
7186

7287
- name: install poetry
7388
run: pipx install poetry
@@ -76,15 +91,13 @@ jobs:
7691
with:
7792
python-version: ${{ matrix.python-version }}
7893
cache: poetry
94+
cache-dependency-path: poetry.lock
7995

8096
- name: poetry install
8197
run: >
8298
poetry install
83-
--sync
99+
--without debug,docs
84100
--with github
85-
--without docs
86-
--without debug
87-
--with numpy${{ matrix.numpy }}
88101
--${{ matrix.pandas }} pandas
89102
90103
- name: pytest

Diff for: .gitignore

+12-11
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ __pycache__
44
*$py.class
55

66
# Distribution / packaging
7-
build
8-
dist
9-
site
7+
build/
8+
dist/
9+
site/
1010

1111
# Cache
12-
.cache
13-
.hypothesis
14-
.pytest_cache
15-
.ruff_cache
12+
.cache/
13+
.hypothesis/
14+
.pytest_cache/
15+
.ruff_cache/
16+
.tox/
1617

1718
# Environments
1819
.env
19-
.venv
20-
venv
20+
.venv/
21+
venv/
2122

2223
# IntelliJ
23-
.idea
24-
.run
24+
.idea/
25+
.run/

Diff for: .pre-commit-config.yaml

+31-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
ci:
22
autoupdate_branch: "dev"
33
autoupdate_commit_msg: "update pre-commit hooks"
4-
skip: [markdownlint, poetry-check, codespell, ruff, pyright]
4+
skip:
5+
- markdownlint
6+
- poetry-check
7+
- codespell
8+
- ruff
9+
- basedpyright
10+
- basedpyright-verifytypes
511

612
repos:
713
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -10,26 +16,33 @@ repos:
1016
- id: check-added-large-files
1117
- id: check-ast
1218
- id: check-case-conflict
19+
- id: check-executables-have-shebangs
20+
- id: check-json
1321
- id: check-merge-conflict
1422
- id: check-shebang-scripts-are-executable
1523
- id: check-symlinks
1624
- id: check-toml
1725
- id: check-vcs-permalinks
26+
- id: check-xml
1827
- id: check-yaml
1928
args: [--unsafe]
29+
- id: debug-statements
2030
- id: destroyed-symlinks
31+
- id: detect-aws-credentials
32+
args: [--allow-missing-credentials]
2133
- id: detect-private-key
2234
- id: fix-byte-order-marker
2335
- id: forbid-submodules
2436
- id: name-tests-test
2537
args: [--pytest-test-first]
2638
- id: no-commit-to-branch
39+
args: [--branch, master, --branch, dev]
2740
- id: trailing-whitespace
2841
args: [--markdown-linebreak-ext=md]
2942
exclude_types: [svg]
3043

3144
- repo: https://github.com/igorshubovych/markdownlint-cli
32-
rev: v0.40.0
45+
rev: v0.41.0
3346
hooks:
3447
- id: markdownlint
3548

@@ -39,19 +52,29 @@ repos:
3952
- id: poetry-check
4053

4154
- repo: https://github.com/codespell-project/codespell
42-
rev: v2.2.6
55+
rev: v2.3.0
4356
hooks:
4457
- id: codespell
4558
additional_dependencies:
4659
- tomli
4760

4861
- repo: https://github.com/astral-sh/ruff-pre-commit
49-
rev: v0.4.5
62+
rev: v0.6.1
5063
hooks:
5164
- id: ruff
52-
args: [--fix, --exit-non-zero-on-fix]
65+
args: [--fix, --show-fixes]
5366

54-
- repo: https://github.com/RobertCraigie/pyright-python
55-
rev: v1.1.364
67+
- repo: local
5668
hooks:
57-
- id: pyright
69+
- id: basedpyright
70+
name: basedpyright
71+
entry: poetry run basedpyright
72+
language: system
73+
types_or: [python, pyi]
74+
75+
- id: basedpyright-verifytypes
76+
name: basedpyright --verifytypes
77+
entry: poetry run basedpyright --ignoreexternal --verifytypes lmo
78+
language: system
79+
always_run: true
80+
pass_filenames: false

Diff for: .vscode/extensions.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"charliermarsh.ruff",
44
"codezombiech.gitignore",
55
"davidanson.vscode-markdownlint",
6+
"detachhead.basedpyright",
67
"editorconfig.editorconfig",
7-
"eeyore.yapf",
88
"ms-python.python",
9-
"ms-python.vscode-pylance",
10-
"yzhang.markdown-all-in-one"
11-
]
9+
"serhioromano.vscode-gitflow"
10+
],
11+
"unwantedRecommendations": ["ms-pyright.pyright", "ms-python.vscode-pylance"]
1212
}

Diff for: README.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22

33
# Lmo - Trimmed L-moments and L-comoments
44

5-
![GitHub Workflow Status][IMG-GHA]
6-
![license][IMG-BSD]
5+
![Lmo - License][IMG-BSD]
76
[![Lmo - PyPI][IMG-PYPI]](https://pypi.org/project/Lmo/)
87
[![Lmo - Versions][IMG-VER]](https://github.com/jorenham/Lmo)
9-
[![Ruff][IMG-RUFF]](https://github.com/astral-sh/ruff)
10-
[![Pyright][IMG-PYRIGHT]](https://microsoft.github.io/pyright/)
8+
![Lmo - CI][IMG-CI]
9+
[![Lmo - Pre-commit][IMG-PC]](https://github.com/pre-commit/pre-commit)
10+
[![Lmo - Ruff][IMG-RUFF]](https://github.com/astral-sh/ruff)
11+
[![Lmo - BassedPyright][IMG-BPR]](https://detachhead.github.io/basedpyright)
1112

12-
[IMG-GHA]: https://img.shields.io/github/actions/workflow/status/jorenham/Lmo/ci.yml?branch=master
13+
[IMG-CI]: https://img.shields.io/github/actions/workflow/status/jorenham/Lmo/ci.yml?branch=master
1314
[IMG-BSD]: https://img.shields.io/github/license/jorenham/Lmo
1415
[IMG-PYPI]: https://img.shields.io/pypi/v/Lmo
1516
[IMG-VER]: https://img.shields.io/pypi/pyversions/Lmo
17+
[IMG-pC]: https://img.shields.io/badge/pre--commit-enabled-orange?logo=pre-commit
1618
[IMG-RUFF]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
17-
[IMG-PYRIGHT]: https://microsoft.github.io/pyright/img/pyright_badge.svg
19+
[IMG-BPR]: https://img.shields.io/badge/basedpyright-checked-42b983
1820

1921
Unlike the legacy
2022
[product-moments](https://wikipedia.org/wiki/Moment_(mathematics)), the

0 commit comments

Comments
 (0)