Skip to content

Commit

Permalink
update develop with latest changes from main
Browse files Browse the repository at this point in the history
  • Loading branch information
danielfromearth committed Jan 6, 2025
2 parents 3312af8 + 5da4253 commit ece29d2
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Common Changelog](https://common-changelog.org/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [unreleased]
## [1.13.0] - 2025-01-06

### Changed
- Code readability and CPU branching improvements [Time/Location stamp: Ursynow, Warsaw at 15:23 21/12/2024 UTC] ([#264](https://github.com/nasa/ncompare/pull/264)) ([**@kokroo**](https://github.com/kokroo))
Expand Down
7 changes: 4 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ of the desired behavior and rationale.
### Pull Requests

Please ensure all pull requests follow the PR
[template](/.github/pull_request_template.md). This is to ensure
[template](https://github.com/nasa/ncompare/blob/main/.github/pull_request_template.md).
This is to ensure

* A reviewer understands what is being changed
* A reviewer understands why it is being changed
Expand Down Expand Up @@ -82,7 +83,7 @@ If any performance improvements are being made, please include graphs or charts.

### Changelog

_Ncompare_ maintains a [changelog](CHANGELOG.md). See
_Ncompare_ maintains a [changelog](https://github.com/nasa/ncompare/blob/main/CHANGELOG.md). See
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) for more
information.

Expand Down Expand Up @@ -174,7 +175,7 @@ features or old documentation updated for any changed features

### Python Style Guide

_Ncompare_ follows PEP8 as much as possible. Reference the _ruff_ configuration section in [pyproject.toml](pyproject.toml) for specific expectations.
_Ncompare_ follows PEP8 as much as possible. Reference the _ruff_ configuration section in [pyproject.toml](https://github.com/nasa/ncompare/blob/main/pyproject.toml) for specific expectations.

### Documentation

Expand Down
30 changes: 15 additions & 15 deletions docs/example/ncompare-example-usage.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"id": "07e397b3-4964-4a90-b7f5-ae35185f86e5",
"metadata": {
"ExecuteTime": {
"end_time": "2024-12-13T19:23:10.236545Z",
"start_time": "2024-12-13T19:23:09.323920Z"
"end_time": "2025-01-06T15:43:44.994158Z",
"start_time": "2025-01-06T15:43:44.241846Z"
}
},
"outputs": [
Expand All @@ -65,13 +65,13 @@
" [--show-attributes] [--show-chunks]\n",
" [--column-widths COLUMN_WIDTHS COLUMN_WIDTHS COLUMN_WIDTHS]\n",
" [--version]\n",
" nc_a nc_b\n",
" path_a path_b\n",
"\n",
"Compare the variables contained within two different NetCDF datasets\n",
"Compare the variables contained within two different netCDF datasets\n",
"\n",
"positional arguments:\n",
" nc_a First NetCDF file\n",
" nc_b Second NetCDF file\n",
" path_a First (netCDF or HDF) file\n",
" path_b Second (netCDF or HDF) file\n",
"\n",
"options:\n",
" -h, --help show this help message and exit\n",
Expand Down Expand Up @@ -125,8 +125,8 @@
"id": "136bbeb8-6d74-4373-8ef7-1c20c1fe6afc",
"metadata": {
"ExecuteTime": {
"end_time": "2024-12-13T19:23:10.245010Z",
"start_time": "2024-12-13T19:23:10.242690Z"
"end_time": "2025-01-06T15:43:53.556780Z",
"start_time": "2025-01-06T15:43:53.554205Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -156,8 +156,8 @@
"id": "10a025b9-4483-4925-873e-6653b64441e3",
"metadata": {
"ExecuteTime": {
"end_time": "2024-12-13T19:23:11.688286Z",
"start_time": "2024-12-13T19:23:10.323624Z"
"end_time": "2025-01-06T15:43:58.935155Z",
"start_time": "2025-01-06T15:43:57.402223Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -195,8 +195,8 @@
"id": "43cace42-aa55-469e-84d9-13a45115267e",
"metadata": {
"ExecuteTime": {
"end_time": "2024-12-13T19:23:12.154657Z",
"start_time": "2024-12-13T19:23:11.695335Z"
"end_time": "2025-01-06T15:44:04.144831Z",
"start_time": "2025-01-06T15:44:03.492659Z"
}
},
"outputs": [
Expand Down Expand Up @@ -288,8 +288,8 @@
"id": "c48728a0-1379-4a05-b7e6-ad50694510df",
"metadata": {
"ExecuteTime": {
"end_time": "2024-12-13T19:23:12.577663Z",
"start_time": "2024-12-13T19:23:12.161049Z"
"end_time": "2025-01-06T15:44:16.987293Z",
"start_time": "2025-01-06T15:44:16.251236Z"
}
},
"outputs": [
Expand Down Expand Up @@ -364,7 +364,7 @@
"\u001b[0m\u001b[37m\u001b[0m \u001b[31mdimensions: ('time', 'latitude', 'longitude') \u001b[0m\n",
"\u001b[0m\u001b[37m\u001b[0m \u001b[31mshape: (1, 72, 144) \u001b[0m\n",
"\u001b[0m -----VARIABLE-----: precipitation\u001b[0m\n",
"\u001b[0m\u001b[37m\u001b[0m \u001b[31mdtype: float32\u001b[0m\n",
"0m0m\u001b[37m\u001b[0m \u001b[31mdtype: float32\u001b[\n",
"\u001b[0m\u001b[37m\u001b[0m \u001b[31mdimensions: ('time', 'lon', 'lat')\u001b[0m\n",
"\u001b[0m\u001b[37m\u001b[0m \u001b[31mshape: (1, 1440, 480)\u001b[0m\n",
"\u001b[0m -----VARIABLE-----: time time\u001b[0m\n",
Expand Down
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "ncompare"
version = "1.14.0a0"
version = "1.13.1a0"
description = "Compare the structure of two NetCDF files at the command line"
authors = ["Daniel Kaufman <daniel.kaufman@nasa.gov>"]
readme = "README.md"
Expand Down

0 comments on commit ece29d2

Please sign in to comment.