marEx 2.0.0__tar.gz → 2.0.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. {marex-2.0.0 → marex-2.0.1}/PKG-INFO +11 -16
  2. {marex-2.0.0 → marex-2.0.1}/README.md +2 -4
  3. {marex-2.0.0 → marex-2.0.1}/marEx/track.py +2 -2
  4. {marex-2.0.0 → marex-2.0.1}/marEx.egg-info/PKG-INFO +11 -16
  5. {marex-2.0.0 → marex-2.0.1}/marEx.egg-info/SOURCES.txt +0 -1
  6. {marex-2.0.0 → marex-2.0.1}/marEx.egg-info/requires.txt +7 -12
  7. marex-2.0.1/media/logo.png +0 -0
  8. {marex-2.0.0 → marex-2.0.1}/pyproject.toml +8 -13
  9. marex-2.0.0/media/logo.png +0 -0
  10. marex-2.0.0/media/logo_trans.png +0 -0
  11. {marex-2.0.0 → marex-2.0.1}/.gitignore +0 -0
  12. {marex-2.0.0 → marex-2.0.1}/examples/gridded data/01_preprocess_extremes.ipynb +0 -0
  13. {marex-2.0.0 → marex-2.0.1}/examples/gridded data/02_id_track_events.ipynb +0 -0
  14. {marex-2.0.0 → marex-2.0.1}/examples/gridded data/03_visualise_events.ipynb +0 -0
  15. {marex-2.0.0 → marex-2.0.1}/examples/unstructured data/01_preprocess_extremes.ipynb +0 -0
  16. {marex-2.0.0 → marex-2.0.1}/examples/unstructured data/02_id_track_events.ipynb +0 -0
  17. {marex-2.0.0 → marex-2.0.1}/examples/unstructured data/03_visualise_events.ipynb +0 -0
  18. {marex-2.0.0 → marex-2.0.1}/marEx/__init__.py +0 -0
  19. {marex-2.0.0 → marex-2.0.1}/marEx/detect.py +0 -0
  20. {marex-2.0.0 → marex-2.0.1}/marEx/helper.py +0 -0
  21. {marex-2.0.0 → marex-2.0.1}/marEx/plotX/__init__.py +0 -0
  22. {marex-2.0.0 → marex-2.0.1}/marEx/plotX/base.py +0 -0
  23. {marex-2.0.0 → marex-2.0.1}/marEx/plotX/gridded.py +0 -0
  24. {marex-2.0.0 → marex-2.0.1}/marEx/plotX/unstructured.py +0 -0
  25. {marex-2.0.0 → marex-2.0.1}/marEx.egg-info/dependency_links.txt +0 -0
  26. {marex-2.0.0 → marex-2.0.1}/marEx.egg-info/top_level.txt +0 -0
  27. {marex-2.0.0 → marex-2.0.1}/media/movie_ID_field_basic_gridded.mp4 +0 -0
  28. {marex-2.0.0 → marex-2.0.1}/media/movie_ID_field_gridded.mp4 +0 -0
  29. {marex-2.0.0 → marex-2.0.1}/media/old/movie_ID_field_centroid.mp4 +0 -0
  30. {marex-2.0.0 → marex-2.0.1}/media/old/movie_ID_field_nn.mp4 +0 -0
  31. {marex-2.0.0 → marex-2.0.1}/media/old/movie_ID_field_original.mp4 +0 -0
  32. {marex-2.0.0 → marex-2.0.1}/setup.cfg +0 -0
{marex-2.0.0 → marex-2.0.1}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.2
1
+ Metadata-Version: 2.4
2
2
  Name: marEx
3
- Version: 2.0.0
3
+ Version: 2.0.1
4
4
  Summary: Marine Extremes Detection and Tracking
5
5
  Author-email: Aaron Wienkers <aaron@wienkers.com>
6
6
  Project-URL: Homepage, https://github.com/wienkers/marEx
@@ -15,30 +15,27 @@ Classifier: Programming Language :: Python :: 3.10
15
15
  Requires-Python: >=3.6
16
16
  Description-Content-Type: text/markdown
17
17
  Requires-Dist: numpy
18
- Requires-Dist: xarray
19
- Requires-Dist: dask
18
+ Requires-Dist: xarray[complete]
19
+ Requires-Dist: dask[complete]==2025.3.0
20
+ Requires-Dist: netcdf4
20
21
  Requires-Dist: scipy
21
22
  Requires-Dist: scikit-image
22
23
  Requires-Dist: dask_image
23
24
  Requires-Dist: pandas
25
+ Requires-Dist: numba
24
26
  Requires-Dist: pillow
25
27
  Requires-Dist: xhistogram
26
28
  Requires-Dist: flox
29
+ Requires-Dist: matplotlib
30
+ Requires-Dist: cartopy
27
31
  Provides-Extra: dev
28
32
  Requires-Dist: pytest; extra == "dev"
29
33
  Requires-Dist: black; extra == "dev"
30
34
  Requires-Dist: flake8; extra == "dev"
