From 1baba469bb6e141d0d54164863575a44d4bdf594 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 08:37:52 -0800 Subject: [PATCH 1/9] use earthaccess as environment name --- environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index e0eb49b3..1d61d9e8 100644 --- a/environment.yml +++ b/environment.yml @@ -1,11 +1,10 @@ -name: earthaccess-dev +name: earthaccess channels: - conda-forge dependencies: # This environment bootstraps pip, the actual dev environment # is installed and managed with pip - python=3.10 - - pip - pip: - --editable .[dev,test,docs] From 8a6e5b32bb903d04a1249387a6685eecc4dd6dd9 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 08:40:05 -0800 Subject: [PATCH 2/9] rename binder dir --- {binder => .binder}/environment.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {binder => .binder}/environment.yml (100%) diff --git a/binder/environment.yml b/.binder/environment.yml similarity index 100% rename from binder/environment.yml rename to .binder/environment.yml From 1df99b8369ec23ea669b1ba9a119a9e3774337c2 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 15:04:27 -0800 Subject: [PATCH 3/9] binder deps inventory --- .binder/environment.yml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/.binder/environment.yml b/.binder/environment.yml index 95c0496b..e6f88962 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -2,23 +2,18 @@ name: earthaccess channels: - conda-forge dependencies: - - python=3.9 - - xarray>=0.19 - - dask>=2022.1 - - rioxarray>=0.3 - - matplotlib-base>=3.3 - - cartopy>=0.18.0 - - ipyleaflet>=0.15 - - netcdf4>=1.5 - - h5netcdf>=0.11 - - h5py>=3.2 - - geopandas>=0.9 - - zarr>=2.9.5 - - jupyterlab>=3 - - hvplot - - holoviews - - panel + - python + - dask>=2022.1 # kerchunk + - h5netcdf>=0.11 # SSL notebook + - h5py>=3.2 # in lock but not anywhere else + - holoviews # emit-earthaccess notebook + - hvplot # emit-earthaccess notebook + - matplotlib-base>=3.3 # SSL notebook, docs + - netcdf4>=1.5 # h5netcdf used in docs + - panel # emit-earthaccess notebook + - xarray>=0.19 # EDL, SSL notebooks, docs + - zarr>=2.9.5 # in lock but not anywhere else - pip - pip: - - "." + - ".[notebooks]" From 6aafea17ef56be64162b5ce14da9e7f883ccc553 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 15:05:55 -0800 Subject: [PATCH 4/9] Binder doesn't appear to need anything special as our top level notebooks don't import anything but earthaccess and the standard library, and most of these deps are in the docs tutorials notebooks so would be available in the development environment --- .binder/environment.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .binder/environment.yml diff --git a/.binder/environment.yml b/.binder/environment.yml deleted file mode 100644 index e6f88962..00000000 --- a/.binder/environment.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: earthaccess -channels: - - conda-forge -dependencies: - - python - - dask>=2022.1 # kerchunk - - h5netcdf>=0.11 # SSL notebook - - h5py>=3.2 # in lock but not anywhere else - - holoviews # emit-earthaccess notebook - - hvplot # emit-earthaccess notebook - - matplotlib-base>=3.3 # SSL notebook, docs - - netcdf4>=1.5 # h5netcdf used in docs - - panel # emit-earthaccess notebook - - xarray>=0.19 # EDL, SSL notebooks, docs - - zarr>=2.9.5 # in lock but not anywhere else - - - pip - - pip: - - ".[notebooks]" From 273a2b7958ace03f674a895b804dc2787080ef55 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 15:06:15 -0800 Subject: [PATCH 5/9] unrestrict python version in environment file --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 1d61d9e8..0d4dcfa3 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: dependencies: # This environment bootstraps pip, the actual dev environment # is installed and managed with pip - - python=3.10 + - python - pip - pip: - --editable .[dev,test,docs] From 3ab0b9315813fe1bed7a9f16d36ab00d7d82c4b0 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 16:06:47 -0800 Subject: [PATCH 6/9] quote pip command --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 0d4dcfa3..fa8a3362 100644 --- a/environment.yml +++ b/environment.yml @@ -7,7 +7,7 @@ dependencies: - python - pip - pip: - - --editable .[dev,test,docs] + - --editable ".[dev,test,docs]" variables: # Allow pip installs when conda environment is active PIP_REQUIRE_VENV: 0 From 01f307ba8ae7ab33b4577182541097d566b2fa3a Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 16:49:56 -0800 Subject: [PATCH 7/9] update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cab9c40..43c5a244 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ## [Unreleased] ### Changed - - Automatically refresh EDL token and deprecate the `Auth.refresh_tokens` method with no replacement, as there is no longer a need to explicitly refresh ([#484](https://github.com/nsidc/earthaccess/issues/484)) @@ -39,6 +38,12 @@ ([#779](https://github.com/nsidc/earthaccess/issues/779)) ([**@Sherwin-14**](https://github.com/Sherwin-14)) +### Removed +- `binder/` directory as we no longer need a special [binder](https://mybinder.org) + environment with the top-level `environment.yml` introduce in + [#733](https://github.com/nsidc/earthaccess/issues/733) + ([@jhkennedy](https://github.com/jhkennedy)) + ## [0.10.0] 2024-07-19 ### Changed From 0ac0270c26c56d922987129341b85017a039dc20 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 20 Sep 2024 17:05:30 -0800 Subject: [PATCH 8/9] cleanup changelog whitespace --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43c5a244..7717f7e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] ### Changed + - Automatically refresh EDL token and deprecate the `Auth.refresh_tokens` method with no replacement, as there is no longer a need to explicitly refresh ([#484](https://github.com/nsidc/earthaccess/issues/484)) @@ -30,8 +31,6 @@ [**@Sherwin-14**](https://github.com/betolink), [**@mfisher87**](https://github.com/mfisher87) - - ### Fixed - Removed Broken Link "Introduction to NASA earthaccess" @@ -39,6 +38,7 @@ ([**@Sherwin-14**](https://github.com/Sherwin-14)) ### Removed + - `binder/` directory as we no longer need a special [binder](https://mybinder.org) environment with the top-level `environment.yml` introduce in [#733](https://github.com/nsidc/earthaccess/issues/733) From 81e11cb355d6d5d4faaa61ac24a12334cd4d2491 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Mon, 23 Sep 2024 11:08:46 -0800 Subject: [PATCH 9/9] Apply CHANGELOG.md suggestions from PR review Co-authored-by: Chuck Daniels --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7717f7e0..02b1c6b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,8 +39,8 @@ ### Removed -- `binder/` directory as we no longer need a special [binder](https://mybinder.org) - environment with the top-level `environment.yml` introduce in +- Remove `binder/` directory, as we no longer need a special [binder](https://mybinder.org) + environment with the top-level `environment.yml` introduced in [#733](https://github.com/nsidc/earthaccess/issues/733) ([@jhkennedy](https://github.com/jhkennedy))