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

Icon support #11

Merged
merged 36 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2fadef5
init branch icon_suppoert
Nov 29, 2023
6840518
ICON support of update_phenology_realtime
Dec 12, 2023
b95e4d9
Bug correction
Dec 12, 2023
32e3804
ICON support of update_strength_realtime
Dec 29, 2023
9cdaa9c
Support of advancing calibrated fields by 1 hour
Feb 13, 2024
f255df7
Reorganisation of input files
Feb 14, 2024
9afd616
update to latest blueprint
twicki Feb 15, 2024
72dd884
pop some stashes
twicki Feb 15, 2024
d38fa5e
test
twicki Feb 15, 2024
1d0eaa7
pre-commit cleanup
twicki Feb 15, 2024
a46d1d4
minor cleanup
twicki Feb 15, 2024
d213dd8
Merge commit 'a46d1d4443793a8045c84f91b90a1e19b019f225' into icon_sup…
twicki Feb 15, 2024
4834117
add run file
twicki Feb 27, 2024
23dd1b3
Command line interface support
Feb 29, 2024
f8d4f0f
reorganisation of code, setup and config, cleanup
May 14, 2024
a5e37aa
Small bug fixes
May 16, 2024
bbb4869
Deleted files: obsolete files after ICON support
May 16, 2024
5d0c9c9
improved code (solve pre-commit errors)
May 16, 2024
5b38dfe
Solve pre-commit errors not present locally but on github
May 16, 2024
96df752
editorial update
May 22, 2024
0342316
integraton of reviewer comments
May 30, 2024
f7e4ffe
editorial change needed for codespell hook on github
May 30, 2024
8381959
update for pre-commit
May 30, 2024
848fd8f
update for pre-commit on github
May 30, 2024
51d97a5
updates for hooks on Github
May 30, 2024
efab2b0
Editorial update
Jun 24, 2024
e54cb60
add extraction scripts in tools/
Jun 24, 2024
2a1d4d6
editorial changes to tools/extract_pollen_measured.sh
Jun 24, 2024
7b694ef
Revise tests (#12)
DanielLeuenberger Jun 26, 2024
dfd57ba
fix variable in get_data.sh
Jun 26, 2024
81ebcb7
rename test script,scp testdata and update README (#13)
DanielLeuenberger Aug 15, 2024
1a63380
change T_2M test data to 12UTC and document this in README.md
Aug 15, 2024
31ef83f
remove whitespaces in README.md
Aug 15, 2024
1222b27
save log information and tell the user (#16)
andreaspauling Aug 19, 2024
4d52ffe
Satisfy pre-commit reqs
Aug 19, 2024
7fd1801
improved error handling for missing data and log information (#18)
andreaspauling Aug 28, 2024
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
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v0.2.0-13-g19dcd4a
_commit: 53f21b5
_src_path: git@github.com:MeteoSwiss-APN/mch-python-blueprint.git
email: simon.adamov@meteoswiss.ch
full_name: Simon Adamov
Expand Down
112 changes: 1 addition & 111 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,115 +1,5 @@
# Byte-compiled / optimized / DLL files
# Byte-compiled
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
env-dev/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# dotenv
.env

# virtualenv
.venv
.venvs
venv/
venvs/
venv_*/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/

# Eclipse
.project

# VS Code
.vscode
*.idx
data/fieldextra.diagnostic
data/grib2_files_cosmo1e/laf2022021314_ALNUtthrs_tthre.923a8.idx
data/202202*
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Simon Adamov <simon.adamov@meteoswiss.ch>
- Guillaume van Parys
- Andreas Pauling <andreas.pauling@meteoswiss.ch>

## Contributors

Expand Down
28 changes: 9 additions & 19 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ You can contribute in many ways.

### Report Bugs

Report bugs as [GitHub issues](https://github.com/MeteoSwiss-APN/realtime-pollen-calibration/issues).
Report bugs as [GitHub issues](https://github.com/MeteoSwiss/realtime_pollen_calibration/issues).

If you are reporting a bug, please include

Expand All @@ -18,19 +18,19 @@ If you are reporting a bug, please include

### Fix Bugs

Look through the [GitHub issues](https://github.com/MeteoSwiss-APN/realtime-pollen-calibration/issues) for bugs. Anything tagged with "bug" and "help wanted" is open to whoever wants to implement it.
Look through the [GitHub issues](https://github.com/MeteoSwiss/realtime_pollen_calibration/issues) for bugs. Anything tagged with "bug" and "help wanted" is open to whoever wants to implement it.

### Implement Features

Look through the [GitHub issues](https://github.com/MeteoSwiss-APN/realtime-pollen-calibration/issues) for features. Anything tagged with "enhancement" and "help wanted" is open to whoever wants to implement it.
Look through the [GitHub issues](https://github.com/MeteoSwiss/realtime_pollen_calibration/issues) for features. Anything tagged with "enhancement" and "help wanted" is open to whoever wants to implement it.

### Write Documentation

Realtime Pollen Calibration could always use more documentation, whether as part of the official Realtime Pollen Calibration docs, in docstrings --- or even on the web in blog posts, articles, and such.

### Submit Feedback

The best way to send feedback is to file a [GitHub issue]( https://github.com/MeteoSwiss-APN/realtime-pollen-calibration/issues).
The best way to send feedback is to file a [GitHub issue](https://github.com/MeteoSwiss/realtime_pollen_calibration/issues).

If you are proposing a feature,

Expand All @@ -42,7 +42,7 @@ If you are proposing a feature,

Ready to contribute? Here's how to set up `realtime-pollen-calibration` for local development.

1. Fork the [`realtime-pollen-calibration` repo](https://github.com/ on GitHub.
1. Fork the [`realtime-pollen-calibration` repo](https://github.com/) on GitHub.
2. Clone your fork locally:

```bash
Expand All @@ -56,15 +56,13 @@ Ready to contribute? Here's how to set up `realtime-pollen-calibration` for loca
./tools/setup_env.sh
```

This will create a conda environment named `realtime-pollen-calibration` (change with `-n`) and install the following:
This will create a conda environment named `realtime-pollen-calibration` (change with `-n`) and install the pinned runtime and development dependencies in `requirements/environment.yml`.

- Pinned runtime and development dependencies in `requirements/environment.yml`
- The `realtime-pollen-calibration` package itself in editable mode.

Activate the environment:
Install the package itself in editable mode.

```bash
conda activate realtime-pollen-calibration
pip install --editable .
```

Use `-u` to get the newest package versions (unpinned dependencies in `requirements/requirements.yml`), and additionally `-e` to update the environment files.
Expand Down Expand Up @@ -105,7 +103,7 @@ Before you submit a pull request, check that it meets these guidelines:

1. The pull request should include tests.
2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in `README.md`.
3. The pull request should work for Python 3.6 and 3.7, and for PyPy. Make sure that the tests pass for all supported Python versions.
3. The pull request should work for Python 3.9, and for PyPy. Make sure that the tests pass for all supported Python versions.

## Tips

Expand Down Expand Up @@ -175,11 +173,3 @@ Alternatively, use the provided script
to create a environment from unpinned (`-u`) runtime and development dependencies and export (`-e`) it (consider throwing in `-m` for good measure to speed things up with `mamba`).

_Note that the separation of unpinned runtime and development dependencies into separate files (`requirements.yml` and `dev-requirements.yml`, respectively) has been given up because when creating an environment from multiple YAML files (with `conda env create` and `conda env update`), only the version restrictions in the last file are guaranteed to be respected, so when installing devevelopment dependencies from `dev-requirements.yml` into an environment created from `requirements.yml`, the solver does not take version restrictions in the latter file into account anymore, potentially resulting in inconsistent production and development environments. Given the negligible overhead (in terms of memory etc.) of installing development dependencies in production environments, they are only separated from the runtime dependencies in `requirements.yml` by a comment._

## How to provide executable scripts

By default, a single executable script called realtime-pollen-calibration is provided. It is created when the package is installed. When you call it, the main function (`cli`) in `src/realtime_pollen_calibration/cli.py` is called.

When the package is installed, a executable script named `realtime-pollen-calibration` is created in the bin folder of the active conda environment. Upon calling this script in the shell, the `main` function in `src/realtime_pollen_calibration/cli.py` is executed.

The scripts, their names and entry points are specified in `pyproject.toml` in the `[project.scripts]` section. Just add additional entries to provide more scripts to the users of your package.
3 changes: 3 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
## 0.1.0 (2022-XX-XX)

- First release on PyPI.

## 0.2.0 (2024-05-15)
- ICON support
Loading
Loading