From ea9c398472b4ca362aa66365c58c7a0b19d11fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <6774676+eumiro@users.noreply.github.com> Date: Sun, 6 Aug 2023 08:53:37 +0200 Subject: [PATCH] Lazify all() --- pvlib/modelchain.py | 2 +- pvlib/pvsystem.py | 10 ++++------ pvlib/tests/iotools/test_pvgis.py | 4 ++-- pvlib/tests/iotools/test_srml.py | 2 +- pvlib/tests/test_modelchain.py | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pvlib/modelchain.py b/pvlib/modelchain.py index 6d2366a256..78760d04ca 100644 --- a/pvlib/modelchain.py +++ b/pvlib/modelchain.py @@ -1984,7 +1984,7 @@ def _irrad_for_celltemp(total_irrad, effective_irradiance): """ if isinstance(total_irrad, tuple): - if all(['poa_global' in df for df in total_irrad]): + if all('poa_global' in df for df in total_irrad): return _tuple_from_dfs(total_irrad, 'poa_global') else: return effective_irradiance diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py index 50d73ab8a7..2e2e2121fd 100644 --- a/pvlib/pvsystem.py +++ b/pvlib/pvsystem.py @@ -1295,20 +1295,18 @@ def dc_ohms_from_percent(self): """ # get relevent Vmp and Imp parameters from CEC parameters - if all([elem in self.module_parameters - for elem in ['V_mp_ref', 'I_mp_ref']]): + if all(elem in self.module_parameters + for elem in ['V_mp_ref', 'I_mp_ref']): vmp_ref = self.module_parameters['V_mp_ref'] imp_ref = self.module_parameters['I_mp_ref'] # get relevant Vmp and Imp parameters from SAPM parameters - elif all([elem in self.module_parameters - for elem in ['Vmpo', 'Impo']]): + elif all(elem in self.module_parameters for elem in ['Vmpo', 'Impo']): vmp_ref = self.module_parameters['Vmpo'] imp_ref = self.module_parameters['Impo'] # get relevant Vmp and Imp parameters if they are PVsyst-like - elif all([elem in self.module_parameters - for elem in ['Vmpp', 'Impp']]): + elif all(elem in self.module_parameters for elem in ['Vmpp', 'Impp']): vmp_ref = self.module_parameters['Vmpp'] imp_ref = self.module_parameters['Impp'] diff --git a/pvlib/tests/iotools/test_pvgis.py b/pvlib/tests/iotools/test_pvgis.py index eee439d2dd..d363809c71 100644 --- a/pvlib/tests/iotools/test_pvgis.py +++ b/pvlib/tests/iotools/test_pvgis.py @@ -496,7 +496,7 @@ def test_get_pvgis_tmy_error(): @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY) def test_get_pvgis_map_variables(pvgis_tmy_mapped_columns): actual, _, _, _ = get_pvgis_tmy(45, 8, map_variables=True) - assert all([c in pvgis_tmy_mapped_columns for c in actual.columns]) + assert all(c in pvgis_tmy_mapped_columns for c in actual.columns) @pytest.mark.remote_data @@ -519,7 +519,7 @@ def test_read_pvgis_horizon_invalid_coords(): def test_read_pvgis_tmy_map_variables(pvgis_tmy_mapped_columns): fn = DATA_DIR / 'tmy_45.000_8.000_2005_2016.json' actual, _, _, _ = read_pvgis_tmy(fn, map_variables=True) - assert all([c in pvgis_tmy_mapped_columns for c in actual.columns]) + assert all(c in pvgis_tmy_mapped_columns for c in actual.columns) def test_read_pvgis_tmy_json(expected, month_year_expected, inputs_expected, diff --git a/pvlib/tests/iotools/test_srml.py b/pvlib/tests/iotools/test_srml.py index 8f960885d4..330b1313f8 100644 --- a/pvlib/tests/iotools/test_srml.py +++ b/pvlib/tests/iotools/test_srml.py @@ -146,7 +146,7 @@ def test_get_srml_minute(): expected_index = pd.date_range(start='2018-01-01', end='2018-01-31 23:59', freq='1min', tz='Etc/GMT+8') assert_index_equal(data_get.index, expected_index) - assert all([c in data_get.columns for c in data_read.columns]) + assert all(c in data_get.columns for c in data_read.columns) # Check that all indices in example file are present in remote file assert data_read.index.isin(data_get.index).all() assert meta['station'] == 'EU' diff --git a/pvlib/tests/test_modelchain.py b/pvlib/tests/test_modelchain.py index 7f7c94cb0e..ef1a890a4a 100644 --- a/pvlib/tests/test_modelchain.py +++ b/pvlib/tests/test_modelchain.py @@ -2018,5 +2018,5 @@ def test_ModelChainResult___repr__(sapm_dc_snl_ac_system, location, weather): mcres = mc.results.__repr__() mc_attrs = dir(mc.results) mc_attrs = [a for a in mc_attrs if not a.startswith('_')] - assert all([a in mcres for a in mc_attrs]) + assert all(a in mcres for a in mc_attrs) \ No newline at end of file