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

Update master to pyet 1.3 #69

Merged
merged 61 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
0463a5d
Update version.py
mvremec Dec 12, 2022
b2d88a2
Added example with CMIP6 data from Copernicus
mvremec Dec 15, 2022
d8c8687
Updated Penman and added Penman openwater example
mvremec Dec 17, 2022
521a936
Update 00_example_paper.ipynb
mvremec Jan 9, 2023
56b6901
add method for Makkink evaporation same as KNMI
martinvonk Feb 22, 2023
e17e195
add tests for makkink_knmi
martinvonk Feb 22, 2023
d0817d4
update notes for makkink
martinvonk Feb 22, 2023
8173537
Merge pull request #49 from martinvonk/makkink_knmi
mvremec Feb 22, 2023
286a76d
Updated problem with extraterestrial radiation.
mvremec Feb 22, 2023
5ba7ca5
Major update
mvremec Feb 26, 2023
601fb62
Create ci-testing.yml
raoulcollenteur Dec 6, 2023
a213f7a
Update issue templates
raoulcollenteur Dec 6, 2023
3f1f4e1
Create CODE_OF_CONDUCT.md
raoulcollenteur Dec 6, 2023
76f36e2
Merge pull request #62 from pyet-org/Add-code-of-conduct
raoulcollenteur Dec 6, 2023
c049e73
Merge pull request #61 from pyet-org/Add-issue-templates
raoulcollenteur Dec 6, 2023
382328c
Update README.md
raoulcollenteur Dec 6, 2023
5218a3d
update examples
raoulcollenteur Dec 7, 2023
8369ca8
Update project files
raoulcollenteur Dec 7, 2023
4e3a4dc
Create pull_request_template.md
raoulcollenteur Dec 7, 2023
edcce2e
Create pull_request_template.md (#66)
raoulcollenteur Dec 7, 2023
b7dbd26
Update project files to new Python package standards (#65)
raoulcollenteur Dec 7, 2023
f61037a
Update README.md
raoulcollenteur Dec 7, 2023
2c1aa01
Start using Github Actions for CI (#56)
raoulcollenteur Dec 7, 2023
d4aca4a
Update README.md (#63)
raoulcollenteur Dec 7, 2023
57297e3
Update README.md
raoulcollenteur Dec 7, 2023
ece0e33
Update version.py
raoulcollenteur Dec 7, 2023
df00729
Merge branch 'dev' of https://github.com/pyet-org/pyet into dev
raoulcollenteur Dec 7, 2023
7fca11f
Create .readthedocs.yaml
raoulcollenteur Dec 7, 2023
b71c574
Move readtthedocs.yaml
raoulcollenteur Dec 7, 2023
d932f5e
Update pyproject.toml
raoulcollenteur Dec 7, 2023
70f8092
Update pyproject.toml
raoulcollenteur Dec 7, 2023
65145b2
make imports explicit
raoulcollenteur Dec 7, 2023
b2171bb
Added xarray tests
mvremec Jan 17, 2024
ce49d84
Added Poetry to ci-testing
mvremec Jan 24, 2024
787dd1b
Update ci-testing.yml
mvremec Jan 24, 2024
c045a32
Added requirements.txt
mvremec Jan 24, 2024
b1de25b
Delete test_temperature.py
mvremec Jan 24, 2024
cf19437
Updated examples
mvremec Feb 2, 2024
9673fa9
Explicitly import netcdf4 in example
raoulcollenteur Feb 14, 2024
54d7861
Update notebooks to run or give 'good' errors
raoulcollenteur Feb 14, 2024
31f663b
Update pyproject.toml
raoulcollenteur Feb 14, 2024
523014c
Update ci.yml
raoulcollenteur Feb 14, 2024
30f4941
Import MPL for RTD
raoulcollenteur Feb 14, 2024
76f2c67
Fix file paths readthedocs
raoulcollenteur Feb 14, 2024
a2bee56
cleanup some code
raoulcollenteur Feb 14, 2024
5236609
remove nblinks
raoulcollenteur Feb 14, 2024
645f203
fix docs
raoulcollenteur Feb 14, 2024
d41fbb4
Fix docs
raoulcollenteur Feb 14, 2024
6c3e166
Fix docs for other files
raoulcollenteur Feb 14, 2024
a5578d9
Fix docs and imports
raoulcollenteur Feb 14, 2024
94b6fd4
Update combination.py
raoulcollenteur Feb 14, 2024
c41fca0
fix imports
raoulcollenteur Feb 14, 2024
7b4d4b3
make method private
raoulcollenteur Feb 14, 2024
5654889
Move examples to docs folder
raoulcollenteur Feb 15, 2024
187fdb6
Update pyproject.toml
raoulcollenteur Feb 15, 2024
1a92633
Update index.rst
raoulcollenteur Feb 15, 2024
edbf71c
Update index.rst
raoulcollenteur Feb 15, 2024
ac4e76e
Update headers
raoulcollenteur Feb 15, 2024
325d802
Update README.md
raoulcollenteur Feb 15, 2024
e0521a8
run black and prepare for 1.3 release
raoulcollenteur Feb 15, 2024
941befd
Checked Examples/Updated Turc
mvremec Mar 14, 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
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
11 changes: 11 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Short Description
Add a short description describing the pull request (PR) here.

# Checklist before PR can be merged:
- [ ] closes issue #xxxx
- [ ] is documented
- [ ] Format code with [Black formatting](https://black.readthedocs.io)
- [ ] type hints for functions and methods
- [ ] tests added / passed
- [ ] Example Notebook (for new features)
- [ ] Remove output for all notebooks with changes
42 changes: 42 additions & 0 deletions .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python

name: Python package

on:
push:
branches: [ "master", "dev" ]
pull_request:
branches: [ "master", "dev" ]

jobs:
build:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
check-latest: true
cache: "pip"
cache-dependency-path: requirements.txt
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
pytest
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.9', '3.10', '3.11', '3.12',]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
32 changes: 32 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

build:
os: ubuntu-22.04
tools:
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Build documentation with MkDocs
#mkdocs:
# configuration: mkdocs.yml

# Optionally build your docs in additional formats such as PDF and ePub
#formats:
# - epub
# - pdf

# Optionally set the version of Python and requirements required to build your docs
python:
install:
- method: pip
path: .
extra_requirements:
- rtd
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"orcid": "0000-0002-2730-494X"
},
{
"affiliation": "University of Graz, Graz, Austria.",
"affiliation": "Eawag, Dübendorf, Switzerland.",
"name": "Raoul Collenteur",
"orcid": "0000-0001-7843-1538"
}
Expand Down
23 changes: 14 additions & 9 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,26 @@ authors:
- family-names: "Collenteur"
given-names: "Matevz"
orcid: "https://orcid.org/0000-0001-7843-1538"
title: "PyEt-a Python package to estimate potential and reference evapotranspiration"
version: 1.1.0
doi: https://doi.org/10.5194/egusphere-egu21-15008
date-released: 2021
- family-names: "Birk"
given-names: "Steffen"
orcid: "https://orcid.org/0000-0001-7474-3884"
title: "Technical note: Improved handling of potential evapotranspiration in hydrological studies with PyEt"
doi: https://doi.org/10.5194/hess-2022-417
date-released: 2023
url: "https://github.com/phydrus/pyet"
preferred-citation:
type: inproceedings
type: journal
authors:
- family-names: "Vremec"
given-names: "Matevz"
orcid: "https://orcid.org/0000-0002-2730-494X"
- family-names: "Collenteur"
given-names: "Matevz"
orcid: "https://orcid.org/0000-0001-7843-1538"
doi: "10.5194/egusphere-egu21-15008"
journal: "EGU General Assembly Conference Abstracts"
year: "2021"
title: "PyEt-a Python package to estimate potential and reference evapotranspiration"
- family-names: "Birk"
given-names: "Steffen"
orcid: "https://orcid.org/0000-0001-7474-3884"
doi: "https://doi.org/10.5194/hess-2022-417"
journal: "Hydrol. Earth Syst. Sci. Discuss. [preprint]"
year: "2023"
title: "Technical note: Improved handling of potential evapotranspiration in hydrological studies with PyEt"
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
@mvremec.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 phydrus
Copyright (c) 2023 phydrus

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading
Loading