diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2c6279cb..eb0f4cd8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,11 +38,11 @@ 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: | - mamba env update -f environment.yml + mamba env update -f tests/environment.yml - name: Conda info run: conda info - name: Conda list @@ -64,12 +64,12 @@ jobs: with: channels: conda-forge miniforge-variant: Mambaforge - activate-environment: bitinfo + activate-environment: bitinfo-tests auto-update-conda: false python-version: '3.11' - name: Install conda dependencies run: | - mamba env update -f environment.yml + mamba env update -f tests/environment.yml - name: Install xbitinfo run: | python -m pip install -e . @@ -97,10 +97,13 @@ jobs: channels: conda-forge miniforge-variant: Mambaforge activate-environment: bitinfo-docs - python-version: '3.9' + python-version: '3.11' - name: Set up conda environment run: | mamba env update -f docs/environment.yml + - name: Remove julia (issue #212) + run: | + conda remove julia - name: Conda info run: conda info - name: Conda list 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`_. diff --git a/docs/environment.yml b/docs/environment.yml index da8d067b..c7ef21e1 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -12,9 +12,11 @@ dependencies: - netcdf4 - zarr - cfgrib - - prefect>=1.0.0 + - prefect>=1.0.0,<2.0 - cmcrameri + - julia - tqdm + - pytest - sphinx!=4.4.0 - sphinx-copybutton - sphinx-book-theme>=0.1.7 diff --git a/tests/environment.yml b/tests/environment.yml new file mode 100644 index 00000000..fd3d9bf1 --- /dev/null +++ b/tests/environment.yml @@ -0,0 +1,33 @@ +name: bitinfo-tests +channels: + - conda-forge +dependencies: + - python + - 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 + - tqdm + - asv + - sphinx!=4.4.0 + - sphinxcontrib-napoleon + - sphinx-copybutton + - sphinx-book-theme + - myst-nb + - numcodecs>=0.10.0 + - pip + - pip: + - -e ../.