Skip to content

Commit

Permalink
Moved to Pandas@v2 allowing Python3.12 support
Browse files Browse the repository at this point in the history
  • Loading branch information
kzscisoft committed Jan 3, 2024
1 parent ecd86ed commit ee57b0a
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 44 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# Power Balance Models

[![DOI](https://zenodo.org/badge/450553622.svg)](https://zenodo.org/badge/latestdoi/450553622) [![Power Balance Models Ubuntu](https://github.com/ukaea/powerbalance/actions/workflows/build_run_linux.yml/badge.svg)](https://github.com/ukaea/powerbalance/actions/workflows/build_run_linux.yml) [![codecov](https://codecov.io/gh/ukaea/powerbalance/branch/main/graph/badge.svg?token=F0YNULL1U7)](https://codecov.io/gh/ukaea/powerbalance) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit) [![Python Versions](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11-blue)]() [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![DOI](https://zenodo.org/badge/450553622.svg)](https://zenodo.org/badge/latestdoi/450553622) [![Power Balance Models Ubuntu](https://github.com/ukaea/powerbalance/actions/workflows/build_run_linux.yml/badge.svg)](https://github.com/ukaea/powerbalance/actions/workflows/build_run_linux.yml) [![codecov](https://codecov.io/gh/ukaea/powerbalance/branch/main/graph/badge.svg?token=F0YNULL1U7)](https://codecov.io/gh/ukaea/powerbalance) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit) [![Python Versions](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue)]() [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

A power balance model which combines power consumption and power generation data to assess the net power production of different designs for a tokamak power plant.

Expand Down
113 changes: 72 additions & 41 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
Expand Up @@ -26,7 +26,6 @@ keywords = [

[tool.poetry.dependencies]
python = "^3.9,<3.13"
pandas = "^1.5.3"
matplotlib = "^3.8.2"
prettytable = "^3.9.0"
html2text = "^2020.1.16"
Expand All @@ -38,7 +37,8 @@ scipy = "^1.11.4"
click = "^8.1.7"
pydantic = "^2.5.3"
bokeh = "^3.3.2"
pydelica = "^0.4.6"
pydelica = "^0.5.0"
pandas = "^2.1.4"

[tool.poetry.group.dev.dependencies]
flake8 = "^6.1.0"
Expand Down
Binary file modified tests/baseline/default_heating2elec_eff.pckl
Binary file not shown.
Binary file modified tests/baseline/default_thermal2elec_eff.pckl
Binary file not shown.

0 comments on commit ee57b0a

Please sign in to comment.