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.

Sign up for GitHub

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

Merge RC_v1.5_hotfix into main #323

Merged
merged 23 commits into from
Sep 25, 2023
Merged

Merge RC_v1.5_hotfix into main #323

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ced3044
Fix to strict_thresholding that now works for both minima and maxima,…
w-k-jones Jul 28, 2023
b762ee5
Remove commented out code
w-k-jones Jul 28, 2023
c21905e
Add additional tests for strict_thresholding
w-k-jones Jul 28, 2023
2175cd2
Merge pull request #316 from w-k-jones/strict_threshold_fix
w-k-jones Aug 15, 2023
47212e5
Update version number to 1.5.1
w-k-jones Aug 15, 2023
e3ff4b2
Update changelog for 1.5.1
w-k-jones Aug 15, 2023
411328c
Update notebooks for v1.5.1 release
w-k-jones Aug 15, 2023
bcfc827
Merge pull request #325 from w-k-jones/v1.5.1_release_updates
w-k-jones Aug 15, 2023
c7b0401
add back standardize_track_dataset
freemansw1 Aug 21, 2023
a23a220
Merge pull request #330 from freemansw1/add_back_standardize_function
freemansw1 Aug 23, 2023
8519542
Numba errors handled more gracefully now
freemansw1 Sep 8, 2023
5a2a148
Fix readthedocs system imports
freemansw1 Sep 8, 2023
0fab557
merged in 1.5 hotfix version
freemansw1 Sep 8, 2023
0a695fc
Merge pull request #336 from freemansw1/rtd_fix
freemansw1 Sep 11, 2023
8ae2812
Merge remote-tracking branch 'upstream/RC_v1.5_hotfix' into fail_numb…
freemansw1 Sep 11, 2023
b57ab95
switch notebook CI to use mamba instead of conda
freemansw1 Sep 12, 2023
84dba68
add h5netcdf to example requirements.
freemansw1 Sep 12, 2023
848e877
added changelog
freemansw1 Sep 12, 2023
63f9205
Update CHANGELOG.md to move to repo enhancements
freemansw1 Sep 12, 2023
6b573c0
Merge pull request #340 from freemansw1/jupyter_notebook_fix
freemansw1 Sep 13, 2023
bfeac44
Merge remote-tracking branch 'upstream/RC_v1.5_hotfix' into fail_numb…
freemansw1 Sep 13, 2023
56994d2
Merge pull request #335 from freemansw1/fail_numba_gracefully
freemansw1 Sep 14, 2023
513a074
Update CHANGELOG.md
w-k-jones Sep 15, 2023
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
17 changes: 12 additions & 5 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
### Tobac Changelog

_**Version 1.5.1:**_

**Bug fixes**