31
- Provides-Extra: viz
32
- Requires-Dist: matplotlib; extra == "viz"
33
- Requires-Dist: cartopy; extra == "viz"
34
- Provides-Extra: jax
35
- Requires-Dist: jax; extra == "jax"
36
- Requires-Dist: jaxlib; extra == "jax"
37
35
  Provides-Extra: full
38
- Requires-Dist: matplotlib; extra == "full"
39
- Requires-Dist: cartopy; extra == "full"
40
36
  Requires-Dist: jax; extra == "full"
41
37
  Requires-Dist: jaxlib; extra == "full"
38
+ Requires-Dist: dask_jobqueue; extra == "full"
42
39
 
43
40
 
44
41
  ![Logo](media/logo.png)
@@ -95,11 +92,9 @@ Efficient & scalable Marine Extremes detection, identification, & tracking for E
95
92
  **Plotting**:
96
93
  - Provides a few helper functions to create pretty plots, wrapped subplots, and animations (e.g. below).
97
94
 
98
- cf. Old Method vs. New Tracking Algorithms (Centroidal & Nearest-Neighbour Partitioning):
95
+ cf. Old (Basic) ID Method vs. New Tracking & Merging Algorithm:
99
96
 
100
- https://github.com/user-attachments/assets/9936fb43-f7a3-461e-aa82-9beb2826619c
101
-
102
- https://github.com/user-attachments/assets/462acafd-b2af-467c-b2c5-efec28ed24f1
97
+ https://github.com/user-attachments/assets/074cfd20-d979-49a7-bda9-0c356c786b1d
103
98
 
104
99
 
105
100
 
{marex-2.0.0 → marex-2.0.1}/README.md RENAMED
@@ -53,11 +53,9 @@ Efficient & scalable Marine Extremes detection, identification, & tracking for E
53
53
  **Plotting**:
54
54
  - Provides a few helper functions to create pretty plots, wrapped subplots, and animations (e.g. below).
55
55
 
56
- cf. Old Method vs. New Tracking Algorithms (Centroidal & Nearest-Neighbour Partitioning):
56
+ cf. Old (Basic) ID Method vs. New Tracking & Merging Algorithm:
57
57
 
58
- https://github.com/user-attachments/assets/9936fb43-f7a3-461e-aa82-9beb2826619c
59
-
60
- https://github.com/user-attachments/assets/462acafd-b2af-467c-b2c5-efec28ed24f1
58
+ https://github.com/user-attachments/assets/074cfd20-d979-49a7-bda9-0c356c786b1d
61
59
 
62
60
 
63
61
 
{marex-2.0.0 → marex-2.0.1}/marEx/track.py RENAMED
@@ -2055,7 +2055,7 @@ class tracker:
2055
2055
 
2056
2056
  # Calculate maximum search distance
2057
2057
  max_area = np.max(object_props.sel(ID=parent_ids).area.values)
2058
- max_distance = int(np.sqrt(max_area) * 2.0) # Use 2x the max blob radius
2058
+ max_distance = int(np.sqrt(max_area) * 3.0) # Use 3x the max blob radius
2059
2059
 
2060
2060
  # Use optimised structured grid partitioning
2061
2061
  new_labels = partition_nn_grid(
@@ -2064,7 +2064,7 @@ class tracker:
2064
2064
  child_ids,
2065
2065
  parent_centroids,
2066
2066
  Nx,
2067
- max_distance=max(max_distance, 20) # Set minimum threshold, in cells
2067
+ max_distance=max(max_distance, 40) # Set minimum threshold, in cells
2068
2068
  )
2069
2069
 
2070
2070
  else:
{marex-2.0.0 → marex-2.0.1}/marEx.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.2
1
+ Metadata-Version: 2.4
2
2
  Name: marEx
3
- Version: 2.0.0
3
+ Version: 2.0.1
4
4
  Summary: Marine Extremes Detection and Tracking
5
5
  Author-email: Aaron Wienkers <aaron@wienkers.com>
6
6
  Project-URL: Homepage, https://github.com/wienkers/marEx
@@ -15,30 +15,27 @@ Classifier: Programming Language :: Python :: 3.10
15
15
  Requires-Python: >=3.6
16
16
  Description-Content-Type: text/markdown
17
17
  Requires-Dist: numpy
18
- Requires-Dist: xarray
19
- Requires-Dist: dask
18
+ Requires-Dist: xarray[complete]
19
+ Requires-Dist: dask[complete]==2025.3.0
20
+ Requires-Dist: netcdf4
20
21
  Requires-Dist: scipy
21
22
  Requires-Dist: scikit-image
22
23
  Requires-Dist: dask_image
23
24
  Requires-Dist: pandas
25
+ Requires-Dist: numba
24
26
  Requires-Dist: pillow
25
27
  Requires-Dist: xhistogram
26
28
  Requires-Dist: flox
29
+ Requires-Dist: matplotlib
30
+ Requires-Dist: cartopy
27
31
  Provides-Extra: dev
28
32
  Requires-Dist: pytest; extra == "dev"
29
33
  Requires-Dist: black; extra == "dev"
30
34
  Requires-Dist: flake8; extra == "dev"
