Skip to content
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.

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

New overlapping criteria, fluffiness, and prm cleanup #86

Merged
merged 62 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
92de698
Improve docstring example
fpavogt Oct 18, 2022
a420e67
Change OKTA_LIM8 from 98 to 99 following large scale tests by @loforest
fpavogt Oct 18, 2022
ff678ab
Fix #85
fpavogt Oct 18, 2022
9d7c8b2
Use min/max+padding to assess slices overlap
fpavogt Oct 18, 2022
418faff
Add new scientific validation cases
fpavogt Oct 18, 2022
56287ea
Cleanup log messages
fpavogt Oct 18, 2022
509b883
Enable multiple min_sep_vals for the LAYERING step
fpavogt Oct 18, 2022
ed6f345
Introduce BASE_LVL_ALT_PERC and BASE_LVL_LOOKBACK_PERC
fpavogt Oct 18, 2022
7161cf7
CHange GROUPING affinity to euclidean
fpavogt Oct 19, 2022
108cf6f
Compute the fluffiness of cloud layers
fpavogt Oct 19, 2022
2e7634b
Boost version to v0.6.0.dev0
fpavogt Oct 19, 2022
3771d31
Fix pylint error
fpavogt Oct 19, 2022
b1db48d
Add scipy to required dependencies
fpavogt Oct 19, 2022
cac6ac0
Fix #90
fpavogt Oct 19, 2022
0524ee3
Add new fluffer module to compute fluffiness via LOWESSS
fpavogt Oct 20, 2022
628f981
Deploy new LOWESS fluffiness to GROUPING step
fpavogt Oct 20, 2022
2f41357
Adjust scientific validation examples to new fluffiness scheme
fpavogt Oct 20, 2022
c350352
Remove superfluous parameters from config file
fpavogt Oct 20, 2022
a4b57de
Fix #87
fpavogt Oct 20, 2022
3797754
Fix docstrings
fpavogt Oct 20, 2022
caa926a
Make doc building immune to FutureWarnings
fpavogt Oct 20, 2022
4dd631c
Make docs_check robust to FutureWarnings
fpavogt Oct 20, 2022
6806c18
Make doc_check immune to FutureWarning (*for real)
fpavogt Oct 20, 2022
1c8d9f6
Try to fix the pandas FutureWarning instead of hidding it ...
fpavogt Oct 20, 2022
d45e1f2
Cleanup docs
fpavogt Oct 20, 2022
4830140
Integrated the fluffiness boost into get_fluffiness()
fpavogt Oct 21, 2022
7983e02
Update set of scientific validation cases to match the article examples
fpavogt Oct 21, 2022
3b3f93b
Clarify prms doc
fpavogt Oct 24, 2022
76d0db5
Fix #92
fpavogt Dec 16, 2022
922bf06
Set min version of scikit-learn to 1.2.0
fpavogt Dec 16, 2022
663d4e1
Address review from @pjuda
fpavogt Jan 13, 2023
8cdcd39
Use packaging instead of pkg_resources (fixes #98)
fpavogt Jul 3, 2023
a004088
Update CHANGELOG
fpavogt Jul 7, 2023
fd1ec5a
Replace .pkl with .csv for test datasets
fpavogt Jul 7, 2023
432c356
Adjust tests to ingest csv instead of pkl
fpavogt Jul 7, 2023
00cf753
Fix #95 ?
fpavogt Jul 7, 2023
9aa33f0
Fix #95 ??
fpavogt Jul 7, 2023
d3adf85
Misc. pylint cleanup
fpavogt Jul 7, 2023
6282346
Adjust CI/CD python version to 3.10
fpavogt Jul 7, 2023
b8361d8
Update copyright years
fpavogt Jul 7, 2023
d4e2a96
Add new test for JIRA-527
fpavogt Jul 7, 2023
8521cbf
Handle numpy FutureWarning about ndim-0 conversion
fpavogt Jul 12, 2023
cb82df8
Update copyright years
fpavogt Jul 12, 2023
b0a14d8
Add new weekly pytest action
fpavogt Jul 12, 2023
c69dd25
Drop tests for python 3.8 and trigger them for 3.11
fpavogt Jul 12, 2023
115ad6f
Fix action typo
fpavogt Jul 12, 2023
8e2d95a
Try to get action to run ...
fpavogt Jul 12, 2023
fe6285f
Update setup actions
fpavogt Jul 12, 2023
7d1a194
Try auto trigger on the same branch
fpavogt Jul 12, 2023
dcfb826
Setup proper values
fpavogt Jul 12, 2023
0257395
Fix typos in Actions
fpavogt Jul 12, 2023
0ff3ea0
Update Issue forms to YAML format (Fix #93)
fpavogt Jul 13, 2023
80847a7
Cleanup docs
fpavogt Jul 13, 2023
cbc89ab
Adjust Pandas indexing approach
fpavogt Jul 19, 2023
6762174
Merge pull request #101 from MeteoSwiss/pandas2x_etal
fpavogt Jul 19, 2023
f0d8e85
Correct syntax of new Issue templates
fpavogt Jul 24, 2023
be7497b
Make the speed_check action more verbose
fpavogt Jul 25, 2023
719c0b9
pylint minor cleanup
fpavogt Jul 25, 2023
1f3c6a7
Require layers to be 250ft appart to split a group
fpavogt Jul 26, 2023
103e268
Fix Issue 18
fpavogt Aug 11, 2023
6ad665f
Adjust the min matplotlib version
fpavogt Aug 11, 2023
5395c48
Merge pull request #104 from MeteoSwiss/fix18
fpavogt Oct 2, 2023
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
30 changes: 0 additions & 30 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

71 changes: 71 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Bug Report
description: Create a bug report to help us improve ampycloud
title: "[Bug]: "
labels: ["triage"]
body:
- type: checkboxes
attributes:
label: Is there already an issue for this?
description: Look at the [open](https://github.com/MeteoSwiss/ampycloud/issues) and [closed](https://github.com/MeteoSwiss/ampycloud/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+) issues.
options:
- label: I found no existing issue for this bug.
validations:
required: true
- type: textarea
id: description
attributes:
label: Describe the bug
description: Tell us what happened and (if applicable) what you expected.
placeholder: Describe the bug
value: "A clear and concise description of what happened."
validations:
required: true
- type: textarea
attributes:
label: Screenshot
description: |
If applicable, attach the ampycloud diagnostic plot by clicking this area to highlight it and then dragging the file in.
validations:
required: false
- type: textarea
attributes:
label: Steps to reproduce
description: Steps to reproduce the bug.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: false
- type: textarea
id: logs
attributes:
label: Relevant log output
description: |
Copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
See the [ampycloud documentation](https://meteoswiss.github.io/ampycloud/running.html#logging) for instructions on how to enable logging.
render: shell
- type: textarea
attributes:
label: Environment
description: |
examples:
- **OS**: Ubuntu 20.04
- **Python**: 3.11.1
- **ampycloud**: 0.6.0dev0
value: |
- OS:
- Python:
- ampycloud:
render: markdown
validations:
required: false
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/MeteoSwiss/ampycloud/blob/develop/CODE_OF_CONDUCT.md).
options:
- label: I agree to follow the ampycloud Code of Conduct.
required: true
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/todo.md

This file was deleted.

20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/todo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: New Feature
description: Keep track of an (approved) new feature of ampycloud
title: "[New Feature]: "
labels: ["todo"]
body:
- type: markdown
attributes:
value: |
This is to keep track of **dev-approved** changes.

To **suggest** a new feature instead, head over to the [ampycloud Github Discussions page](https://github.com/MeteoSwiss/ampycloud/discussions).

- type: textarea
id: description
attributes:
label: Describe the new feature
placeholder: Describe the feature
value: "A clear and concise description of what should be added to || modified in || removed from ampycloud."
validations:
required: true
8 changes: 4 additions & 4 deletions .github/workflows/CI_check_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# 10.0.1, 10.0.2.dev0 is valid
# 10.0, 10, is NOT valid !
#
# Copyright (c) 2022 fpavogt; frederic.vogt@meteoswiss.ch
# Copyright (c) 2022-2023 fpavogt; frederic.vogt@meteoswiss.ch

name: CI_check_version

Expand All @@ -21,12 +21,12 @@ jobs:
steps:

- name: Checkout current repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'

- name: Install dependancies
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/CI_docs_build_and_check.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2021 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch
# Copyright (c) 2020-2023 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch

name: CI_docs_check

Expand All @@ -16,16 +16,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.8']
python-version: ['3.11']

steps:
# Checkout our repository
- name: Checkout current repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Set up Python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/CI_docs_build_and_publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2021 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch
# Copyright (c) 2020-2023 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch
#
# This will build the docs and push them to the gh-pages branch of the repo
# Assumes a few things: 1) docs live in ./docs; 2) there is a doc_build.sh bash script that takes
Expand All @@ -23,16 +23,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: [3.9]
python-version: ['3.11']

steps:
# Checkout our repository
- name: Checkout current repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Also check out the live docs, placing it into a pseudo "build" folder for the docs
- name: Checkout live docs
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: MeteoSwiss/ampycloud
ref: gh-pages
Expand All @@ -51,7 +51,7 @@ jobs:

# Set up Python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/CI_pylinter.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Inspired from: https://github.com/PyCQA/pylint/pull/2758#issuecomment-561164761
#
# Copyright (c) 2020-2021 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch
# Copyright (c) 2020-2023 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch

name: CI_pylinter

Expand All @@ -18,16 +18,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.10']
python-version: ['3.11']

steps:
# Checkout our repository
- name: Checkout current repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Set up Python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/CI_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# It will trigger the moment a new release or pre-release is being published.
#
# Copyright (c) 2022 fpavogt; frederic.vogt@meteoswiss.ch
# Copyright (c) 2022-2023 fpavogt; frederic.vogt@meteoswiss.ch

name: CI_pypi

Expand All @@ -19,12 +19,12 @@ jobs:
steps:

- name: Checkout current repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'

- name: Install dependancies
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/CI_pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
# Adapted from: https://github.com/actions/starter-workflows/blob/master/ci/python-package.yml
#
# Copyright (c) 2020-2021 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch
# Copyright (c) 2020-2023 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch

name: CI_pytest

Expand All @@ -21,16 +21,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.9', '3.10', '3.11']

steps:
# Checkout the repository
- name: Checkout current repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Setup python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand Down
70 changes: 70 additions & 0 deletions .github/workflows/CI_pytest_weekly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# This workflow will install Python dependencies and run tests with a variety of Python
# versions, with a trigger based on specific schedule. For more information see:
# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
#
# Adapted from: https://github.com/actions/starter-workflows/blob/master/ci/python-package.yml
#
# Copyright (c) 2020-2023 MeteoSwiss, created by F.P.A. Vogt; frederic.vogt@meteoswiss.ch

name: CI_pytest_weekly

on:
schedule:
- cron: '43 21 * * 1,4' # Run at 21:43 UTC every Monday and Thursday

jobs:
pytest:

runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
#python-version: # Use the latest Python version available for this test.

steps:
# Checkout the master branch from the repository
# The idea for this Action is to spot issues with new dependency versions as soon as they
# are released (and not when we decide to update ampycloud).
- name: Checkout current repository
uses: actions/checkout@v3
with:
repository: MeteoSwiss/ampycloud
ref: master

# Setup python
- name: Set up Python
uses: actions/setup-python@v4
#with:
# python-version: ${{ matrix.python-version }}

# Check the python/conda setup (can be useful to diagnose bug with this Action)
# Powershell syntax adapted from:
# https://stackoverflow.com/questions/63805/equivalent-of-nix-which-command-in-powershell
# Answer from: petrsnd
- name: Check the setup (I)
if: matrix.os == 'windows-latest'
run: |
Get-Command python | Select-Object -ExpandProperty Definition
echo $CONDA

- name: Check the setup (II)
if: matrix.os != 'windows-latest'
run: |
which python
which conda

# Install all the dependencies we require
- name: Install dependencies
run: |
python -m pip install --upgrade pip

# Here, let's install our module to make sure all the dependencies specified in setup.py are
# also installed
- name: Install our module
run: pip install -e .[dev]

# Read to run all the tests !
- name: Run pytest
run: |
pytest -s
Loading