Skip to content

Commit

Permalink
GSYE-719: lock numpy version
Browse files Browse the repository at this point in the history
  • Loading branch information
BigTava committed Dec 30, 2024
1 parent c1f77dc commit e6ac3d4
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gsy_framework/sim_results/carbon_emissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
1 change: 1 addition & 0 deletions requirements/base.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ avro
entsoe-py>=0.4.4
pandas>=1.4.2
geopy
numpy==1.24.4
10 changes: 8 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 7 additions & 1 deletion requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ commands =

[testenv:ci]
basepython = python3.8

skip_install = true
deps =
-r requirements/tests.txt
Expand Down

0 comments on commit e6ac3d4

Please sign in to comment.