Merge branch 'release/0.14.1'

jorenham · Aug 19, 2024 · 44b7cd4 · 44b7cd4
2 parents 144474a + fa658ed
commit 44b7cd4
Show file tree

Hide file tree

Showing 37 changed files with 2,117 additions and 1,922 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: jorenham
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,12 +7,19 @@ updates:
       - "github actions"
     schedule:
       interval: weekly
+    groups:
+      actions:
+        patterns:
+          - "*"
 
   - package-ecosystem: pip
-    versioning-strategy: lockfile-only
     directory: /
     target-branch: "dev"
     labels:
       - "dependencies"
     schedule:
       interval: weekly
+    groups:
+      actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: install poetry
-        run: pipx install poetry
+        run: |
+          pipx install poetry
+          poetry config virtualenvs.create true --local
+          poetry config virtualenvs.in-project true --local
 
       - uses: actions/setup-python@v5
         with:
@@ -36,38 +39,50 @@ jobs:
         run: poetry check
 
       - name: poetry install
-        run: >
-          poetry install
-          --without docs
-          --without debug
-          --with pandas
-          --with numpy2
-          --sync
+        run: poetry install --without debug,docs --with pandas
 
       - name: codespell
         run: poetry run codespell .
 
       - name: ruff check
-        run: poetry run ruff check --output-format=github .
+        run: poetry run ruff check --output-format=github
+
+      - name: basedpyright
+        run: poetry run basedpyright
 
-      - name: pyright
-        run: poetry run pyright
+      - name: basedpyright --verifytypes
+        run: poetry run basedpyright --ignoreexternal --verifytypes optype
+
+      # TODO:
+      # - uses: scientific-python/repo-review@v0.11.0
+      #   with:
+      #     plugins: sp-repo-review
 
   test:
-    timeout-minutes: 10
+    timeout-minutes: 20
 
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.10", "3.12"]
-        numpy: ["1", "2"]
+        python-version: ["3.10", "3.12", "3.13-dev"]
         pandas: ["without", "with"]
+        exclude:
+          - python-version: "3.12"
+            pandas: "with"
+          - python-version: "3.13-dev"
+            pandas: "with"
+          - python-version: "3.13-dev"
+            os: windows-latest
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: install scipy deps
+        if: ${{ matrix.python-version == '3.13-dev' }}
+        run: sudo apt-get install libopenblas-dev
+
+      - uses: actions/checkout@v4.1.7
 
       - name: install poetry
         run: pipx install poetry
@@ -76,15 +91,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: poetry
+          cache-dependency-path: poetry.lock
 
       - name: poetry install
         run: >
           poetry install
-          --sync
+          --without debug,docs
           --with github
-          --without docs
-          --without debug
-          --with numpy${{ matrix.numpy }}
           --${{ matrix.pandas }} pandas
 
       - name: pytest

diff --git a/.gitignore b/.gitignore
@@ -4,21 +4,22 @@ __pycache__
 *$py.class
 
 # Distribution / packaging
-build
-dist
-site
+build/
+dist/
+site/
 
 # Cache
-.cache
-.hypothesis
-.pytest_cache
-.ruff_cache
+.cache/
+.hypothesis/
+.pytest_cache/
+.ruff_cache/
+.tox/
 
 # Environments
 .env
-.venv
-venv
+.venv/
+venv/
 
 # IntelliJ
-.idea
-.run
+.idea/
+.run/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,13 @@
 ci:
   autoupdate_branch: "dev"
   autoupdate_commit_msg: "update pre-commit hooks"
-  skip: [markdownlint, poetry-check, codespell, ruff, pyright]
+  skip:
+    - markdownlint
+    - poetry-check
+    - codespell
+    - ruff
+    - basedpyright
+    - basedpyright-verifytypes
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -10,26 +16,33 @@ repos:
       - id: check-added-large-files
       - id: check-ast
       - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: check-json
       - id: check-merge-conflict
       - id: check-shebang-scripts-are-executable
       - id: check-symlinks
       - id: check-toml
       - id: check-vcs-permalinks