- The `strict_thresholding` option in feature detection now works correctly for detecting minima, and produces the same results as without strict thresholding if the `n_min_threshold` is a scalar value [#316](https://github.com/tobac-project/tobac/pull/316)


_**Version 1.5.0:**_

**Enhancements for Users**
Expand Down Expand Up @@ -35,16 +42,13 @@ _**Version 1.5.0:**_
- `scipy.interpolate.interp2d` in `add_coordinates` and `add_coordinates_3D` has been replaced with `scipy.interpolate.interpn` as `interp2d` has been deprecated. [#279](https://github.com/tobac-project/tobac/pull/279)
- `setup.py` updated to draw its required packages from `requirements.txt` [#288](https://github.com/tobac-project/tobac/pull/288)



**Repository Enhancements**

- New CI was added to automatically check the example and documentation Jupyter notebooks [#258](https://github.com/tobac-project/tobac/pull/258), [#290](https://github.com/tobac-project/tobac/pull/290)
- The `check_formatting` CI action has been revised to install dependencies through `conda` [#288](https://github.com/tobac-project/tobac/pull/288)
- Repository authors updated [#289](https://github.com/tobac-project/tobac/pull/289)
- CI added to check author list formatting for Zenodo [#292](https://github.com/tobac-project/tobac/pull/292)


**Deprecations**

- All functions in `centerofgravity.py` (`calculate_cog`, `calculate_cog_untracked`, `center_of_gravity`) have been deprecated and will be removed or significantly changed in v2.0. [#200](https://github.com/tobac-project/tobac/pull/200)
Expand All @@ -54,10 +58,8 @@ _**Version 1.5.0:**_
- `tobac.utils.combine_tobac_feats` has been renamed to `tobac.utils.combine_feature_dataframes`, and the original name has been deprecated and will be removed in a future release. [#300](https://github.com/tobac-project/tobac/pull/300)



_**Version 1.4.2:**_


**Bug fix**

- Fixed a bug in the segmentation procedure that assigned the wrong grid cell areas to features in data frame [#246](https://github.com/tobac-project/tobac/pull/246)
Expand All @@ -78,6 +80,7 @@ _**Version 1.4.1:**_

- Regenerated example notebooks so that they are up to date for the present version [#233](https://github.com/tobac-project/tobac/pull/233)


_**Version 1.4.0:**_

**Enhancements**
Expand Down Expand Up @@ -115,12 +118,14 @@ _**Version 1.4.0:**_

- Support for Python 3.6 and earlier is now deprecated and will be removed in v1.5.0 ([#193](https://github.com/tobac-project/tobac/pull/193))


_**Version 1.3.3:**_

**Bug fixes**

- Added a workaround to a bug in trackpy that fixes predictive tracking [#170](https://github.com/tobac-project/tobac/pull/170)


_**Version 1.3.2:**_

**Bug fixes**
Expand All @@ -133,6 +138,7 @@ _**Version 1.3.2:**_
- Added automatic code coverage reports [#124](https://github.com/tobac-project/tobac/pull/124)
- Added automatic building of readthedocs documentation on pull requests


_**Version 1.3.1:**_

**Enhancements**
Expand All @@ -147,6 +153,7 @@ _**Version 1.3.1:**_

- New pull request template for the repository, including a checklist to be completed for each pull request [#120](https://github.com/tobac-project/tobac/pull/120)


_**Version 1.3:**_

**Enhancements**
Expand Down
40 changes: 20 additions & 20 deletions doc/feature_detection/notebooks/feature_detection_filtering.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"execution_count": 1,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:01:47.195347Z",
"iopub.status.busy": "2023-07-11T00:01:47.195069Z",
"iopub.status.idle": "2023-07-11T00:01:51.687071Z",
"shell.execute_reply": "2023-07-11T00:01:51.686080Z"
"iopub.execute_input": "2023-08-15T16:14:07.185005Z",
"iopub.status.busy": "2023-08-15T16:14:07.184289Z",
"iopub.status.idle": "2023-08-15T16:14:13.774664Z",
"shell.execute_reply": "2023-08-15T16:14:13.773916Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -62,10 +62,10 @@
"execution_count": 2,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:01:51.691723Z",
"iopub.status.busy": "2023-07-11T00:01:51.691275Z",
"iopub.status.idle": "2023-07-11T00:01:51.919529Z",
"shell.execute_reply": "2023-07-11T00:01:51.918566Z"
"iopub.execute_input": "2023-08-15T16:14:13.779200Z",
"iopub.status.busy": "2023-08-15T16:14:13.778801Z",
"iopub.status.idle": "2023-08-15T16:14:14.029386Z",
"shell.execute_reply": "2023-08-15T16:14:14.028577Z"
}
},
"outputs": [
Expand Down Expand Up @@ -101,10 +101,10 @@
"execution_count": 3,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:01:51.958983Z",
"iopub.status.busy": "2023-07-11T00:01:51.958706Z",
"iopub.status.idle": "2023-07-11T00:01:52.324795Z",
"shell.execute_reply": "2023-07-11T00:01:52.323887Z"
"iopub.execute_input": "2023-08-15T16:14:14.072818Z",
"iopub.status.busy": "2023-08-15T16:14:14.072541Z",
"iopub.status.idle": "2023-08-15T16:14:15.125350Z",
"shell.execute_reply": "2023-08-15T16:14:15.123554Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -135,10 +135,10 @@
"execution_count": 4,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:01:52.329156Z",
"iopub.status.busy": "2023-07-11T00:01:52.328875Z",
"iopub.status.idle": "2023-07-11T00:01:56.341645Z",
"shell.execute_reply": "2023-07-11T00:01:56.335837Z"
"iopub.execute_input": "2023-08-15T16:14:15.129205Z",
"iopub.status.busy": "2023-08-15T16:14:15.128939Z",
"iopub.status.idle": "2023-08-15T16:14:16.832504Z",
"shell.execute_reply": "2023-08-15T16:14:16.828647Z"
}
},
"outputs": [
Expand Down Expand Up @@ -196,10 +196,10 @@
"execution_count": 5,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:01:56.348391Z",
"iopub.status.busy": "2023-07-11T00:01:56.346681Z",
"iopub.status.idle": "2023-07-11T00:01:57.961544Z",
"shell.execute_reply": "2023-07-11T00:01:57.960460Z"
"iopub.execute_input": "2023-08-15T16:14:16.838887Z",
"iopub.status.busy": "2023-08-15T16:14:16.838617Z",
"iopub.status.idle": "2023-08-15T16:14:18.821986Z",
"shell.execute_reply": "2023-08-15T16:14:18.821111Z"
}
},
"outputs": [
Expand Down
64 changes: 32 additions & 32 deletions doc/feature_detection/notebooks/multiple_thresholds_example.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"execution_count": 1,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:04.454435Z",
"iopub.status.busy": "2023-07-11T00:02:04.453782Z",
"iopub.status.idle": "2023-07-11T00:02:09.305142Z",
"shell.execute_reply": "2023-07-11T00:02:09.303956Z"
"iopub.execute_input": "2023-08-15T16:14:27.894065Z",
"iopub.status.busy": "2023-08-15T16:14:27.893581Z",
"iopub.status.idle": "2023-08-15T16:14:38.976596Z",
"shell.execute_reply": "2023-08-15T16:14:38.975681Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -53,10 +53,10 @@
"execution_count": 2,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:09.308788Z",
"iopub.status.busy": "2023-07-11T00:02:09.308421Z",
"iopub.status.idle": "2023-07-11T00:02:09.531767Z",
"shell.execute_reply": "2023-07-11T00:02:09.531142Z"
"iopub.execute_input": "2023-08-15T16:14:38.981371Z",
"iopub.status.busy": "2023-08-15T16:14:38.980828Z",
"iopub.status.idle": "2023-08-15T16:14:39.374743Z",
"shell.execute_reply": "2023-08-15T16:14:39.373872Z"
}
},
"outputs": [
Expand Down Expand Up @@ -101,10 +101,10 @@
"execution_count": 3,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:09.567523Z",
"iopub.status.busy": "2023-07-11T00:02:09.567243Z",
"iopub.status.idle": "2023-07-11T00:02:10.044018Z",
"shell.execute_reply": "2023-07-11T00:02:10.040289Z"
"iopub.execute_input": "2023-08-15T16:14:39.462543Z",
"iopub.status.busy": "2023-08-15T16:14:39.462138Z",
"iopub.status.idle": "2023-08-15T16:14:41.054125Z",
"shell.execute_reply": "2023-08-15T16:14:41.053049Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -132,10 +132,10 @@
"execution_count": 4,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:10.049518Z",
"iopub.status.busy": "2023-07-11T00:02:10.048756Z",
"iopub.status.idle": "2023-07-11T00:02:10.418507Z",
"shell.execute_reply": "2023-07-11T00:02:10.417896Z"
"iopub.execute_input": "2023-08-15T16:14:41.058529Z",
"iopub.status.busy": "2023-08-15T16:14:41.058272Z",
"iopub.status.idle": "2023-08-15T16:14:41.603331Z",
"shell.execute_reply": "2023-08-15T16:14:41.601089Z"
}
},
"outputs": [
Expand Down Expand Up @@ -175,10 +175,10 @@
"execution_count": 5,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:10.421989Z",
"iopub.status.busy": "2023-07-11T00:02:10.421706Z",
"iopub.status.idle": "2023-07-11T00:02:10.742500Z",
"shell.execute_reply": "2023-07-11T00:02:10.741720Z"
"iopub.execute_input": "2023-08-15T16:14:41.615868Z",
"iopub.status.busy": "2023-08-15T16:14:41.614704Z",
"iopub.status.idle": "2023-08-15T16:14:41.958739Z",
"shell.execute_reply": "2023-08-15T16:14:41.958141Z"
}
},
"outputs": [
Expand Down Expand Up @@ -233,10 +233,10 @@
"execution_count": 6,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:10.745804Z",
"iopub.status.busy": "2023-07-11T00:02:10.745543Z",
"iopub.status.idle": "2023-07-11T00:02:11.050430Z",
"shell.execute_reply": "2023-07-11T00:02:11.049631Z"
"iopub.execute_input": "2023-08-15T16:14:41.961925Z",
"iopub.status.busy": "2023-08-15T16:14:41.961671Z",
"iopub.status.idle": "2023-08-15T16:14:42.303716Z",
"shell.execute_reply": "2023-08-15T16:14:42.302472Z"
}
},
"outputs": [
Expand Down Expand Up @@ -277,10 +277,10 @@
"execution_count": 7,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:11.054792Z",
"iopub.status.busy": "2023-07-11T00:02:11.054513Z",
"iopub.status.idle": "2023-07-11T00:02:11.464030Z",
"shell.execute_reply": "2023-07-11T00:02:11.463418Z"
"iopub.execute_input": "2023-08-15T16:14:42.307032Z",
"iopub.status.busy": "2023-08-15T16:14:42.306781Z",
"iopub.status.idle": "2023-08-15T16:14:42.846033Z",
"shell.execute_reply": "2023-08-15T16:14:42.844862Z"
}
},
"outputs": [
Expand Down Expand Up @@ -314,10 +314,10 @@
"execution_count": 8,
"metadata": {
"execution": {
"iopub.execute_input": "2023-07-11T00:02:11.466933Z",
"iopub.status.busy": "2023-07-11T00:02:11.466636Z",
"iopub.status.idle": "2023-07-11T00:02:12.110406Z",
"shell.execute_reply": "2023-07-11T00:02:12.109782Z"
"iopub.execute_input": "2023-08-15T16:14:42.851702Z",
"iopub.status.busy": "2023-08-15T16:14:42.851440Z",
"iopub.status.idle": "2023-08-15T16:14:43.299851Z",
"shell.execute_reply": "2023-08-15T16:14:43.298918Z"
}
},
"outputs": [
Expand Down
Loading