Skip to content

Commit 6edbf19

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # pyproject.toml
2 parents f2bb8ee + 3f0f91b commit 6edbf19

File tree

4 files changed

+316
-311
lines changed

4 files changed

+316
-311
lines changed

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ persistent=yes
8585

8686
# Minimum Python version to use for version dependent checks. Will default to
8787
# the version used to run pylint.
88-
py-version=3.10
88+
py-version=3.12
8989

9090
# Discover python modules and packages in the file system subtree.
9191
recursive=no

CHANGELOG.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
### Added
1010
### Changed
11-
- Update to python 3.12
12-
- Update github actions to use launchpad token lambda
13-
- Update sphinx documentation
11+
### Deprecated
12+
### Removed
13+
### Fixed
14+
15+
16+
## [0.11.0]
17+
18+
### Added
19+
### Changed
20+
- Updated to Python 3.12
21+
- Updated Github Actions to use launchpad token lambda
22+
- Update Sphinx documentation
1423
- [issue #154](https://github.com/podaac/concise/issues/154): Fix construct history json from none, as we are identifying empty files wrong.
1524
- [issue #156](https://github.com/podaac/concise/issues/156): Error in calculating dimensions, fix via collapse function if the dimension inheritance for dims aren't consistent in the files.
1625
### Deprecated

0 commit comments

Comments
 (0)