Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.5.4 #459

Merged
merged 122 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
41a6ed0
Change distance search in merge_split_MEST to use BallTree query, and…
w-k-jones Nov 29, 2023
098e4d8
Fix dimension order for coordinates in merge_split
w-k-jones Nov 29, 2023
6b5cb68
Add tests for merge_split with PBCs
w-k-jones Nov 29, 2023
3deffa9
Speed up adding edges to graph using add_weighted_edges_from
w-k-jones Nov 29, 2023
2d5d366
Remove unused imports
w-k-jones Nov 29, 2023
1c7ed6f
Apply frame_len filter before assigning edges to the graph, and add n…
w-k-jones Nov 29, 2023
a51f027
Use connected_components from scipy.sparse.csgraph to link cells into…
w-k-jones Nov 29, 2023
5b4aa05
Fix handling of unassigned features in merge_split_MEST and add test …
w-k-jones Nov 29, 2023
ce36b3b
Remove unused import
w-k-jones Nov 29, 2023
eff22f6
Fix distance calculation for 2D case
w-k-jones Nov 29, 2023
de01424
Add flag for cells starting with split/ending with merge
w-k-jones Nov 29, 2023
0b75bae
Rename cell_starts_with_merge flag
w-k-jones Nov 29, 2023
c888bf9
Add test for 3D merge/split and fix coordinate stack axis
w-k-jones Nov 29, 2023
81bdcce
Fix application of dxy and dz to 3D feature locations in filter_min_d…
w-k-jones Nov 29, 2023
71c4b39
Switch to using scipy.sparse.csgraph implementation of minimum spanni…
w-k-jones Nov 29, 2023
c63632a
Cast start_node_cells and end_node_cells to np.int32 to avoid type mi…
w-k-jones Nov 29, 2023
fa4659c
Use groupby instead of bincount to count number of child cells/features
w-k-jones Nov 30, 2023
e9ec119
Recalculate start and end node cells after applying minimum spanning …
w-k-jones Nov 30, 2023
68f2978
Added notebook for big datasets
freemansw1 Feb 16, 2024
7584bd4
Merge remote-tracking branch 'upstream/RC_v1.5.x' into tobathon_big_d…
freemansw1 Mar 13, 2024
ac83162
Added get_spacings() test
fziegner Apr 17, 2024
48b6aa5
Added checking for missing data in get_spacings test
fziegner May 8, 2024
62ebff1
Black formatting
fziegner May 8, 2024
08a5420
Merge branch 'RC_v1.5.x' into tobathon_big_dataset_update
freemansw1 May 9, 2024
1fbda02
Switched from iris to xarray
fziegner May 29, 2024
3f15a3b
Black formatting
fziegner May 29, 2024
adabf96
updated docstrings for n_min_threshold
Jun 21, 2024
3a18cfb
black formatting
Jun 21, 2024
900f72b
Add optional typing for default None keywords
w-k-jones Jun 24, 2024
cdfc8dd
Clip values to range of hdim size in feature_position, or hdim size +…
w-k-jones Jun 24, 2024
8d0fcb8
Reformatting
w-k-jones Jun 24, 2024
294ced5
Remove erroneus docstring entry
w-k-jones Jun 24, 2024
39ae935
removed index.rst and black-formatted the notebook and documentation …
freemansw1 Jul 18, 2024
61371a6
Update to improve visibility of example notebooks
freemansw1 Jul 18, 2024
a9c74c7
black format all notebooks
freemansw1 Jul 18, 2024
7193157
Merge pull request #429 from fziegner/get_spacings_test
freemansw1 Jul 18, 2024
0928de9
fix code block
freemansw1 Jul 18, 2024
fd025d0
fix warning statement when feature IDs are not unique
JuliaKukulies Jul 23, 2024
729ebd0
Merge remote-tracking branch 'upstream/RC_v1.5.x' into tobathon_big_d…
freemansw1 Jul 23, 2024
adb864e
fix for sphinx_toolbox
freemansw1 Jul 23, 2024
ed5407a
allow for different ID column name at locations where it was not fixe…
JuliaKukulies Jul 23, 2024
cf6f4c8
added parameters for bulk statistic tests and an extra warning when f…
JuliaKukulies Jul 23, 2024
4ab4342
black formatting
JuliaKukulies Jul 23, 2024
ab260b3
black formatting with right versiobn
JuliaKukulies Jul 23, 2024
337235a
add sphinx_toolbox to requirements
freemansw1 Jul 23, 2024
1cafeba
fix to just import sphinx toolbox code module
freemansw1 Jul 23, 2024
af97821
fixed message
JuliaKukulies Jul 23, 2024
abdce8f
fix code block
freemansw1 Jul 23, 2024
f902c65
and one more formatting
JuliaKukulies Jul 23, 2024
57612ec
Merge pull request #438 from tobac-project/main
freemansw1 Jul 24, 2024
e85c446
Merge remote-tracking branch 'upstream/RC_v1.5.x' into tobathon_big_d…
freemansw1 Jul 24, 2024
e5f64c4
Merge remote-tracking branch 'upstream/RC_v1.5.x' into bulk_stats_bug…
JuliaKukulies Jul 24, 2024
2ede64b
made warning message more readable
JuliaKukulies Jul 24, 2024
5551fb7
fixed docstrings and type hint according to Fabians comments
JuliaKukulies Aug 14, 2024
7d7503e
Merge pull request #432 from JuliaKukulies/n_min_thresholds_docs
JuliaKukulies Aug 14, 2024
67f86cf
Merge pull request #408 from freemansw1/tobathon_big_dataset_update
freemansw1 Aug 15, 2024
dadad41
Merge pull request #437 from JuliaKukulies/bulk_stats_bug_fix
JuliaKukulies Aug 15, 2024
4fa1efa
Merge pull request #434 from w-k-jones/fix_interp_fp_bug
w-k-jones Sep 11, 2024
58ddbdd
fixed error message in bulk statistics when none of the feature label…
JuliaKukulies Sep 19, 2024
0cf4a21
tested with notebook
JuliaKukulies Sep 19, 2024
303d0fe
corrected warning for feature labels in every time step
JuliaKukulies Sep 20, 2024
7296875
formatting
JuliaKukulies Sep 20, 2024
dfd4a04
allows calculation of statistics on raw data
JuliaKukulies Sep 20, 2024
84c347f
black formatting
JuliaKukulies Sep 20, 2024
42db306
black formatting
JuliaKukulies Sep 20, 2024
22314f7
black formatting
JuliaKukulies Sep 20, 2024
3bd7afa
more formatting
JuliaKukulies Sep 20, 2024
b2607df
removed tests from notebook
JuliaKukulies Sep 23, 2024
26fefc7
updated reference
JuliaKukulies Sep 23, 2024
2781713
Fix bug in transform_feature_points when warning of dropped features …
w-k-jones Sep 24, 2024
1dd1722
Formatting
w-k-jones Sep 24, 2024
6470db8
Fix depreciation warnings in tests
w-k-jones Sep 24, 2024
81a580b
Add python 3.12 to matrix testing
w-k-jones Sep 24, 2024
6b3473a
Add optional use of dz or vertical_coord for specifying vertical loca…
w-k-jones Sep 24, 2024
8302b16
Remove erroneus import
w-k-jones Sep 24, 2024
b6a48ac
Merge branch 'RC_v1.5.x' of https://github.com/climate-processes/toba…
w-k-jones Sep 24, 2024
4c96374
Fix changed import location of build_distance_function
w-k-jones Sep 24, 2024
0eac773
added the main tobac publications to top of publication list
JuliaKukulies Sep 24, 2024
ad60ed7
Merge branch 'matrix_testing_fix' into reference_update
JuliaKukulies Sep 24, 2024
401ebca
Fix bug that caused statistics to be recalculated for each threshold …
w-k-jones Sep 25, 2024
fdd1ff8
Move filter_min_distance to after coordinate interpolation in feature…
w-k-jones Sep 25, 2024
b9c2cec
Enable use of vertical coordinate rather than fixed dz in filter_min_…
w-k-jones Sep 25, 2024
c9f3cb9
Add tests for minimum distance filtering using vertical coord
w-k-jones Sep 25, 2024
9c1058f
Formatting
w-k-jones Sep 25, 2024
f5e5e25
Manually reformat
w-k-jones Sep 25, 2024
3609a59
Merge pull request #451 from w-k-jones/matrix_testing_fix
w-k-jones Sep 26, 2024
c06fe82
merge in matrix test fix
JuliaKukulies Sep 26, 2024
ab0420b
Merge remote-tracking branch 'origin/RC_v1.5.x' into RC_v1.5.4
JuliaKukulies Sep 26, 2024
177904e
Merge branch 'RC_v1.5.x' of https://github.com/climate-processes/toba…
w-k-jones Sep 26, 2024
412ab97
Merge branch 'RC_v1.5.x' of https://github.com/climate-processes/toba…
w-k-jones Sep 26, 2024
0040330
directly pass data_i to statistics function instead of making a copy
JuliaKukulies Sep 26, 2024
132ea24
added accidently removed pre-commit yaml file
JuliaKukulies Sep 26, 2024
03315ab
Merge pull request #372 from w-k-jones/merge_split_pbc
w-k-jones Sep 28, 2024
dbe40e6
corrected type hints and docstrings because we require *fields to be …
JuliaKukulies Oct 11, 2024
aa73815
allow some tolerance in the time selection for xarray in the statisti…
JuliaKukulies Oct 11, 2024
bca9cf0
added test for bulk stats to ensure all timesteps are added to featur…
JuliaKukulies Oct 12, 2024
65b0b1b
corrected notebook issue
JuliaKukulies Oct 12, 2024
c38ae1c
Merge pull request #450 from JuliaKukulies/reference_update
JuliaKukulies Oct 14, 2024
d9f2df8
Merge pull request #449 from JuliaKukulies/bulk_stats_on_raw_input
JuliaKukulies Oct 14, 2024
38f6eb9
Merge branch 'RC_v1.5.x' into min_distance_3D_fix
w-k-jones Oct 14, 2024
ca25b26
Merge remote-tracking branch 'upstream/RC_v1.5.x' into RC_v1.5.4
JuliaKukulies Oct 14, 2024
e8ccdcc
Merge pull request #448 from JuliaKukulies/RC_v1.5.4
JuliaKukulies Oct 15, 2024
17795d5
switch json schema to basic github actions python install
freemansw1 Oct 15, 2024
0a3b23f
update check_formatting job
freemansw1 Oct 15, 2024
bea540c
Re-add statistics on unsmoothed data
w-k-jones Oct 17, 2024
a987435
Merge pull request #452 from tobac-project/min_distance_3D_fix
w-k-jones Oct 17, 2024
bfe5e7d
update black formatting check
freemansw1 Oct 17, 2024
266971f
update black formatting check
freemansw1 Oct 17, 2024
c704246
remove python version requirement
freemansw1 Oct 17, 2024
a887461
switch to micromamba
freemansw1 Oct 17, 2024
478f9ff
updates to micromamba-shell
freemansw1 Oct 17, 2024
b006dd7
switch to using an environment file rather than mamba install
freemansw1 Oct 17, 2024
321ea16
reformatted files with black 24.x
freemansw1 Oct 17, 2024
a1a12bd
Merge branch 'RC_v1.5.x' into fix_json_check
freemansw1 Oct 17, 2024
2ec1642
merged latest changes and reformatted
freemansw1 Oct 17, 2024
2b7bb7c
Merge pull request #457 from freemansw1/fix_json_check
freemansw1 Oct 18, 2024
e19fe49
updated version in __init__.py
freemansw1 Oct 18, 2024
cf92f10
Merge remote-tracking branch 'upstream/RC_v1.5.x' into RC_v1.5.x
freemansw1 Oct 18, 2024
02d3a53
rerun notebooks
freemansw1 Oct 18, 2024
91eb221
updated changelog
freemansw1 Oct 18, 2024
1e526ed
fix bug with some iris/xarray combinations for the example notebook
freemansw1 Oct 18, 2024
2d708be
fix ffmpeg error in notebook
freemansw1 Oct 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions .github/workflows/check_formatting.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
name: check_formatting
name: Check Python File Formatting with Black
on: [push, pull_request]
jobs:
formatting_job:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up conda
uses: conda-incubator/setup-miniconda@v2
uses: mamba-org/setup-micromamba@v1
with:
miniforge-version: latest
miniforge-variant: mambaforge
channel-priority: strict
channels: conda-forge
show-channel-urls: true
use-only-tar-bz2: true

