Skip to content

Commit 2e0cd21

Browse files
Merge pull request #105 from bas-amop/github-pages-docs
Merge v2.3.0
2 parents e00cee3 + 2fecbb6 commit 2e0cd21

File tree

98 files changed

+8588
-6641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+8588
-6641
lines changed

.github/ISSUE_TEMPLATE/bug---issue-report.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/data-acquisition.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/feature-or-enhancement-request.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,11 @@ Version Number: <!--- Include version number of MeshiPhi the PR will be included
99
## Fixes # (issue)
1010
<!--- If this PR adds functionality or resolves problems associated with an issue on GitHub, please include a link to the issue -->
1111

12-
# Testing
13-
To ensure that the functionality of the MeshiPhi codebase remains consistent throughout the development cycle a testing strategy has been developed, which can be viewed in the document `test/testing_strategy.md`.
14-
This includes a collection of test files which should be run according to which part of the codebase has been altered in a pull request. Please consult the testing strategy to determine which tests need to be run.
15-
16-
- [ ] My changes have not altered any of the files listed in the testing strategy
17-
18-
- [ ] My changes result in all required regression tests passing without the need to update test files.
19-
20-
> *list which files have been altered and include a pytest.txt file for each of
21-
> the tests required to be run*
22-
>
23-
> The files which have been changed during this PR can be listed using the command
24-
25-
git diff --name-only 2.2.x
26-
27-
- [ ] My changes require one or more test files to be updated for all regression tests to pass.
28-
29-
> *include pytest.txt file showing which tests fail.*
30-
> *include reasoning as to why your changes cause these tests to fail.*
31-
>
32-
> Should these changes be valid, relevant test files should be updated.
33-
> *include pytest.txt file of test passing after test files have been updated.*
3412

3513
# Checklist
3614

37-
- [ ] My code follows [pep8](https://peps.python.org/pep-0008/) style guidelines.
3815
- [ ] I have commented my code, particularly in hard-to-understand areas.
3916
- [ ] I have updated the documentation of the codebase where required.
40-
- [ ] My changes generate no new warnings.
4117
- [ ] My PR has been made to the `2.2.x` branch (**DO NOT SUBMIT A PR TO MAIN**)
4218

4319

.github/workflows/docs.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Build docs
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
types: [opened, synchronize, reopened, ready_for_review]
11+
workflow_dispatch:
12+
13+
jobs:
14+
build-docs:
15+
if: github.event.pull_request.draft == false || github.event_name != 'pull_request'
16+
permissions:
17+
contents: write
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout repository
21+
uses: actions/checkout@v5
22+
- name: Set up Python
23+
uses: actions/setup-python@v6
24+
with:
25+
python-version: 3.12
26+
- name: Install dependencies
27+
run: |
28+
python -m pip install --upgrade pip
29+
pip install .[docs]
30+
- name: Build documentation
31+
run: |
32+
cd docs
33+
sphinx-build -b html source _build/html
34+
- name: Deploy docs
35+
if: ${{ github.event_name == 'push' }}
36+
uses: JamesIves/github-pages-deploy-action@v4
37+
with:
38+
folder: docs/_build/html

.github/workflows/test.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Test
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
python-version: ["3.11", "3.12", "3.13", "3.14"]
15+
steps:
16+
- uses: actions/checkout@v5
17+
- name: Set up Python
18+
uses: actions/setup-python@v6
19+
with:
20+
python-version: ${{ matrix.python-version }}
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install .[test]
25+
- name: Run tests
26+
run: pytest -m "not slow" -n auto

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,10 @@ GRF_Plots/*
3333
tests/regression_tests/.outputs/*
3434
docs/doctrees
3535
docs/html/*
36-
docs/index.html
36+
docs/index.html
37+
38+
# Coverage reports
39+
.coverage
40+
coverage.xml
41+
htmlcov/
42+
*.cover

.pre-commit-config.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v6.0.0
4+
hooks:
5+
- id: trailing-whitespace
6+
- id: end-of-file-fixer
7+
- id: check-yaml
8+
- id: check-added-large-files
9+
- id: check-json
10+
- id: check-toml
11+
- id: check-merge-conflict
12+
- id: debug-statements
13+
14+
- repo: https://github.com/astral-sh/ruff-pre-commit
15+
rev: v0.14.10
16+
hooks:
17+
# Run the linter.
18+
- id: ruff-check
19+
args: [--fix]
20+
# Run the formatter.
21+
- id: ruff-format

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
## [Unreleased]
9+
10+
## [2.3.0] - YYYY-MM-DD
11+
12+
### Added
13+
- Initial changelog entry
14+
- Modern Python package tooling improvements
15+
- Ruff configuration for consistent code formatting and linting
16+
- Type checking with mypy
17+
- Test coverage reporting
18+
- Enhanced CI/CD workflows with linting and type checking
19+
- Development dependencies section in pyproject.toml
20+
- Pre-commit hooks with comprehensive code quality checks
21+
- Dependabot configuration for automated dependency updates
22+
- Improved test fixtures using proper temporary file patterns
23+
24+
[Unreleased]: https://github.com/bas-amop/MeshiPhi/compare/v2.3.0...HEAD
25+
[2.3.0]: https://github.com/bas-amop/MeshiPhi/releases/tag/v2.3.0

CITATION.cff

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
cff-version: 1.2.0
2+
title: "MeshiPhi: Earth's digital twin mapped on a non-uniform mesh"
3+
authors:
4+
- family-names: Smith
5+
given-names: Jonathan D.
6+
- family-names: Hall
7+
given-names: Samuel
8+
- family-names: Coombs
9+
given-names: George
10+
- family-names: Byrne
11+
given-names: James
12+
- family-names: Thorne
13+
given-names: Michael A. S.
14+
- family-names: Brearley
15+
given-names: J. Alexander
16+
- family-names: Long
17+
given-names: Derek
18+
- family-names: Meredith
19+
given-names: Michael
20+
- family-names: Wyld
21+
given-names: David
22+
- family-names: Zwagerman
23+
given-names: Thomas
24+
- family-names: Fox
25+
given-names: Maria
26+
version: "2.3.0"
27+
doi: 10.48550/arXiv.2209.02389
28+
url: https://github.com/bas-amop/MeshiPhi
29+
repository-code: https://github.com/bas-amop/MeshiPhi
30+
date-released: 2022-09-06
31+
license: MIT
32+
message: "If you use this software, please cite our arXiv paper."
33+
citation: "Jonathan D. Smith, Samuel Hall, George Coombs, James Byrne, Michael A. S. Thorne, J. Alexander Brearley, Derek Long, Michael Meredith, Maria Fox, (2022), Autonomous Passage Planning for a Polar Vessel, arXiv, https://arxiv.org/abs/2209.02389"

0 commit comments

Comments
 (0)