Skip to content

Commit

Permalink
Merge branch 'feature_tmp' into master_tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
nfb2021 authored Sep 18, 2024
2 parents 37d26d1 + 5ee1ed5 commit 89e7ec0
Show file tree
Hide file tree
Showing 28 changed files with 4,058 additions and 235 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ MANIFEST
# tests/test_data
tests/test_data/old
tests/test_results
tests/test_qa4sm_data

# personal testing stuff
test.py
Expand All @@ -71,3 +72,5 @@ tests/test_data/out/*
*/_local_scripts/*
.coverage*
.artifacts/*
.vscode
.logs
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
graft src/qa4sm_reader/static
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ dependencies:
- pygeogrids
- pytest
- pytest-cov
- pytesmo
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install_requires =
parse
scipy
pygeogrids
pytesmo
# The usage of test_requires is discouraged, see `Dependency Management` docs
# tests_require = pytest; pytest-cov
# Require a specific Python version, e.g. Python 2.7 or >= 3.4
Expand Down
4 changes: 2 additions & 2 deletions src/qa4sm_reader/comparing.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class QA4SMComparison:
take some time, the class can be updated keeping memory of what has already been initialized
"""
def __init__(self,
paths: list or str,
paths: Union[list, str],
extent: tuple = None,
get_intersection: bool = True):
get_intersection: bool = True) -> None:
"""
Initialise the QA4SMImages from the paths to netCDF files specified
Expand Down
92 changes: 92 additions & 0 deletions src/qa4sm_reader/custom_intra_annual_windows_example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"seasons": {
"S1": [
[12, 1],
[2, 28]
],
"S2": [
[3, 1],
[5, 31]
],
"S3": [
[6, 1],
[8, 31]
],
"S4": [
[9, 1],
[11, 30]
]
},
"months": {
"Jan": [
[1, 1],
[1, 31]
],
"Feb": [
[2, 1],
[2, 28]
],
"Mar": [
[3, 1],
[3, 31]
],
"Apr": [
[4, 1],
[4, 30]
],
"May": [
[5, 1],
[5, 31]
],
"Jun": [
[6, 1],
[6, 30]
],
"Jul": [
[7, 1],
[7, 31]
],
"Aug": [
[8, 1],
[8, 31]
],
"Sep": [
[9, 1],
[9, 30]
],
"Oct": [
[10, 1],
[10, 31]
],
"Nov": [
[11, 1],
[11, 30]
],
"Dec": [
[12, 1],
[12, 31]
]
},
"custom": {
"star wars month": [
[5, 1],
[5, 31]
],
"halloween season": [
[10, 1],
[10, 31]
],
"advent": [
[12, 1],
[12, 24]
],
"movember": [
[11, 1],
[11, 30]
],
"christmas": [
[12, 24],
[12, 26]
]
}
}
Loading

0 comments on commit 89e7ec0

Please sign in to comment.