+      - id: check-xml
       - id: check-yaml
         args: [--unsafe]
+      - id: debug-statements
       - id: destroyed-symlinks
+      - id: detect-aws-credentials
+        args: [--allow-missing-credentials]
       - id: detect-private-key
       - id: fix-byte-order-marker
       - id: forbid-submodules
       - id: name-tests-test
         args: [--pytest-test-first]
       - id: no-commit-to-branch
+        args: [--branch, master, --branch, dev]
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
         exclude_types: [svg]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.40.0
+    rev: v0.41.0
     hooks:
       - id: markdownlint
 
@@ -39,19 +52,29 @@ repos:
       - id: poetry-check
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         additional_dependencies:
           - tomli
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.5
+    rev: v0.6.1
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [--fix, --show-fixes]
 
-  - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.364
+  - repo: local
     hooks:
-      - id: pyright
+      - id: basedpyright
+        name: basedpyright
+        entry: poetry run basedpyright
+        language: system
+        types_or: [python, pyi]
+
+      - id: basedpyright-verifytypes
+        name: basedpyright --verifytypes
+        entry: poetry run basedpyright --ignoreexternal --verifytypes lmo
+        language: system
+        always_run: true
+        pass_filenames: false
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,10 +3,10 @@
     "charliermarsh.ruff",
     "codezombiech.gitignore",
     "davidanson.vscode-markdownlint",
+    "detachhead.basedpyright",
     "editorconfig.editorconfig",
-    "eeyore.yapf",
     "ms-python.python",
-    "ms-python.vscode-pylance",
-    "yzhang.markdown-all-in-one"
-  ]
+    "serhioromano.vscode-gitflow"
+  ],
+  "unwantedRecommendations": ["ms-pyright.pyright", "ms-python.vscode-pylance"]
 }
diff --git a/README.md b/README.md
@@ -2,19 +2,21 @@
 
 # Lmo - Trimmed L-moments and L-comoments
 
-![GitHub Workflow Status][IMG-GHA]
-![license][IMG-BSD]
+![Lmo - License][IMG-BSD]
 [![Lmo - PyPI][IMG-PYPI]](https://pypi.org/project/Lmo/)
 [![Lmo - Versions][IMG-VER]](https://github.com/jorenham/Lmo)
-[![Ruff][IMG-RUFF]](https://github.com/astral-sh/ruff)
-[![Pyright][IMG-PYRIGHT]](https://microsoft.github.io/pyright/)
+![Lmo - CI][IMG-CI]
+[![Lmo - Pre-commit][IMG-PC]](https://github.com/pre-commit/pre-commit)
+[![Lmo - Ruff][IMG-RUFF]](https://github.com/astral-sh/ruff)
+[![Lmo - BassedPyright][IMG-BPR]](https://detachhead.github.io/basedpyright)
 
-[IMG-GHA]: https://img.shields.io/github/actions/workflow/status/jorenham/Lmo/ci.yml?branch=master
+[IMG-CI]: https://img.shields.io/github/actions/workflow/status/jorenham/Lmo/ci.yml?branch=master
 [IMG-BSD]: https://img.shields.io/github/license/jorenham/Lmo
 [IMG-PYPI]: https://img.shields.io/pypi/v/Lmo
 [IMG-VER]: https://img.shields.io/pypi/pyversions/Lmo
+[IMG-pC]: https://img.shields.io/badge/pre--commit-enabled-orange?logo=pre-commit
 [IMG-RUFF]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
-[IMG-PYRIGHT]: https://microsoft.github.io/pyright/img/pyright_badge.svg
+[IMG-BPR]: https://img.shields.io/badge/basedpyright-checked-42b983
 
 Unlike the legacy
 [product-moments](https://wikipedia.org/wiki/Moment_(mathematics)), the