From b4ecd9262b013cdb40448b185e4c77e48c5e5832 Mon Sep 17 00:00:00 2001 From: Travis Thurber Date: Fri, 23 Sep 2022 16:32:05 -0700 Subject: [PATCH] fix conda-forge build error (#95) --- mosartwmpy/_version.py | 2 +- .../tests/test_calculate_water_constraints_by_farm.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mosartwmpy/_version.py b/mosartwmpy/_version.py index 3d26edf..df12433 100644 --- a/mosartwmpy/_version.py +++ b/mosartwmpy/_version.py @@ -1 +1 @@ -__version__ = "0.4.1" +__version__ = "0.4.2" diff --git a/mosartwmpy/tests/test_calculate_water_constraints_by_farm.py b/mosartwmpy/tests/test_calculate_water_constraints_by_farm.py index 9fb1614..c3dca75 100644 --- a/mosartwmpy/tests/test_calculate_water_constraints_by_farm.py +++ b/mosartwmpy/tests/test_calculate_water_constraints_by_farm.py @@ -15,6 +15,9 @@ class CalculateWaterConstraintsByFarmTest(unittest.TestCase): DEMAND_FILE = pkg_resources.resource_filename('mosartwmpy', 'tests/demand_1981_01_01.nc') RESERVOIRS_FILE = pkg_resources.resource_filename('mosartwmpy', 'tests/reservoirs.nc') CONSTRAINTS_FILE = pkg_resources.resource_filename('mosartwmpy', 'tests/test_land_water_constraints_by_farm.parquet') + LIVE_FILE = pkg_resources.resource_filename('mosartwmpy', 'tests/test_land_water_constraints_by_farm_live.parquet') + BIAS_FILE = pkg_resources.resource_filename('mosartwmpy', 'tests/test_historic_storage_supply_bias.parquet') + CROP_FILE = pkg_resources.resource_filename('mosartwmpy', 'tests/test_crop_prices_by_nldas_id.parquet') def test_calculate_water_constraints_by_farm(self): model = Model() @@ -26,6 +29,9 @@ def test_calculate_water_constraints_by_farm(self): model.config['water_management.demand.path'] = self.DEMAND_FILE model.config['water_management.reservoirs.path'] = self.RESERVOIRS_FILE model.config['water_management.demand.farmer_abm.land_water_constraints.path'] = self.CONSTRAINTS_FILE + model.config['water_management.demand.farmer_abm.land_water_constraints_live.path'] = self.LIVE_FILE + model.config['water_management.demand.farmer_abm.historic_storage_supply.path'] = self.BIAS_FILE + model.config['water_management.demand.farmer_abm.crop_prices_by_nldas_id.path'] = self.CROP_FILE farmerABM = FarmerABM(model)