Skip to content

Commit

Permalink
specify specific mip version to make sure install works
Browse files Browse the repository at this point in the history
  • Loading branch information
nick-gorman committed Jun 4, 2024
1 parent 2aeacd6 commit 9f4b0b1
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
22 changes: 8 additions & 14 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name="nempy"
version="2.1.0"
version="2.2.0"
description="A flexible tool kit for modelling Australia's National Electricity Market dispatch procedure."
authors=["Nicholas Gorman <[email protected]>",]
license = "BSD-3-Clause"
Expand All @@ -19,7 +19,7 @@ repository="https://github.com/UNSW-CEEM/nempy"
[tool.poetry.dependencies]
python = ">=3.8,<3.13"
pandas = "<3.0.0"
mip = ">=1.16rc0"
mip = "=1.13"
xmltodict = "==0.12.0"
requests = ">=2.0.0, <3.0.0"

Expand Down
6 changes: 3 additions & 3 deletions tests/build_historical_test_data_cache_and_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
con = sqlite3.connect('D:/nempy_test_files/historical_mms.db')
mms_db_manager = mms_db.DBManager(connection=con)

xml_cache_manager = xml_cache.XMLCacheManager('D:/nempy_data/nemde_cache')
xml_cache_manager = xml_cache.XMLCacheManager('D:/nempy_test_files/nemde_cache')

if running_for_first_time:
# mms_db_manager.populate(start_year=2019, start_month=1, end_year=2019, end_month=12)
xml_cache_manager.populate(start_year=2019, start_month=1, end_year=2019, end_month=12)
mms_db_manager.populate(start_year=2019, start_month=1, end_year=2019, end_month=12)
#xml_cache_manager.populate(start_year=2019, start_month=1, end_year=2019, end_month=12)

get_violation_intervals = False

Expand Down
9 changes: 9 additions & 0 deletions tests/price_comp.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import pandas as pd


benchmark = pd.read_csv('1000_interval_benchmark.csv')
outputs = pd.read_csv('latest_1000_interval_run.csv')
comp = pd.merge(outputs, benchmark, on=['time', 'region', 'service'])
comp['diff'] = (comp['error_x'].abs() - comp['error_y'].abs())
comp = comp.sort_values('diff', ascending=False)
x=1
2 changes: 1 addition & 1 deletion tests/test_historical.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from tests import historical_market_builder

test_db = 'D:/nempy_test_files/historical_mms.db'
test_xml_cache = 'D:/nempy_data/nemde_cache'
test_xml_cache = 'D:/nempy_test_files/nemde_cache'


# These tests require some additional clean up and will probably not run on your machine. ##############################
Expand Down

0 comments on commit 9f4b0b1

Please sign in to comment.