Skip to content

Commit

Permalink
fix conda-forge build error (#95)
Browse files Browse the repository at this point in the history
  • Loading branch information
thurber authored Sep 23, 2022
1 parent f1b0f22 commit b4ecd92
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mosartwmpy/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.1"
__version__ = "0.4.2"
6 changes: 6 additions & 0 deletions mosartwmpy/tests/test_calculate_water_constraints_by_farm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)

Expand Down

0 comments on commit b4ecd92

Please sign in to comment.