Merge pull request #2 from SINTEF/fix_3_11_compatibility

Added build setup and fixed error related to dataclass

.gitignore

@@ -0,0 +1,11 @@
+__pycache__/
+Data
+PythonScript
+venv
+.idea/
+build
+dist
+/docs/_build/
+/feems.egg-info/
+.DS_Store
+*.egg-info/

RunFEEMSSim/settings.ini

@@ -15,7 +15,7 @@ language = English
 custom_sidebar = False
 license = apache2
 status = 2
-requirements = pandas~=2.1.1 numpy~=1.24.2 MachSysS
+requirements = pandas numpy MachSysS
 nbs_path = .
 doc_path = docs
 recursive = False

feems/build_feems.sh

@@ -1,2 +0,0 @@
-poetry install
-poetry build

feems/feems/types_for_feems.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from enum import Enum, unique, auto
 from functools import reduce
 from typing import NewType, NamedTuple, Union, List, Optional, TypeVar, DefaultDict
@@ -45,7 +45,7 @@ class FEEMSResult:
     running_hours_pti_pto_total_hr: float = 0.0
     total_emission_kg: Optional[DefaultDict[EmissionType, float]] = None
     detail_result: Optional[pd.DataFrame] = None
-    multi_fuel_consumption_total_kg: FuelConsumption = FuelConsumption()
+    multi_fuel_consumption_total_kg: FuelConsumption = field(default_factory=FuelConsumption)
     co2_emission_total_kg: float = 0.0
     energy_input_mechanical_total_mj: float = (
         0.0  # Energy input for generator / PTO (electric side) or PTI (mechanical side)

feems/pyproject.toml

@@ -0,0 +1,33 @@
+[tool.poetry]
+name = "feems"
+version = "0.10.4"
+description = ""
+authors = ["Kevin Koosup Yum <kevin.koosup.yum@gmail.com>"]
+readme = "readme.md"
+include = ["feems/py.typed"]
+license = "Proprietary"
+
+[tool.poetry.dependencies]
+python = ">=3.9,<3.13"
+pandas = "^2.1.1"
+scipy = "^1.11.2"
+numpy = "^1.22.0"
+
+[tool.poetry.group.dev.dependencies]
+pytest = "^7.4.2"
+black = "22.6.0"
+mypy = "^1.5.1"
+sphinx = "^7.2.6"
+sphinx-rtd-theme = "^1.3.0"
+sphinx-autodoc-typehints = "^1.24.0"
+pytest-subtests = "^0.11.0"
+unittest-xml-reporting = "^3.2.0"
+pytest-cov = "^4.1.0"
+
+[tool.black]
+line-length = 99
+target-version = ['py37']
+
+[build-system]
+requires = ["poetry>=1.4.0", "setuptools>=40.8.0"]
+build-backend = "poetry.core.masonry.api"

feems/tests/test_fuel.py

@@ -13,7 +13,7 @@
     _GWP100_N2O,
     _GWP100_CH4,
 )
-from pytest_subtests import subtests
+from pytest_subtests import SubTests
 
 
 def test_fuel_class():
@@ -131,7 +131,7 @@ def create_random_fuel_by_mass_fraction(
     return FuelByMassFraction(fuels=fuel_list)
 
 
-def test_fuel_by_mass_fraction_class(subtests):
+def test_fuel_by_mass_fraction_class(subtests: SubTests):
     with subtests.test(msg="Test fuel with no component"):
         assert FuelByMassFraction(fuels=[]).get_kg_co2_per_kg_fuel() == 0
 

machinery-system-structure/settings.ini

@@ -13,7 +13,7 @@ author = Kevin Koosup Yum
 author_email = kevinkoosup.yum@sintef.no
 copyright = SINTEF Ocean
 version = 0.6.2
-min_python = 3.9
+min_python = 3.10
 audience = Developers
 language = English
 # Set to True if you want to create a more fancy sidebar.json than the default
@@ -24,7 +24,7 @@ license = apache2
 status = 1
 
 # Optional. Same format as setuptools requirements
-requirements = protobuf~=4.21.12
+requirements = protobuf
 # Optional. Same format as setuptools console_scripts
 # console_scripts =
 # Optional. Same format as setuptools dependency-links

requirements.txt

@@ -0,0 +1,5 @@
+pandas
+numpy
+scipy
+protobuf
+pandas

requirements_dev.txt

@@ -0,0 +1,18 @@
+mypy
+pytest
+wheel
+black[jupyter]
+pytest-subtests
+mypy-protobuf
+types-protobuf
+typing_extensions
+jupyter
+jupyterlab
+nbdev
+deepdiff
+plotly
+poetry
+-e ./feems
+-e ./machinery-system-structure
+-e ./RunFeemsSim
+-r requirements.txt