Skip to content

Commit

Permalink
Merge branch 'master' into feature-tdating-split-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ritvje committed Jul 17, 2024
2 parents 25209c2 + 953f799 commit d41dacd
Show file tree
Hide file tree
Showing 27 changed files with 1,849 additions and 924 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check_black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
id-token: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
29 changes: 21 additions & 8 deletions .github/workflows/test_pysteps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,25 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install mamba and create environment
# need headless opencv on Linux, see https://github.com/conda-forge/opencv-feedstock/issues/401
- name: Install mamba and create environment for Linux
if: matrix.os == 'ubuntu-latest'
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ci/ci_test_env.yml
environment-name: test_environment
generate-run-shell: false
create-args: >-
python=${{ matrix.python-version }}
libopencv=*=headless*
- name: Install mamba and create environment (not Linux)
if: matrix.os != 'ubuntu-latest'
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ci/ci_test_env.yml
Expand All @@ -49,14 +62,14 @@ jobs:
if: matrix.os == 'macos-latest'
working-directory: ${{github.workspace}}
env:
CC: gcc-9
CXX: g++-9
CXX1X: g++-9
CC: gcc-13
CXX: g++-13
CXX1X: g++-13
HOMEBREW_NO_INSTALL_CLEANUP: 1
run: |
brew update-reset
brew update
gcc-9 --version || brew install gcc@9
gcc-13 --version || brew install gcc@13
pip install .
- name: Install pysteps
Expand Down Expand Up @@ -87,7 +100,7 @@ jobs:

- name: Upload coverage to Codecov (Linux only)
if: matrix.os == 'ubuntu-latest'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 22.6.0
rev: 24.3.0
hooks:
- id: black
language_version: python3
2 changes: 1 addition & 1 deletion PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: pysteps
Version: 1.8.1
Version: 1.10.0
Summary: Python framework for short-term ensemble prediction systems
Home-page: http://pypi.python.org/pypi/pysteps/
License: LICENSE
Expand Down
11 changes: 1 addition & 10 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pysteps - Python framework for short-term ensemble prediction systems
* - package
- |github| |conda| |pypi| |zenodo|
* - community
- |slack| |contributors| |downloads| |license|
- |contributors| |downloads| |license|


.. |docs| image:: https://readthedocs.org/projects/pysteps/badge/?version=latest
Expand Down Expand Up @@ -49,10 +49,6 @@ pysteps - Python framework for short-term ensemble prediction systems
:alt: License
:target: https://opensource.org/licenses/BSD-3-Clause

.. |slack| image:: https://pysteps-slackin.herokuapp.com/badge.svg
:alt: Slack invitation page
:target: https://pysteps-slackin.herokuapp.com/

.. |contributors| image:: https://img.shields.io/github/contributors/pySTEPS/pysteps
:alt: GitHub contributors
:target: https://github.com/pySTEPS/pysteps/graphs/contributors
Expand Down Expand Up @@ -129,11 +125,6 @@ For feedback, suggestions for developments, and bug reports please use the dedic

For more information, please read our `contributors guidelines <https://pysteps.readthedocs.io/en/stable/developer_guide/contributors_guidelines.html>`_.

Get in touch
============

You can get in touch with the pysteps community on our `pysteps slack <https://pysteps.slack.com/>`_.
To get access to it, you need to ask for an invitation or you can use this `automatic invitation page <https://pysteps-slackin.herokuapp.com/>`_.

Reference publications
======================
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def get_version():
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
22 changes: 22 additions & 0 deletions doc/source/references.bib
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@ @ARTICLE{CRS2004
DOI = "10.1017/S1350482704001239"
}

@ARTICLE{DOnofrio2014,
TITLE = "Stochastic rainfall downscaling of climate models",
AUTHOR = "D'Onofrio, D and Palazzi, E and von Hardenberg, J and Provenzale, A and Calmanti, S",
JOURNAL = "J. Hydrometeorol.",
PUVLISHER = "American Meteorological Society",
VOLUME = 15,
NUMBER = 2,
PAGES = "830--843",
YEAR = 2014,
}

@ARTICLE{EWWM2013,
AUTHOR = "E. Ebert and L. Wilson and A. Weigel and M. Mittermaier and P. Nurmi and P. Gill and M. Göber and S. Joslyn and B. Brown and T. Fowler and A. Watkins",
TITLE = "Progress and challenges in forecast verification",
Expand Down Expand Up @@ -306,6 +317,17 @@ @ARTICLE{SPN2013
DOI = "10.1002/wrcr.20536"
}

@Article{Terzago2018,
AUTHOR = "Terzago, S. and Palazzi, E. and von Hardenberg, J.",
TITLE = "Stochastic downscaling of precipitation in complex orography: a simple method to reproduce a realistic fine-scale climatology",
JOURNAL = "Natural Hazards and Earth System Sciences",
VOLUME = 18,
YEAR = 2018,
NUMBER = 11,
PAGES = "2825--2840",
DOI = "10.5194/nhess-18-2825-2018"
}

@ARTICLE{TRT2004,
AUTHOR = "A. M. Hering and C. Morel and G. Galli and P. Ambrosetti and M. Boscacci",
TITLE = "Nowcasting thunderstorms in the Alpine Region using a radar based adaptive thresholding scheme",
Expand Down
10 changes: 5 additions & 5 deletions doc/source/user_guide/install_pysteps.rst
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ To make sure that the installer uses the homebrew's gcc, export the
following environmental variables in the terminal
(supposing that gcc version 8 was installed)::

export CC=gcc-8
export CXX=g++-8
export CC=gcc-13
export CXX=g++-13

First, check that the homebrew's gcc is detected::

which gcc-8
which gcc-13

This should point to the homebrew's gcc installation.

Expand All @@ -162,8 +162,8 @@ gcc executables under /usr/local/bin.
If that is the case, specify the CC and CCX variables using the full path to
the homebrew installation. For example::

export CC=/usr/local/Cellar/gcc/8.3.0/bin/gcc-8
export CXX=/usr/local/Cellar/gcc/8.3.0/bin/g++-8
export CC=/usr/local/Cellar/gcc/13.2.0/bin/gcc-13
export CXX=/usr/local/Cellar/gcc/13.2.0/bin/g++-13

Then, you can continue with the normal installation procedure described next.

Expand Down
2 changes: 1 addition & 1 deletion examples/optical_flow_methods_convergence.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import matplotlib.pyplot as plt
import numpy as np
from matplotlib.cm import get_cmap
from matplotlib.pyplot import get_cmap
from scipy.ndimage import uniform_filter

import pysteps as stp
Expand Down
Loading

0 comments on commit d41dacd

Please sign in to comment.