Skip to content

Commit

Permalink
Merge pull request #275 from AryanBakliwal/i267
Browse files Browse the repository at this point in the history
separate test/docs dependencies
  • Loading branch information
observingClouds authored Aug 6, 2024
2 parents cc661d3 + a73f063 commit f4658f7
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 6 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 .
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`_.
Expand Down
4 changes: 3 additions & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions tests/environment.yml
Original file line number Diff line number Diff line change
@@ -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 ../.

0 comments on commit f4658f7

Please sign in to comment.