Skip to content

Commit

Permalink
Merge pull request #209 from Ouranosinc/fix_rtd
Browse files Browse the repository at this point in the history
Modify RtD install step to prevent --eager dependency changes
  • Loading branch information
Zeitsperre authored Jun 1, 2023
2 parents b41260a + 77e1e47 commit 86464ac
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 15 deletions.
7 changes: 2 additions & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@ build:
tools:
python: "mambaforge-4.10"
jobs:
post_create_environment:
- pip install . --no-deps
pre_build:
- sphinx-apidoc -o docs/ --private --module-first xscen
- env SKIP_NOTEBOOKS=1 sphinx-build -b linkcheck docs/ _build/linkcheck

conda:
environment: environment-dev.yml

python:
install:
- method: pip
path: .
1 change: 1 addition & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Bug fixes
Internal changes
^^^^^^^^^^^^^^^^
* Removed the pin on xarray's version. (:issue:`175`, :pull:`199`).
* Updated ReadTheDocs configuration to prevent ``--eager`` installation of xscen (:pull:`209`).

v0.6.0 (2023-05-04)
-------------------
Expand Down
6 changes: 1 addition & 5 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: xscen-dev
channels:
- conda-forge
dependencies:
- python >=3.9
- python >=3.9,<3.11
# Don't forget to sync the changes here with environment.yml!
# Some pins here are meant to accelerate conda and might not be related to real needs
# Main packages
Expand All @@ -29,10 +29,6 @@ dependencies:
- xclim >=0.37
- xesmf >=0.7
- zarr
# To avoid bugs
# See https://github.com/esmf-org/esmf/issues/115
# we add this "dependency" so the following pip install doesn't install anything else than xscen
- pytest-json-report
# Opt
- nc-time-axis >=1.3.1
- pyarrow >=1.0.0 # For lighter in-memory catalogs
Expand Down
6 changes: 1 addition & 5 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: xscen
channels:
- conda-forge
dependencies:
- python >=3.9
- python >=3.9,<3.11
# Don't forget to sync the changes here with environment-dev.yml!
# Main packages
- cartopy
Expand All @@ -28,10 +28,6 @@ dependencies:
- xclim >=0.37
- xesmf >=0.7
- zarr
# To avoid bugs
# See https://github.com/esmf-org/esmf/issues/115
# we add this "dependency" so the following pip install doesn't install anything else than xscen
- pytest-json-report
# Opt
- nc-time-axis >=1.3.1
- pyarrow >=1.0.0
Expand Down

0 comments on commit 86464ac

Please sign in to comment.