31
- Provides-Extra: viz
32
- Requires-Dist: matplotlib; extra == "viz"
33
- Requires-Dist: cartopy; extra == "viz"
34
- Provides-Extra: jax
35
- Requires-Dist: jax; extra == "jax"
36
- Requires-Dist: jaxlib; extra == "jax"
37
35
  Provides-Extra: full
38
- Requires-Dist: matplotlib; extra == "full"
39
- Requires-Dist: cartopy; extra == "full"
40
36
  Requires-Dist: jax; extra == "full"
41
37
  Requires-Dist: jaxlib; extra == "full"
38
+ Requires-Dist: dask_jobqueue; extra == "full"
42
39
 
43
40
 
44
41
  ![Logo](media/logo.png)
@@ -95,11 +92,9 @@ Efficient & scalable Marine Extremes detection, identification, & tracking for E
95
92
  **Plotting**:
96
93
  - Provides a few helper functions to create pretty plots, wrapped subplots, and animations (e.g. below).
97
94
 
98
- cf. Old Method vs. New Tracking Algorithms (Centroidal & Nearest-Neighbour Partitioning):
95
+ cf. Old (Basic) ID Method vs. New Tracking & Merging Algorithm:
99
96
 
100
- https://github.com/user-attachments/assets/9936fb43-f7a3-461e-aa82-9beb2826619c
101
-
102
- https://github.com/user-attachments/assets/462acafd-b2af-467c-b2c5-efec28ed24f1
97
+ https://github.com/user-attachments/assets/074cfd20-d979-49a7-bda9-0c356c786b1d
103
98
 
104
99
 
105
100
 
{marex-2.0.0 → marex-2.0.1}/marEx.egg-info/SOURCES.txt RENAMED
@@ -21,7 +21,6 @@ marEx/plotX/base.py
21
21
  marEx/plotX/gridded.py
22
22
  marEx/plotX/unstructured.py
23
23
  media/logo.png
24
- media/logo_trans.png
25
24
  media/movie_ID_field_basic_gridded.mp4
26
25
  media/movie_ID_field_gridded.mp4
27
26
  media/old/movie_ID_field_centroid.mp4
{marex-2.0.0 → marex-2.0.1}/marEx.egg-info/requires.txt RENAMED
@@ -1,13 +1,17 @@
1
1
  numpy
2
- xarray
3
- dask
2
+ xarray[complete]
3
+ dask[complete]==2025.3.0
4
+ netcdf4
4
5
  scipy
5
6
  scikit-image
6
7
  dask_image
7
8
  pandas
9
+ numba
8
10
  pillow
9
11
  xhistogram
10
12
  flox
13
+ matplotlib
14
+ cartopy
11
15
 
12
16
  [dev]
13
17
  pytest
@@ -15,15 +19,6 @@ black
15
19
  flake8
16
20
 
17
21
  [full]
18
- matplotlib
19
- cartopy
20
- jax
21
- jaxlib
22
-
23
- [jax]
24
22
  jax
25
23
  jaxlib
26
-
27
- [viz]
28
- matplotlib
29
- cartopy
24
+ dask_jobqueue
marex-2.0.1/media/logo.png ADDED
Binary file
{marex-2.0.0 → marex-2.0.1}/pyproject.toml RENAMED
@@ -22,15 +22,19 @@ classifiers = [
22
22
  dynamic = ["version"]
23
23
  dependencies = [
24
24
  "numpy",
25
- "xarray",
26
- "dask",
25
+ "xarray[complete]",
26
+ "dask[complete]==2025.3.0",
27
+ "netcdf4",
27
28
  "scipy",
28
29
  "scikit-image",
29
30
  "dask_image",
30
31
  "pandas",
32
+ "numba",
31
33
  "pillow",
32
34
  "xhistogram",
33
35
  "flox",
36
+ "matplotlib",
37
+ "cartopy",
34
38
  ]
35
39
 
36
40
  [project.optional-dependencies]
@@ -39,19 +43,10 @@ dev = [
39
43
  "black",
40
44
  "flake8",
41
45
  ]
42
- viz = [
43
- "matplotlib",
44
- "cartopy",
45
- ]
46
- jax = [
47
- "jax",
48
- "jaxlib",
49
- ]
50
46
  full = [
51
- "matplotlib",
52
- "cartopy",
53
47
  "jax",
54
48
  "jaxlib",
49
+ "dask_jobqueue",
55
50
  ]
56
51
 
57
52
  [project.urls]
@@ -67,4 +62,4 @@ local_scheme = "node-and-date"
67
62
 
68
63
  [tool.black]
69
64
  line-length = 88
70
- target-version = ['py38']
65
+ target-version = ['py38']
marex-2.0.0/media/logo.png DELETED
Binary file
marex-2.0.0/media/logo_trans.png DELETED
Binary file
{marex-2.0.0 → marex-2.0.1}/.gitignore RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/marEx/__init__.py RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/marEx/detect.py RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/marEx/helper.py RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/marEx/plotX/__init__.py RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/marEx/plotX/base.py RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/marEx/plotX/gridded.py RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/marEx/plotX/unstructured.py RENAMED
File without changes
{marex-2.0.0 → marex-2.0.1}/setup.cfg RENAMED
File without changes