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

Sandbox image upgrade #552

Merged
merged 27 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cae020d
Remove manual setting of variable USE_PYGEOS
vikineema Sep 30, 2024
d5d1e21
Bump version
vikineema Sep 30, 2024
c30c534
Remove flake8 constraint
vikineema Sep 30, 2024
f3a17ba
Fix ValueError in subpixel_contours
vikineema Sep 30, 2024
fe52655
Update build system dependencies
vikineema Sep 30, 2024
14b91ad
Set crop default to False
vikineema Sep 30, 2024
3cb5b4d
Bump version
vikineema Sep 30, 2024
cb25d8e
Merge branch 'model_tides' of github.com:digitalearthafrica/deafrica-…
vikineema Sep 30, 2024
82f1d03
Update setuptools requirement
vikineema Sep 30, 2024
81248f6
Fix apps not available in 2.5.1
vikineema Oct 2, 2024
83e7960
Merge branch 'fix-apps' of https://github.com/digitalearthafrica/deaf…
vikineema Oct 2, 2024
c2b3bea
Fix RecursionError in Intertidal_elevation notebook
vikineema Oct 2, 2024
c05f3a5
Update Change_filmstrips notebook
vikineema Oct 3, 2024
dc23053
Merge branch 'sandbox-image-upgrade' of https://github.com/digitalear…
vikineema Oct 3, 2024
adf804c
Fix recursion error
vikineema Oct 3, 2024
672bb93
Fix crop parameter
vikineema Oct 3, 2024
763d9ee
Update window size for lee filter
vikineema Oct 4, 2024
5b7ed02
Regenerate model file
vikineema Oct 4, 2024
a30c980
Update phenology plotting
vikineema Oct 4, 2024
f0a8b54
Bump version
vikineema Oct 7, 2024
ccf1e49
Merge branch 'sandbox-image-upgrade' of github.com:digitalearthafrica…
vikineema Oct 7, 2024
a31e6ef
Merge branch 'main' of github.com:digitalearthafrica/deafrica-sandbox…
vikineema Oct 15, 2024
a02706b
Update readme for tools
vikineema Oct 15, 2024
8495835
Update conda environment file to match sandbox upgrade
vikineema Oct 15, 2024
e54dee6
Update python version for precommit
vikineema Oct 15, 2024
53b42a1
Fix parallel_apply
vikineema Oct 15, 2024
bd560c9
Remove environment variable USE_PYGEOS
vikineema Oct 15, 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
64 changes: 27 additions & 37 deletions Real_world_examples/Change_filmstrips.ipynb

Large diffs are not rendered by default.

203 changes: 110 additions & 93 deletions Real_world_examples/Intertidal_elevation.ipynb

Large diffs are not rendered by default.

372 changes: 233 additions & 139 deletions Real_world_examples/Intertidal_elevation_S2.ipynb

Large diffs are not rendered by default.

89 changes: 44 additions & 45 deletions Real_world_examples/Radar_water_detection.ipynb

Large diffs are not rendered by default.

Binary file not shown.
2 changes: 1 addition & 1 deletion Tools/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
default_language_version:
python: python3.10.6
python: python3.10.12

default_stages: [pre-commit, pre-push]

Expand Down
6 changes: 3 additions & 3 deletions Tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ This module is automatically installed on the Digital Earth Africa Sandbox. If f
You can install the latest version of `deafrica-tools` from PyPI using:

```
python -m pip install --extra-index-url="https://packages.dea.ga.gov.au" deafrica-tools
python -m pip install deafrica-tools
```

or install the package directly from the `Tools` directory to incorperate local changes:

```
python -m pip install --extra-index-url="https://packages.dea.ga.gov.au" Tools/
python -m pip install Tools/
```

To install this module from the source on any other system with `pip`:

```
python -m pip install --extra-index-url="https://packages.dea.ga.gov.au" git+https://github.com/digitalearthafrica/deafrica-sandbox-notebooks.git#subdirectory=Tools
python -m pip install git+https://github.com/digitalearthafrica/deafrica-sandbox-notebooks.git#subdirectory=Tools
```


Expand Down
2 changes: 1 addition & 1 deletion Tools/deafrica_tools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__locales__ = __path__[0] + "/locales"

__version__ = "2.5.2"
__version__ = "2.5.3"


def set_lang(lang=None):
Expand Down
7 changes: 0 additions & 7 deletions Tools/deafrica_tools/app/animations.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
Satellite imagery animation widget, which can be used to interactively
produce animations for multiple DE Africa products.
"""

# Force GeoPandas to use Shapely instead of PyGEOS
# In a future release, GeoPandas will switch to using Shapely by default.
import os

os.environ["USE_PYGEOS"] = "0"

import datetime
import itertools
import json
Expand Down
6 changes: 0 additions & 6 deletions Tools/deafrica_tools/areaofinterest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
Function for defining an area of interest using either a point and buffer or a vector file.
"""

# Force GeoPandas to use Shapely instead of PyGEOS
# In a future release, GeoPandas will switch to using Shapely by default.
import os

os.environ["USE_PYGEOS"] = "0"

import geopandas as gpd
from geojson import Feature, FeatureCollection, Point
from shapely.geometry import box
Expand Down
2 changes: 1 addition & 1 deletion Tools/deafrica_tools/datahandling.py
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ def parallel_apply(ds, dim, func, *args):
with ProcessPoolExecutor() as executor:

# Apply func in parallel
groups = [group for (i, group) in ds.groupby(dim)]
groups = [group.squeeze(dim=dim) for (i, group) in ds.groupby(dim)]
to_iterate = (groups, *(repeat(i, len(groups)) for i in args))
out_list = list(tqdm(executor.map(func, *to_iterate), total=len(groups)))

Expand Down
Loading