From 38f6d55ad43aa064411e9fe2075c166eae7ffca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= Date: Thu, 30 Jan 2025 10:27:16 +0100 Subject: [PATCH 1/3] chore: remove warnings --- examples/propertiesDataframes.py | 21 +++++++++------------ tests/test_NeqSim.py | 10 +--------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/examples/propertiesDataframes.py b/examples/propertiesDataframes.py index 34cd5202..dc64f4f0 100644 --- a/examples/propertiesDataframes.py +++ b/examples/propertiesDataframes.py @@ -11,10 +11,7 @@ from neqsim.thermo import ( TPflash, calcproperties, - fluid, fluid_df, - phaseenvelope, - printFrame, ) # create gas condensate fluid @@ -149,9 +146,9 @@ def calcProperties(frame): frame["gasmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction( phaseNumber ) - frame[ - "gasvolumefraction[mol/mol]" - ] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) + frame["gasvolumefraction[mol/mol]"] = ( + gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) + ) frame["gasthermalconductivity[W/mK]"] = gascondensateFluid.getPhase( phaseNumber ).getThermalConductivity("W/mK") @@ -167,9 +164,9 @@ def calcProperties(frame): frame["oilmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction( phaseNumber ) - frame[ - "oilvolumefraction[mol/mol]" - ] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) + frame["oilvolumefraction[mol/mol]"] = ( + gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) + ) frame["oilthermalconductivity[W/mK]"] = gascondensateFluid.getPhase( phaseNumber ).getThermalConductivity("W/mK") @@ -182,9 +179,9 @@ def calcProperties(frame): frame["oilmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction( phaseNumber ) - frame[ - "oilvolumefraction[mol/mol]" - ] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) + frame["oilvolumefraction[mol/mol]"] = ( + gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) + ) frame["oilthermalconductivity[W/mK]"] = gascondensateFluid.getPhase( phaseNumber ).getThermalConductivity("W/mK") diff --git a/tests/test_NeqSim.py b/tests/test_NeqSim.py index 8009ef26..7318f3d4 100644 --- a/tests/test_NeqSim.py +++ b/tests/test_NeqSim.py @@ -31,7 +31,7 @@ def test_Viscosity(): def test_hasComponentDatabase(): - assert jneqsim.util.database.NeqSimDataBase.hasComponent("methane") == True + assert jneqsim.util.database.NeqSimDataBase.hasComponent("methane") is True def test_fullOffshoreProcess(): @@ -136,7 +136,6 @@ def test_fullOffshoreProcess(): compressor, cooler, separator3phase, - getProcess, clearProcess, mixer, heater, @@ -147,14 +146,7 @@ def test_fullOffshoreProcess(): stream, saturator, valve, - filters, - heatExchanger, - simpleTEGAbsorber, - distillationColumn, - waterStripperColumn, recycle, - setpoint, - calculator, ) clearProcess() # reset process simulation From 5b7d46c762fe2441fc803710eea7ec680f13b3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= Date: Thu, 30 Jan 2025 10:27:37 +0100 Subject: [PATCH 2/3] chore: allow newer versions of numpy --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0d3634a5..c531a0bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ python = "^3.8" JPype1 = "^1.5.0" numpy = [ { version = "^1.24.4", markers = "python_version == '3.8'" }, - { version = "^1.25.2", markers = "python_version > '3.8'" }, + { version = ">1.25.2", markers = "python_version > '3.8'" }, ] pandas = [ { version = "^1.3.5", markers = "python_version == '3.8'" }, @@ -26,7 +26,7 @@ tabulate = { version = "^0.9.0", optional = true } [tool.poetry.group.dev.dependencies] black = ">=23.12,<25.0" pytest = "^7.4.3" -pre-commit = "^3.5.0" +pre-commit = "^3.5.0" # Higher versions require python 3.9+ [tool.poetry.extras] interactive = ["matplotlib", "jupyter", "tabulate"] From 3cffa0cbffa9aa7599066ca9781f65b271074b22 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 09:28:55 +0000 Subject: [PATCH 3/3] [pre-commit.ci lite] apply automatic fixes --- examples/propertiesDataframes.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/propertiesDataframes.py b/examples/propertiesDataframes.py index dc64f4f0..1518f5ef 100644 --- a/examples/propertiesDataframes.py +++ b/examples/propertiesDataframes.py @@ -146,9 +146,9 @@ def calcProperties(frame): frame["gasmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction( phaseNumber ) - frame["gasvolumefraction[mol/mol]"] = ( - gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) - ) + frame[ + "gasvolumefraction[mol/mol]" + ] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) frame["gasthermalconductivity[W/mK]"] = gascondensateFluid.getPhase( phaseNumber ).getThermalConductivity("W/mK") @@ -164,9 +164,9 @@ def calcProperties(frame): frame["oilmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction( phaseNumber ) - frame["oilvolumefraction[mol/mol]"] = ( - gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) - ) + frame[ + "oilvolumefraction[mol/mol]" + ] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) frame["oilthermalconductivity[W/mK]"] = gascondensateFluid.getPhase( phaseNumber ).getThermalConductivity("W/mK") @@ -179,9 +179,9 @@ def calcProperties(frame): frame["oilmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction( phaseNumber ) - frame["oilvolumefraction[mol/mol]"] = ( - gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) - ) + frame[ + "oilvolumefraction[mol/mol]" + ] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber) frame["oilthermalconductivity[W/mK]"] = gascondensateFluid.getPhase( phaseNumber ).getThermalConductivity("W/mK")