Skip to content

Commit

Permalink
Merge branch 'main' into maint/zizmor
Browse files Browse the repository at this point in the history
  • Loading branch information
tkoyama010 authored Jan 20, 2025
2 parents 54ae5d8 + cc5f205 commit dfb4113
Show file tree
Hide file tree
Showing 28 changed files with 763 additions and 765 deletions.
3 changes: 2 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/84939917?v=4",
"profile": "https://github.com/HGWright",
"contributions": [
"doc"
"doc",
"review"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
lock_file: ${{ env.LOCK_FILE }}

- name: "apt cache"
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
with:
packages: libgl1-mesa-glx xvfb
version: 1.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-locks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:

- name: "generate pull-request"
id: cpr
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
with:
token: ${{ steps.generate-token.outputs.token }}
add-paths: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
env_name: ${{ env.ENV_NAME }}

- name: "apt cache"
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
with:
packages: libgl1-mesa-glx xvfb
version: 1.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
python-version: ${{ matrix.version }}

- name: "apt cache"
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
with:
packages: libgl1-mesa-glx xvfb
version: 1.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
lock_file: ${{ env.LOCK_FILE }}

- name: "apt cache"
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
with:
packages: libgl1-mesa-glx xvfb
version: 1.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -58,7 +58,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -71,6 +71,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:
additional_dependencies: [black==24.*]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.8.4"
rev: "v0.9.2"
hooks:
- id: ruff
types: [file, python]
Expand Down Expand Up @@ -91,7 +91,7 @@ repos:
# Forbid files which have a UTF-8 Unicode replacement character.

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.30.0
rev: 0.31.0
hooks:
- id: check-dependabot
- id: check-github-workflows
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<td align="center" valign="top" width="20%"><a href="https://edsaac.github.io/"><img src="https://avatars.githubusercontent.com/u/34405119?v=4?s=75" width="75px;" alt="Edwin"/><br /><sub><b>Edwin</b></sub></a><br /><a href="#plugin-edsaac" title="Plugin/utility libraries">🔌</a></td>
<td align="center" valign="top" width="20%"><a href="https://github.com/ESadek-MO"><img src="https://avatars.githubusercontent.com/u/110238618?v=4?s=75" width="75px;" alt="Elias"/><br /><sub><b>Elias</b></sub></a><br /><a href="https://github.com/bjlittle/geovista/commits?author=ESadek-MO" title="Code">💻</a></td>
<td align="center" valign="top" width="20%"><a href="https://github.com/felixdellner"><img src="https://avatars.githubusercontent.com/u/14889443?v=4?s=75" width="75px;" alt="Felix Dellner"/><br /><sub><b>Felix Dellner</b></sub></a><br /><a href="https://github.com/bjlittle/geovista/issues?q=author%3Afelixdellner" title="Bug reports">🐛</a> <a href="#ideas-felixdellner" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center" valign="top" width="20%"><a href="https://github.com/HGWright"><img src="https://avatars.githubusercontent.com/u/84939917?v=4?s=75" width="75px;" alt="Henry Wright"/><br /><sub><b>Henry Wright</b></sub></a><br /><a href="https://github.com/bjlittle/geovista/commits?author=HGWright" title="Documentation">📖</a></td>
<td align="center" valign="top" width="20%"><a href="https://github.com/HGWright"><img src="https://avatars.githubusercontent.com/u/84939917?v=4?s=75" width="75px;" alt="Henry Wright"/><br /><sub><b>Henry Wright</b></sub></a><br /><a href="https://github.com/bjlittle/geovista/commits?author=HGWright" title="Documentation">📖</a> <a href="https://github.com/bjlittle/geovista/pulls?q=is%3Apr+reviewed-by%3AHGWright" title="Reviewed Pull Requests">👀</a></td>
</tr>
<tr>
<td align="center" valign="top" width="20%"><a href="https://github.com/jamesp"><img src="https://avatars.githubusercontent.com/u/22805?v=4?s=75" width="75px;" alt="James Penn"/><br /><sub><b>James Penn</b></sub></a><br /><a href="https://github.com/bjlittle/geovista/issues?q=author%3Ajamesp" title="Bug reports">🐛</a></td>
Expand Down
2 changes: 2 additions & 0 deletions changelog/1269.documentation.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Rebranded the ``changelog`` `Font Awesome <https://fontawesome.com>`__ icon.
(:user:`bjlittle`)
1 change: 1 addition & 0 deletions changelog/1271.community.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added :user:`HGWright` as a contributor for ``review``. (:user:`bjlittle`)
2 changes: 1 addition & 1 deletion docs/src/_static/images/icons/changelog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def autolog(message: str, section: str | None = None, color: str | None = None)
color = "brown"

section = colorize(color, colorize("bold", f"[{section}] ")) if section else ""
msg = f'{colorize(color, section)}{colorize("darkblue", f"{message}")}'
msg = f"{colorize(color, section)}{colorize('darkblue', f'{message}')}"
logger.info(msg)


Expand Down Expand Up @@ -199,7 +199,7 @@ def autolog(message: str, section: str | None = None, color: str | None = None)

rst_epilog = f"""
.. |gv_version| replace:: v{version}
.. |build_date| replace:: ({now.strftime('%Y-%m-%d')})
.. |build_date| replace:: ({now.strftime("%Y-%m-%d")})
"""

# docs src directory
Expand Down Expand Up @@ -435,7 +435,7 @@ def autolog(message: str, section: str | None = None, color: str | None = None)
}

html_theme_options = {
"extra_footer": f'Made with ❤️ and ☕ on {now.strftime("%b %d %Y")}.',
"extra_footer": f"Made with ❤️ and ☕ on {now.strftime('%b %d %Y')}.",
"icon_links": [
{
"name": "GitHub Discussions",
Expand Down
4 changes: 2 additions & 2 deletions docs/src/developer/changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {fa}`road` Changelog
# {fa}`road-circle-check` Changelog

The {ref}`changelog <gv-changelog>` is managed and orchestrated with
[towncrier](https://github.com/twisted/towncrier).
Expand Down Expand Up @@ -91,7 +91,7 @@ Run `towncrier --draft` to render a preview of the news fragment files in the
`changelog` directory.
```

## {fa}`road` Changelog Quality Assurance
## {fa}`road-circle-exclamation` Changelog Quality Assurance

Quality assurance of `changelog` contributions is performed by the
[ci-changelog](https://github.com/bjlittle/geovista/blob/main/.github/workflows/ci-changelog.yml)
Expand Down
4 changes: 2 additions & 2 deletions docs/src/reference/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _gv-changelog:

:fa:`road` Changelog
====================
:fa:`road-circle-check` Changelog
=================================

Release versions follow `Semantic Versioning <https://semver.org>`_
i.e., ``<major>.<minor>.<patch>``.
Expand Down
Loading

0 comments on commit dfb4113

Please sign in to comment.