Skip to content

Commit dfb4113

Browse files
authored
Merge branch 'main' into maint/zizmor
2 parents 54ae5d8 + cc5f205 commit dfb4113

28 files changed

+763
-765
lines changed

.all-contributorsrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@
9494
"avatar_url": "https://avatars.githubusercontent.com/u/84939917?v=4",
9595
"profile": "https://github.com/HGWright",
9696
"contributions": [
97-
"doc"
97+
"doc",
98+
"review"
9899
]
99100
},
100101
{

.github/workflows/ci-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
lock_file: ${{ env.LOCK_FILE }}
9595

9696
- name: "apt cache"
97-
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
97+
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
9898
with:
9999
packages: libgl1-mesa-glx xvfb
100100
version: 1.0

.github/workflows/ci-locks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117

118118
- name: "generate pull-request"
119119
id: cpr
120-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
120+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
121121
with:
122122
token: ${{ steps.generate-token.outputs.token }}
123123
add-paths: |

.github/workflows/ci-tests-lock.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
env_name: ${{ env.ENV_NAME }}
8585

8686
- name: "apt cache"
87-
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
87+
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
8888
with:
8989
packages: libgl1-mesa-glx xvfb
9090
version: 1.0

.github/workflows/ci-tests-pypi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
python-version: ${{ matrix.version }}
5252

5353
- name: "apt cache"
54-
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
54+
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
5555
with:
5656
packages: libgl1-mesa-glx xvfb
5757
version: 1.0

.github/workflows/ci-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
lock_file: ${{ env.LOCK_FILE }}
102102

103103
- name: "apt cache"
104-
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad
104+
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40
105105
with:
106106
packages: libgl1-mesa-glx xvfb
107107
version: 1.0

.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

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

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

7373
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
74+
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c
7575
with:
7676
category: "/language:${{matrix.language}}"

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
additional_dependencies: [black==24.*]
2121

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

9393
- repo: https://github.com/python-jsonschema/check-jsonschema
94-
rev: 0.30.0
94+
rev: 0.31.0
9595
hooks:
9696
- id: check-dependabot
9797
- id: check-github-workflows

CONTRIBUTORS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<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>
2424
<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>
2525
<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>
26-
<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>
26+
<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>
2727
</tr>
2828
<tr>
2929
<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>

changelog/1269.documentation.rst

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Rebranded the ``changelog`` `Font Awesome <https://fontawesome.com>`__ icon.
2+
(:user:`bjlittle`)

changelog/1271.community.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added :user:`HGWright` as a contributor for ``review``. (:user:`bjlittle`)
+1-1
Loading

docs/src/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def autolog(message: str, section: str | None = None, color: str | None = None)
9090
color = "brown"
9191

9292
section = colorize(color, colorize("bold", f"[{section}] ")) if section else ""
93-
msg = f'{colorize(color, section)}{colorize("darkblue", f"{message}")}'
93+
msg = f"{colorize(color, section)}{colorize('darkblue', f'{message}')}"
9494
logger.info(msg)
9595

9696

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

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

205205
# docs src directory
@@ -435,7 +435,7 @@ def autolog(message: str, section: str | None = None, color: str | None = None)
435435
}
436436

437437
html_theme_options = {
438-
"extra_footer": f'Made with ❤️ and ☕ on {now.strftime("%b %d %Y")}.',
438+
"extra_footer": f"Made with ❤️ and ☕ on {now.strftime('%b %d %Y')}.",
439439
"icon_links": [
440440
{
441441
"name": "GitHub Discussions",

docs/src/developer/changelog.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {fa}`road` Changelog
1+
# {fa}`road-circle-check` Changelog
22

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

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

9696
Quality assurance of `changelog` contributions is performed by the
9797
[ci-changelog](https://github.com/bjlittle/geovista/blob/main/.github/workflows/ci-changelog.yml)

docs/src/reference/changelog.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _gv-changelog:
22

3-
:fa:`road` Changelog
4-
====================
3+
:fa:`road-circle-check` Changelog
4+
=================================
55

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

0 commit comments

Comments
 (0)