- name: Install dependencies and check formatting
shell: bash -l {0}
environment-file: environment-ci.yml
generate-run-shell: true
cache-environment: true
cache-downloads: true
- name: Check formatting
shell: micromamba-shell {0}
run:
mamba install --quiet --yes --file requirements.txt black &&
black --version &&
black tobac --check --diff
9 changes: 4 additions & 5 deletions .github/workflows/check_json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ jobs:
shell: bash -el {0}
steps:
- name: check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: set up conda environment
uses: conda-incubator/setup-miniconda@v2
uses: actions/setup-python@v5
with:
auto-update-conda: true
auto-activate-base: false
activate-environment: checkjson-env
python-version: '3.12'
cache: 'pip' # caching pip dependencies
- name: Install check-jsonschema
run: |
pip install check-jsonschema
Expand Down
35 changes: 35 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,40 @@
### Tobac Changelog

_**Version 1.5.4:**_

**Enhancements for Users**

- Added the ability to use the Minimum Euclidean Spanning Tree merge/split method on data with periodic boundaries [#372](https://github.com/tobac-project/tobac/pull/372)
- Added the ability to calculate online bulk statistics during feature detection on the raw (i.e., unsmoothed) data [#449](https://github.com/tobac-project/tobac/pull/449)


**Bug fixes**

- Fixes to calculations of bulk statistics [#437](https://github.com/tobac-project/tobac/pull/437)
- Fixes to handling of PBC feature points on the PBC wraparound border [#434](https://github.com/tobac-project/tobac/pull/434)
- Fixed an error that allows non-matching features to be used in the offline bulk statistics calculation [#448](https://github.com/tobac-project/tobac/pull/448)
- Fixed a bug that prevented using minimum distance filtering with varying vertical coordinates [#452](https://github.com/tobac-project/tobac/pull/452)


**Documentation**

- Add thumbnails to the new example gallery [#428](https://github.com/tobac-project/tobac/pull/428)
- Added documentation for developers [#281](https://github.com/tobac-project/tobac/pull/281)
- Updated documentation for the `n_min_threshold` function in feature detection [#432](https://github.com/tobac-project/tobac/pull/432)
- Added documentation for dealing with big datasets [#408](https://github.com/tobac-project/tobac/pull/408)
- Updated documentation to note that the *tobac* v1.5.0 paper in GMD is in its final form [#450](https://github.com/tobac-project/tobac/pull/450)
-

**Internal Enhancements**

- PBC Distance Function handling improved for tracking and other portions of the library that uses it [#386](https://github.com/tobac-project/tobac/pull/386)
- Added tests to `tobac.utils.get_spacings` [#429](https://github.com/tobac-project/tobac/pull/429)
- Added matrix testing for Python 3.12 [#451](https://github.com/tobac-project/tobac/pull/451)
- Resolved issues around updating dependencies in `black` formatting checks and Zenodo JSON checks [#457](https://github.com/tobac-project/tobac/pull/457)




_**Version 1.5.3:**_

**Enhancements for Users**
Expand Down
3 changes: 2 additions & 1 deletion environment-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pyart-dev
name: tobac-dev
channels:
- conda-forge
dependencies:
Expand All @@ -14,3 +14,4 @@ dependencies:
- trackpy
- pytest
- typing_extensions
- black
Loading
Loading