Skip to content

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jorenham committed Jun 23, 2024
2 parents 5157ded + a65f9f5 commit 62d71eb
Show file tree
Hide file tree
Showing 36 changed files with 6,905 additions and 1,330 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@ updates:
target-branch: "dev"
schedule:
interval: weekly
groups:
actions:
patterns:
- "*"

- package-ecosystem: pip
versioning-strategy: lockfile-only
directory: /
target-branch: "dev"
schedule:
interval: weekly
groups:
actions:
patterns:
- "*"
26 changes: 17 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,30 @@ jobs:
python-version: "3.10"
cache: poetry

- name: poetry check
run: poetry check

- name: poetry install
run: poetry install --sync

- 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: basedpyright --verifytypes
run: poetry run basedpyright --ignoreexternal --verifytypes optype

- name: markdownlint
uses: DavidAnson/markdownlint-cli2-action@v16
with:
config: '.markdownlint.jsonc'
globs: '**/*.md'
config: ".markdownlint.yaml"
globs: "**/*.md"

- uses: scientific-python/[email protected]
with:
plugins: sp-repo-review

test:
timeout-minutes: 5
Expand All @@ -56,7 +60,11 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.10", "3.11", "3.12", "3.13-dev"]
python-version: ["3.10", "3.11", "3.12", "3.13.0-beta.2"]
# building numpy2 on windows + py313 results in broken numpy install
exclude:
- os: windows-latest
python-version: "3.13.0-beta.2"

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

Expand All @@ -72,7 +80,7 @@ jobs:
cache: poetry

- name: poetry install
run: poetry install --only test,test-github --sync
run: poetry install --sync --with test-github

- name: pytest
run: poetry run py.test
run: poetry run pytest
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ site/
# Cache
.pytest_cache/
.ruff_cache/
.tox/

# Environments
.env
Expand Down
25 changes: 0 additions & 25 deletions .markdownlint.jsonc

This file was deleted.

25 changes: 25 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
default: true
no-hard-tabs: true

MD007:
indent: 4
MD013:
line_length: 79
MD031:
list_items: false
MD033:
allowed_elements:
- h1
- p
- br
- a
- i
- code
- img
- table
- tr
- th
- td
- dl
- dt
- dd
62 changes: 49 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,32 +1,68 @@
ci:
autoupdate_branch: "dev"
autoupdate_commit_msg: "update pre-commit hooks"
skip:
- markdownlint
- poetry-check
- poetry-lock
- codespell
- ruff
- basedpyright

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-yaml
- 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
- 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: no-commit-to-branch
args: [--branch, master, --branch, dev]
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.41.0
hooks:
- id: markdownlint

- repo: https://github.com/python-poetry/poetry
rev: 1.8.2
rev: 1.8.3
hooks:
- id: poetry-check
- id: poetry-lock
args: [--no-update]

- 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.3.7
rev: v0.4.10
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
args: [--fix, --show-fixes]

- repo: https://github.com/DetachHead/basedpyright
rev: v1.10.1
- repo: https://github.com/DetachHead/basedpyright-pre-commit-mirror
rev: v1.13.0
hooks:
- id: basedpyright

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.39.0
hooks:
- id: markdownlint
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to make participation in our project and
our community a harassment-free experience for everyone, regardless of age,
body size, disability, ethnicity, sex characteristics, gender identity and
expression, level of experience, education, socio-economic status, nationality,
expression, level of experience, education, socioeconomic status, nationality,
personal appearance, race, religion, or sexual identity and orientation.

## Our Standards
Expand Down
Loading

0 comments on commit 62d71eb

Please sign in to comment.