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.

Sign up for GitHub

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

Checks in readers/writers to enforce correct types for event_name and event_id container and elements #951

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Checks in readers/writers to enforce correct types for event_name and event_id container and elements #951

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b2fdbd6
update Impact reader(writer) to warn(fail) if event_name not all str
Sep 25, 2024
09a0ee0
Renames dfr to imp_df for consistency with from_csv()
Sep 25, 2024
cafeb7c
implements a checker/caster methods
Sep 26, 2024
87ad969
updates test to comply with new checks
Sep 26, 2024
82f6421
correct column access style
Sep 26, 2024
bc86758
Merge branch 'develop' into feature/event_name_handling
Sep 26, 2024
822c7f1
format
emanuel-schmid Oct 20, 2024
1b78bdf
import Impact from climada.engine.impact
emanuel-schmid Oct 20, 2024
87cb6fd
avoid circular imports
emanuel-schmid Oct 20, 2024
b9be992
Merge branch 'develop' into develop-black
emanuel-schmid Oct 20, 2024
5143b99
pre-commit run --all-files
emanuel-schmid Oct 20, 2024
bc60010
setup: DEPS_TEST update
emanuel-schmid Oct 20, 2024
3c5fc8f
avoid circular imports
emanuel-schmid Oct 20, 2024
aa0615f
Merge branch 'develop-white' of https://github.com/CLIMADA-project/cl…
emanuel-schmid Oct 20, 2024
dcbe2c5
format exceptions
emanuel-schmid Oct 21, 2024
5ecb3c0
Merge remote-tracking branch 'origin/develop-white' into feature/even…
Oct 23, 2024
ca71118
applied black to branch
Oct 23, 2024
77113f1
Merge branch 'develop-black' into feature/event_name_handling
Oct 23, 2024
d080fef
merge develop into branch
Oct 23, 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 climada/engine/cost_benefit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from tabulate import tabulate

from climada.engine.impact_calc import ImpactCalc
from climada.engine import Impact, ImpactFreqCurve
from climada.engine.impact import Impact, ImpactFreqCurve

LOGGER = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion climada/engine/impact_calc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import geopandas as gpd

from climada import CONFIG
from climada.engine import Impact
from climada.engine.impact import Impact

LOGGER = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion climada/engine/unsequa/calc_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import numpy as np

from climada.util.value_representation import sig_dig as u_sig_dig
from climada.engine.unsequa import UncOutput
from climada.engine.unsequa.unc_output import UncOutput

LOGGER = logging.getLogger(__name__)

Expand Down
6 changes: 3 additions & 3 deletions climada/engine/unsequa/calc_cost_benefit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@

from typing import Optional, Union
import pandas as pd
import numpy as np
import pathos.multiprocessing as mp
# use pathos.multiprocess fork of multiprocessing for compatibility
# wiht notebooks and other environments https://stackoverflow.com/a/65001152/12454103

from climada.engine.cost_benefit import CostBenefit
from climada.engine.unsequa import Calc, InputVar, UncCostBenefitOutput
from climada.engine.unsequa.calc_base import _sample_parallel_iterator, _multiprocess_chunksize, _transpose_chunked_data
from climada.engine.unsequa.input_var import InputVar
from climada.engine.unsequa.unc_output import UncCostBenefitOutput
from climada.engine.unsequa.calc_base import Calc, _sample_parallel_iterator, _multiprocess_chunksize, _transpose_chunked_data
from climada.util import log_level
from climada.hazard import Hazard
from climada.entity import Entity
Expand Down
4 changes: 3 additions & 1 deletion climada/engine/unsequa/calc_delta_climate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@
# wiht notebooks and other environments https://stackoverflow.com/a/65001152/12454103

from climada.engine import ImpactCalc
from climada.engine.unsequa import Calc, InputVar, UncImpactOutput
from climada.engine.unsequa.input_var import InputVar
from climada.engine.unsequa.unc_output import UncImpactOutput
from climada.engine.unsequa.calc_base import (
Calc,
_sample_parallel_iterator,
_multiprocess_chunksize,
_transpose_chunked_data,
Expand Down
4 changes: 3 additions & 1 deletion climada/engine/unsequa/calc_impact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
# wiht notebooks and other environments https://stackoverflow.com/a/65001152/12454103

from climada.engine import ImpactCalc
from climada.engine.unsequa import Calc, InputVar, UncImpactOutput
from climada.engine.unsequa.input_var import InputVar
from climada.engine.unsequa.unc_output import UncImpactOutput
from climada.engine.unsequa.calc_base import (
Calc,
_sample_parallel_iterator,
_multiprocess_chunksize,
_transpose_chunked_data,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
DEPS_TEST = [
"ipython",
"mccabe>=0.6",
"pylint==2.7.1",
"pylint>=3.0",
"pytest",
"pytest-cov",
"pytest-subtests",
Expand Down