From 910de72e4cbb2240bae84ace549c8ad2aae1cffd Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal Date: Wed, 3 Apr 2024 23:07:53 +0530 Subject: [PATCH 01/11] separate dependencies Signed-off-by: Aryan Bakliwal --- docs/environment.yml | 15 +++++++++++---- requirements.txt | 13 +++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index 23e08aa9..3f8c798d 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -2,25 +2,32 @@ name: bitinfo-docs channels: - conda-forge dependencies: - - python=3.9 + - python + - julia<1.9.0 + - pyjulia - matplotlib-base - numpy - pooch - xarray - dask-core + - distributed - jupyterlab - netcdf4 - zarr - cfgrib - - prefect>=1.0.0 + - prefect>=1.0.0,<2.0 + - graphviz + - pytest + - nb_conda_kernels - cmcrameri - tqdm + - asv - sphinx!=4.4.0 - sphinxcontrib-napoleon - sphinx-copybutton - - sphinx-book-theme>=0.1.7 + - sphinx-book-theme - myst-nb - numcodecs>=0.10.0 - pip - pip: - - -e ../. + - -e . diff --git a/requirements.txt b/requirements.txt index 2f48bd42..29b17eef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,17 @@ +pytest +pooch +netcdf4 dask +matplotlib +cmcrameri +prefect>=1.0.0,<2.0 +zarr +julia xarray tqdm numcodecs>=0.10.0 +sphinx +sphinxcontrib-napoleon +sphinx-copybutton +sphinx_book_theme +myst-nb From 366bfacdefd1a8eb273c35e312bcbe741d778d14 Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal Date: Wed, 3 Apr 2024 23:36:39 +0530 Subject: [PATCH 02/11] fix Signed-off-by: Aryan Bakliwal --- docs/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/environment.yml b/docs/environment.yml index 3f8c798d..e054fe3d 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -30,4 +30,4 @@ dependencies: - numcodecs>=0.10.0 - pip - pip: - - -e . + - -e ../. From 6d019478b6d1d8766c5c3387bf5d3c61f9e23fd1 Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal Date: Wed, 3 Apr 2024 23:52:39 +0530 Subject: [PATCH 03/11] fix Signed-off-by: Aryan Bakliwal --- docs/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/environment.yml b/docs/environment.yml index e054fe3d..2b4a8540 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -2,7 +2,7 @@ name: bitinfo-docs channels: - conda-forge dependencies: - - python + - python=3.9 - julia<1.9.0 - pyjulia - matplotlib-base From f3b756c21f28508bee397ceeceb8eeae675f0055 Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal Date: Sat, 6 Apr 2024 12:54:07 +0530 Subject: [PATCH 04/11] add tests/environment.yaml Signed-off-by: Aryan Bakliwal --- docs/environment.yml | 10 ++-------- requirements.txt | 13 ------------- tests/environment.yaml | 8 ++++++++ 3 files changed, 10 insertions(+), 21 deletions(-) create mode 100644 tests/environment.yaml diff --git a/docs/environment.yml b/docs/environment.yml index 2b4a8540..aefa4f16 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -3,29 +3,23 @@ channels: - conda-forge dependencies: - python=3.9 - - julia<1.9.0 - - pyjulia - matplotlib-base - numpy - pooch - xarray - dask-core - - distributed - jupyterlab - netcdf4 - zarr - cfgrib - prefect>=1.0.0,<2.0 - - graphviz - - pytest - - nb_conda_kernels - cmcrameri + - julia - tqdm - - asv - sphinx!=4.4.0 - sphinxcontrib-napoleon - sphinx-copybutton - - sphinx-book-theme + - sphinx-book-theme>=0.1.7 - myst-nb - numcodecs>=0.10.0 - pip diff --git a/requirements.txt b/requirements.txt index 29b17eef..2f48bd42 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,4 @@ -pytest -pooch -netcdf4 dask -matplotlib -cmcrameri -prefect>=1.0.0,<2.0 -zarr -julia xarray tqdm numcodecs>=0.10.0 -sphinx -sphinxcontrib-napoleon -sphinx-copybutton -sphinx_book_theme -myst-nb diff --git a/tests/environment.yaml b/tests/environment.yaml new file mode 100644 index 00000000..b1c8d695 --- /dev/null +++ b/tests/environment.yaml @@ -0,0 +1,8 @@ +name: bitinfo-tests +channels: + - conda-forge +dependencies: + - pytest + - pooch + - netcdf4 + - dask From 66c6515a9f2c61e489ed4df3d4a1e833bdb2bf7e Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal Date: Sat, 6 Apr 2024 13:10:45 +0530 Subject: [PATCH 05/11] added workflow to use separate dependencies Signed-off-by: Aryan Bakliwal --- .github/workflows/ci.yaml | 4 ++-- tests/environment.yaml | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 02ca731b..9cf6723f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,7 +42,7 @@ jobs: python-version: '3.11' - name: Set up conda environment run: | - mamba env update -f environment.yml + mamba env update -f tests/environment.yml - name: Conda info run: conda info - name: Conda list @@ -69,7 +69,7 @@ jobs: python-version: '3.11' - name: Install conda dependencies run: | - mamba env update -f environment.yml + mamba env update -f docs/environment.yml - name: Install xbitinfo run: | python -m pip install -e . diff --git a/tests/environment.yaml b/tests/environment.yaml index b1c8d695..61a23aee 100644 --- a/tests/environment.yaml +++ b/tests/environment.yaml @@ -2,7 +2,25 @@ name: bitinfo-tests channels: - conda-forge dependencies: - - pytest + - python + - julia<1.9.0 + - pyjulia + - matplotlib-base + - numpy - pooch + - xarray + - dask-core + - distributed + - jupyterlab - netcdf4 - - dask + - zarr + - cfgrib + - prefect>=1.0.0,<2.0 + - graphviz + - pytest + - nb_conda_kernels + - cmcrameri + - tqdm + - asv + - pip: + - -e ../. From 1efdcc6c453b4537b3de4e22e2a3ae42171f0c39 Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal Date: Sun, 7 Apr 2024 09:03:25 +0530 Subject: [PATCH 06/11] add missing dependency Signed-off-by: Aryan Bakliwal --- docs/environment.yml | 1 + tests/{environment.yaml => environment.yml} | 0 2 files changed, 1 insertion(+) rename tests/{environment.yaml => environment.yml} (100%) diff --git a/docs/environment.yml b/docs/environment.yml index aefa4f16..d8a7d5c3 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -16,6 +16,7 @@ dependencies: - cmcrameri - julia - tqdm + - pytest - sphinx!=4.4.0 - sphinxcontrib-napoleon - sphinx-copybutton diff --git a/tests/environment.yaml b/tests/environment.yml similarity index 100% rename from tests/environment.yaml rename to tests/environment.yml From 92d614a057124a3b614908aadb27296f2f5a3e0f Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal <106430579+AryanBakliwal@users.noreply.github.com> Date: Wed, 17 Apr 2024 17:19:05 +0530 Subject: [PATCH 07/11] corrected activate-environment --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d3049364..99a406f7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: auto-update-conda: false channels: conda-forge miniforge-variant: Mambaforge - activate-environment: bitinfo + activate-environment: bitinfo-tests python-version: '3.11' - name: Set up conda environment run: | @@ -64,7 +64,7 @@ jobs: with: channels: conda-forge miniforge-variant: Mambaforge - activate-environment: bitinfo + activate-environment: bitinfo-docs auto-update-conda: false python-version: '3.11' - name: Install conda dependencies From e127fff5e383e95e616731c4cb351b3ab3972d2f Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal <106430579+AryanBakliwal@users.noreply.github.com> Date: Thu, 18 Apr 2024 10:57:39 +0530 Subject: [PATCH 08/11] change environment for doctest and notebook --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 99a406f7..10581a64 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -64,12 +64,12 @@ jobs: with: channels: conda-forge miniforge-variant: Mambaforge - activate-environment: bitinfo-docs + activate-environment: bitinfo-tests auto-update-conda: false python-version: '3.11' - name: Install conda dependencies run: | - mamba env update -f docs/environment.yml + mamba env update -f tests/environment.yml - name: Install xbitinfo run: | python -m pip install -e . @@ -96,11 +96,11 @@ jobs: auto-update-conda: false channels: conda-forge miniforge-variant: Mambaforge - activate-environment: bitinfo + activate-environment: bitinfo-docs python-version: '3.11' - name: Set up conda environment run: | - mamba env update -f environment.yml + mamba env update -f docs/environment.yml - name: Remove julia (issue #212) run: | conda remove julia From e2031387590f1c1699c587a062f7180f1182f138 Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal Date: Tue, 23 Apr 2024 17:41:52 +0000 Subject: [PATCH 09/11] add dependencies in tests/environment.yml Signed-off-by: Aryan Bakliwal --- tests/environment.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/environment.yml b/tests/environment.yml index 61a23aee..9be73d1e 100644 --- a/tests/environment.yml +++ b/tests/environment.yml @@ -22,5 +22,10 @@ dependencies: - cmcrameri - tqdm - asv + - sphinx!=4.4.0 + - sphinxcontrib-napoleon + - sphinx-copybutton + - sphinx-book-theme + - myst-nb - pip: - -e ../. From dffa56cde937613934589a616fc90adb9f0e9594 Mon Sep 17 00:00:00 2001 From: Aryan Bakliwal <106430579+AryanBakliwal@users.noreply.github.com> Date: Wed, 1 May 2024 16:43:44 +0000 Subject: [PATCH 10/11] add dependency --- tests/environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/environment.yml b/tests/environment.yml index 9be73d1e..fd3d9bf1 100644 --- a/tests/environment.yml +++ b/tests/environment.yml @@ -27,5 +27,7 @@ dependencies: - sphinx-copybutton - sphinx-book-theme - myst-nb + - numcodecs>=0.10.0 + - pip - pip: - -e ../. From a73f063fc32969d1ffa6d361a2c8cabb9b8ea406 Mon Sep 17 00:00:00 2001 From: Hauke Schulz <43613877+observingClouds@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:45:30 +0200 Subject: [PATCH 11/11] add improved environment separation --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f71fef96..6aed1447 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ CHANGELOG X.X.X (unreleased) ------------------ +* Improve test/docs environment separation (:pr:`275`, :issue:`267`) `Aryan Bakliwal`_. * Set default masked value to None for integers (:pr:`289`) `Hauke Schulz`_. * Add basic filter to remove artificial information from bitinformation (:pr:`280`, :issue:`209`) `Ishaan Jain`_. * Add support for additional datatypes in :py:func:`xbitinfo.xbitinfo.plot_bitinformation` (:pr:`218`, :issue:`168`) `Hauke Schulz`_.