Skip to content

Commit

Permalink
Merge pull request #686 from metno/fix-ci
Browse files Browse the repository at this point in the history
fix Cartopy build on CI
  • Loading branch information
lewisblake authored Jun 23, 2022
2 parents c28a9be + ec6c2ef commit da26731
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ This will install the latest released version of pyaerocom and its depencencies.

# install pyaerocom on machines with Proj8 or newer
# e.g. Ubuntu 22.04 LTS (Jammy Jellyfish)
python3 -m pip install pyaerocom[proj8]
python3 -m pip install --use-deprecated=legacy-resolver pyaerocom[proj8]

# install pyaerocom on machiles with an older version of Proj
# e.g. Ubuntu 20.04 LTS (Focal Fossa)
python3 -m pip install pyaerocom[proj-legacy]
python3 -m pip install --use-deprecated=legacy-resolver pyaerocom[proj-legacy]

Or into a new virtual environment (recommended) named *.venv* via::

Expand All @@ -42,11 +42,11 @@ Or into a new virtual environment (recommended) named *.venv* via::

# install pyaerocom on machines with Proj8 or newer
# e.g. Ubuntu 22.04 LTS (Jammy Jellyfish)
pip install pyaerocom[proj8]
pip install --use-deprecated=legacy-resolver pyaerocom[proj8]

# install pyaerocom on machiles with an older version of Proj
# e.g. Ubuntu 20.04 LTS (Focal Fossa)
pip install pyaerocom[proj-legacy]
pip install --use-deprecated=legacy-resolver pyaerocom[proj-legacy]


Install from source into a conda environment
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ filterwarnings = [
'ignore::FutureWarning:^(?!pyaerocom|tests).*:',
# and not on this list
"ignore:.*please install Basemap:UserWarning:geonum.*:",
"ignore:Using DEFAULT_SPHERICAL_EARTH_RADIUS:UserWarning:iris.*:"
"ignore:Using DEFAULT_SPHERICAL_EARTH_RADIUS:UserWarning:iris.*:",
]

[tool.coverage.run]
Expand Down Expand Up @@ -106,6 +106,8 @@ requires =
setuptools<=60.9.3
[testenv]
install_command =
python -m pip install {opts} {packages} --use-deprecated=legacy-resolver
commands_pre =
python --version
commands =
Expand All @@ -124,9 +126,6 @@ deps =
ignore_outcome = True
commands =
mypy pyaerocom/
#pylint pyaerocom/
#pycodestyle pyaerocom/
#pydocstyle pyaerocom/
extras =
proj-legacy
lint
Expand Down

0 comments on commit da26731

Please sign in to comment.