From e6ac3d4b1e11cbb20c82a0e9e032d6835983634f Mon Sep 17 00:00:00 2001 From: BigTava Date: Mon, 30 Dec 2024 13:09:20 +0000 Subject: [PATCH] GSYE-719: lock numpy version --- gsy_framework/sim_results/carbon_emissions.py | 2 +- requirements/base.ini | 1 + requirements/base.txt | 10 ++++++++-- requirements/tests.txt | 8 +++++++- tox.ini | 1 - 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gsy_framework/sim_results/carbon_emissions.py b/gsy_framework/sim_results/carbon_emissions.py index ac181dff..07ca968c 100644 --- a/gsy_framework/sim_results/carbon_emissions.py +++ b/gsy_framework/sim_results/carbon_emissions.py @@ -198,7 +198,7 @@ def update(self, country_code: str, time_slot: duration, results_list: List[Dict start_date = pd.Timestamp(results_list[0]["current_market"].split("T")[0]) end_date = pd.Timestamp(results_list[-1]["current_market"].split("T")[0]) df_carbon_ratio = self.calculate_carbon_ratio(country_code, start_date, end_date) - df_carbon_ratio.to_csv("carbon_ratio.csv") + for result in results_list: current_market = result["current_market"] diff --git a/requirements/base.ini b/requirements/base.ini index 44071d50..0f87b4ba 100644 --- a/requirements/base.ini +++ b/requirements/base.ini @@ -14,3 +14,4 @@ avro entsoe-py>=0.4.4 pandas>=1.4.2 geopy +numpy==1.24.4 diff --git a/requirements/base.txt b/requirements/base.txt index 2ed296a9..bb6d2470 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -40,6 +40,10 @@ filelock==3.14.0 # virtualenv geocoder==1.17.5 # via -r requirements/base.ini +geographiclib==2.0 + # via geopy +geopy==2.4.1 + # via -r requirements/base.ini identify==2.5.36 # via pre-commit idna==3.7 @@ -52,8 +56,10 @@ kafka-python==2.0.2 # via -r requirements/base.ini nodeenv==1.8.0 # via pre-commit -numpy==2.1.3 - # via pandas +numpy==1.24.4 + # via + # -r requirements/base.ini + # pandas openpyxl==3.0.10 # via -r requirements/base.ini packaging==24.0 diff --git a/requirements/tests.txt b/requirements/tests.txt index d7219249..b80d608e 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -84,6 +84,12 @@ flake8-tuple==0.4.1 # via -r requirements/tests.ini geocoder==1.17.5 # via -r requirements/base.txt +geographiclib==2.0 + # via + # -r requirements/base.txt + # geopy +geopy==2.4.1 + # via -r requirements/base.txt hypothesis==6.102.4 # via -r requirements/tests.ini identify==2.5.36 @@ -120,7 +126,7 @@ nodeenv==1.8.0 # via # -r requirements/base.txt # pre-commit -numpy==2.1.3 +numpy==1.24.4 # via # -r requirements/base.txt # pandas diff --git a/tox.ini b/tox.ini index de9e7903..6394caa4 100644 --- a/tox.ini +++ b/tox.ini @@ -31,7 +31,6 @@ commands = [testenv:ci] basepython = python3.8 - skip_install = true deps = -r requirements/tests.txt