Skip to content

Commit

Permalink
Merge branch 'main' into doc/joss
Browse files Browse the repository at this point in the history
  • Loading branch information
tkoyama010 authored Aug 31, 2024
2 parents fbe9366 + fbf9d47 commit 32f8395
Show file tree
Hide file tree
Showing 117 changed files with 2,201 additions and 1,439 deletions.
31 changes: 27 additions & 4 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"commit": true,
"commitConvention": "none",
"contributorsPerLine": 7,
"contributorsPerLine": 5,
"contributorsSortAlphabetically": true,
"imageSize": 100,
"linkToUsage": true,
Expand All @@ -34,7 +34,8 @@
"eventOrganizing",
"mentoring",
"design",
"tutorial"
"tutorial",
"promotion"
]
},
{
Expand Down Expand Up @@ -152,7 +153,9 @@
"question",
"eventOrganizing",
"translation",
"review"
"review",
"promotion",
"mentoring"
]
},
{
Expand All @@ -172,7 +175,8 @@
"contributions": [
"bug",
"promotion",
"ideas"
"ideas",
"talk"
]
},
{
Expand Down Expand Up @@ -371,6 +375,25 @@
"ideas",
"promotion"
]
},
{
"login": "berndbecker",
"name": "berndbecker",
"avatar_url": "https://avatars.githubusercontent.com/u/68229540?v=4",
"profile": "https://github.com/berndbecker",
"contributions": [
"ideas"
]
},
{
"login": "sit23",
"name": "Stephen Thomson",
"avatar_url": "https://avatars.githubusercontent.com/u/10164528?v=4",
"profile": "http://emps.exeter.ac.uk/mathematics/staff/sit204",
"contributions": [
"example",
"video"
]
}
],
"commitType": "docs"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-update-pr-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
private_key: ${{ secrets.AUTH_APP_PRIVATE_KEY }}

- name: "automatically update PR"
uses: adRise/update-pr-branch@v0.8.1
uses: adRise/update-pr-branch@v0.9.0
with:
token: ${{ steps.generate-token.outputs.token }}
base: "main"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ instance/

# Sphinx documentation
docs/_build/
docs/src/gallery-carousel.txt
docs/src/gallery_carousel.txt
docs/src/generated
docs/src/reference/generated
docs/src/tags
Expand Down
110 changes: 55 additions & 55 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,25 @@ ci:
autoupdate_commit_msg: "chore: update pre-commit hooks"

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v4.6.0"
- repo: https://github.com/abravalheri/validate-pyproject
rev: "v0.19"
hooks:
- id: validate-pyproject

- repo: https://github.com/adamchainz/blacken-docs
rev: "1.18.0"
hooks:
- id: check-added-large-files
exclude: "tests/plotting/image_cache"
# Prevent giant files from being committed.
- id: check-ast
# Check whether files parse as valid Python.
- id: check-case-conflict
# Check for file name conflicts on case-insensitive file-systems.
- id: check-merge-conflict
# Check for files that contain merge conflict strings.
- id: debug-statements
# Check for debugger imports and py37+ `breakpoint()` calls in Python source.
- id: check-toml
# Check TOML file syntax.
- id: check-yaml
# Check YAML file syntax.
- id: end-of-file-fixer
# Makes sure files end in a newline and only a newline.
exclude_types: [svg]
- id: mixed-line-ending
# Replaces or checks mixed line ending.
- id: no-commit-to-branch
# Don't commit to main branch.
- id: trailing-whitespace
# Trims trailing whitespace.
- id: blacken-docs
additional_dependencies: [black==24.*]

- repo: https://github.com/aio-libs/sort-all
rev: "v1.2.0"
hooks:
- id: sort-all
types: [file, python]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.5.2"
rev: "v0.6.2"
hooks:
- id: ruff
types: [file, python]
Expand All @@ -48,15 +37,45 @@ repos:
- repo: https://github.com/codespell-project/codespell
rev: "v2.3.0"
hooks:
- id: codespell
types_or: [python, markdown, rst]
additional_dependencies: [tomli]
- id: codespell
types_or: [python, markdown, rst]
additional_dependencies: [tomli]

- repo: https://github.com/adamchainz/blacken-docs
rev: "1.18.0"
- repo: https://github.com/numpy/numpydoc
rev: v1.8.0
hooks:
- id: blacken-docs
additional_dependencies: [black==24.*]
- id: numpydoc-validation
files: "^src/"
exclude: "^src/geovista/examples/"
types: [file, python]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v4.6.0"
hooks:
- id: check-added-large-files
exclude: "tests/plotting/image_cache"
# Prevent giant files from being committed.
- id: check-ast
# Check whether files parse as valid Python.
- id: check-case-conflict
# Check for file name conflicts on case-insensitive file-systems.
- id: check-merge-conflict
# Check for files that contain merge conflict strings.
- id: debug-statements
# Check for debugger imports and py37+ `breakpoint()` calls in Python source.
- id: check-toml
# Check TOML file syntax.
- id: check-yaml
# Check YAML file syntax.
- id: end-of-file-fixer
# Makes sure files end in a newline and only a newline.
exclude_types: [svg]
- id: mixed-line-ending
# Replaces or checks mixed line ending.
- id: no-commit-to-branch
# Don't commit to main branch.
- id: trailing-whitespace
# Trims trailing whitespace.

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.10.0
Expand All @@ -77,35 +96,16 @@ repos:
- id: text-unicode-replacement-char
# Forbid files which have a UTF-8 Unicode replacement character.

- repo: https://github.com/aio-libs/sort-all
rev: "v1.2.0"
hooks:
- id: sort-all
types: [file, python]

- repo: https://github.com/abravalheri/validate-pyproject
rev: "v0.18"
hooks:
- id: validate-pyproject

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.0
rev: 0.29.2
hooks:
- id: check-dependabot
- id: check-github-workflows
- id: check-readthedocs

- repo: https://github.com/scientific-python/cookie
rev: 2024.04.23
rev: 2024.08.19
hooks:
- id: sp-repo-review
additional_dependencies: ["repo-review[cli]"]
args: ["--show=errskip"]

- repo: https://github.com/numpy/numpydoc
rev: v1.7.0
hooks:
- id: numpydoc-validation
files: "^src/"
exclude: "^src/geovista/examples/"
types: [file, python]
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: mambaforge-22.9
python: mambaforge-23.11
apt_packages:
- libgl1-mesa-dev
- xvfb
Expand Down
Empty file added CHANGELOG.rst
Empty file.
Loading

0 comments on commit 32f8395

Please sign in to comment.