Skip to content

Commit fcb7cd3

Browse files
freemansw1freemansw1
authored
Merge pull request #557 from tobac-project/RC_v1.6.x
Merge v1.6.3 back into `main`
2 parents a35b2ef + fcdd4dd commit fcb7cd3

29 files changed

Lines changed: 4226 additions & 3575 deletions

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
### Tobac Changelog
22

3+
_**Version 1.6.3:**_
4+
5+
**Enhancements for Users**
6+
7+
- Return empty DataFrame with the proper output format when no features are detected, rather than `None`. [#550](https://github.com/tobac-project/tobac/pull/550)
8+
9+
**Bug fixes**
10+
11+
- Limited pandas support to versions 1 and 2 while pandas 3 compatibility is added [#554](https://github.com/tobac-project/tobac/pull/554)
12+
- Fix an incompatibility between the license file and the license string in `pyproject.toml` [#546](https://github.com/tobac-project/tobac/pull/546)
13+
14+
**Internal Enhancements**
15+
16+
- Added continuous deployment file to deploy to PyPI/TestPyPI automatically [#548](https://github.com/tobac-project/tobac/pull/548)
17+
18+
319
_**Version 1.6.2:**_
420

521
**Enhancements for Users**

‎environment-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- scipy
88
- scikit-image
99
- scikit-learn
10-
- pandas
10+
- pandas<3
1111
- matplotlib
1212
- iris
1313
- xarray

‎environment-examples.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- scipy
77
- scikit-image
88
- scikit-learn
9-
- pandas
9+
- pandas<3
1010
- matplotlib
1111
- iris
1212
- xarray<2024.10.0
@@ -30,7 +30,7 @@ dependencies:
3030
- intake==0.7.0
3131
- intake-xarray==0.7.0
3232
- healpix
33-
- easygems
33+
- easygems==0.1.2
3434
- pyvista>=0.46
3535
- trame
3636
- trame-vtk

‎environment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- scipy
88
- scikit-image
99
- scikit-learn
10-
- pandas
10+
- pandas<3
1111
- matplotlib
1212
- iris
1313
- xarray

‎examples/Basics/Idealized-Case-1_Tracking-of-a-Test-Blob-in-2D.ipynb‎

Lines changed: 271 additions & 302 deletions
Large diffs are not rendered by default.

‎examples/Basics/Idealized-Case-2_Two_crossing_Blobs.ipynb‎

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

‎examples/Basics/Idealized-Case-3_Tracking-of-a-Test-Blob-in-3D.ipynb‎

Lines changed: 248 additions & 219 deletions
Large diffs are not rendered by default.

‎examples/Basics/Methods-and-Parameters-for-Feature-Detection_Part_1.ipynb‎

Lines changed: 131 additions & 130 deletions
Large diffs are not rendered by default.

‎examples/Basics/Methods-and-Parameters-for-Feature-Detection_Part_2.ipynb‎

Lines changed: 105 additions & 105 deletions
Large diffs are not rendered by default.

‎examples/Basics/Methods-and-Parameters-for-Linking.ipynb‎

Lines changed: 138 additions & 138 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)