Skip to content

Add all deps to the conda-forge environment and suppress installing and reinstalling deps with pip at readthedocs builds #1786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schlunma merged 25 commits into from
Nov 16, 2022
Merged

Add all deps to the conda-forge environment and suppress installing and reinstalling deps with pip at readthedocs builds #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
97eb914
suppressunnecessary and eager pip install by redthedocs builder
valeriupredoi Nov 9, 2022
2e223ba
Update .readthedocs.yaml
valeriupredoi Nov 10, 2022
38d8bd4
add pkgs for docs in conda env with accurate pins
valeriupredoi Nov 10, 2022
362868e
up pins to be in line with Tool docs pkgs pins
valeriupredoi Nov 10, 2022
a446a08
move isodate to conda env
valeriupredoi Nov 10, 2022
a641d72
plop humanfriendly and prov in conda env too
valeriupredoi Nov 10, 2022
69776f3
thell with this, lets get all from conda forge
valeriupredoi Nov 10, 2022
11ecbfa
proper tweaked env file
valeriupredoi Nov 10, 2022
9fe985c
fixed doc
valeriupredoi Nov 10, 2022
47d05c1
run GA for sanity
valeriupredoi Nov 10, 2022
fb1c9d3
Merge branch 'main' into suppress_eager_pip_readthedocs
valeriupredoi Nov 14, 2022
f5aec25
restore old text
valeriupredoi Nov 14, 2022
9c6724d
try that again
valeriupredoi Nov 14, 2022
cd435f0
toss everthing and the kitchen sink in env
valeriupredoi Nov 14, 2022
7dcfb47
remove sample data
valeriupredoi Nov 14, 2022
5fe4201
Merge branch 'main' into suppress_eager_pip_readthedocs
valeriupredoi Nov 14, 2022
4f80b86
missing PyPI variable
valeriupredoi Nov 14, 2022
5d592fa
Merge branch 'main' into suppress_eager_pip_readthedocs
valeriupredoi Nov 15, 2022
981822a
remove esgf-pyclient from conda forge env
valeriupredoi Nov 15, 2022
e09ec87
no nodeps for now
valeriupredoi Nov 15, 2022
6e060bd
no more ga tests
valeriupredoi Nov 15, 2022
d84f543
mypy in testing area and readd esgf-pyclient
valeriupredoi Nov 16, 2022
a9f69f3
rety with no deps
valeriupredoi Nov 16, 2022
aced2d9
ga again
valeriupredoi Nov 16, 2022
1403dfb
no more ga tests
valeriupredoi Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .readthedocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,15 @@ build:
os: ubuntu-22.04
tools:
python: "mambaforge-4.10"
jobs:
post_create_environment:
- pip install . --no-deps

# Declare the requirements required to build your docs
conda:
environment:
environment.yml

python:
install:
- method: pip
path: .
extra_requirements:
- doc

# Build documentation in the doc directory with Sphinx
sphinx:
configuration: doc/conf.py
Expand Down
6 changes: 3 additions & 3 deletions doc/contributing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,13 +635,13 @@ When adding or removing dependencies, please consider applying the changes in
the following files:

- ``environment.yml``
contains development dependencies that cannot be installed from
`PyPI <https://pypi.org/>`_
contains all the development dependencies; these are all from
`conda-forge <https://conda-forge.org/>`_
- ``setup.py``
contains all Python dependencies, regardless of their installation source

Note that packages may have a different name on
`conda-forge <https://conda-forge.org/>`__ than on PyPI_.
`conda-forge <https://conda-forge.org/>`__ than on `PyPI <https://pypi.org/>`_.

Several test jobs on CircleCI_ related to the installation of the tool will only
run if you change the dependencies.
Expand Down
51 changes: 47 additions & 4 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,67 @@
name: esmvaltool
channels:
- conda-forge
- nodefaults

dependencies:
- cartopy
- cf-units>=3.0.0,<3.1.0 # github.com/ESMValGroup/ESMValCore/issues/1655
- cftime
- dask
- compilers
# 1.8.18/py39, they seem weary to build manylinux wheels
# and pypi ver built with older gdal
- fiona
- esgf-pyclient>=0.3.1
- esmpy!=8.1.0 # see github.com/ESMValGroup/ESMValCore/issues/1208
- fiona
- fire
- geopy
- humanfriendly
- importlib_resources
- iris>=3.2.1
- mypy>=0.990
- isodate
- jinja2
- nc-time-axis
- nested-lookup
- netcdf4!=1.6.1 # github.com/ESMValGroup/ESMValCore/issues/1723
- numpy
- pandas
- pillow
- pip!=21.3
- prov
- psutil
- pybtex
- python>=3.8
- python-stratify
- pyyaml
- requests
- scipy>=1.6
- shapely
- yamale
# Python packages needed for building docs
- autodocsumm>=0.2.2
- sphinx>=5
- sphinx_rtd_theme
# Python packages needed for testing
- flake8<5.0 # github.com/ESMValGroup/ESMValCore/issues/1696
- mypy>=0.990
- pytest>=3.9,!=6.0.0rc1,!=6.0.0
- pytest-cov>=2.10.1
- pytest-env
- pytest-html!=2.1.0
- pytest-metadata>=1.5.1
- pytest-mypy
- pytest-mock
- pytest-xdist
# Not on conda-forge - ESMValTool_sample_data==0.0.3
# Still for testing, MyPy library stubs
- types-requests
- types-pkg_resources
- types-PyYAML
# Python packages needed for installing in development mode
- codespell
- docformatter
- isort
- pre-commit
- prospector!=1.1.6.3,!=1.1.6.4
# Not on conda forge - vprof
- yamllint
- yapf
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
],
# Documentation dependencies
'doc': [
'autodocsumm',
'sphinx>2',
'autodocsumm>=0.2.2',
'sphinx>5',
'sphinx_rtd_theme',
],
# Development dependencies
Expand Down