Merge pull request #192 from equinor/test2.4.15

Remove Java 8 library and update with new NeqSim lib

.github/workflows/runtests.yml

@@ -20,22 +20,4 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install neqsim pytest
       - name: Run tests with pytest
-        run: python -m pytest
-  buildforJava8:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10' 
-      - uses: actions/checkout@v3
-      - name: Install Python 3
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'temurin'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install neqsim pytest
-      - name: Run tests with pytest
-        run: python -m pytest 
+        run: python -m pytest

neqsim/neqsimpython.py

@@ -1,11 +1,11 @@
 import jpype
 
 if not jpype.isJVMStarted():
-    jvmVersion = jpype.getJVMVersion()[0]
-    if jvmVersion <= 8:
-        jpype.addClassPath('./lib/libj8/*')
-    else:
-        jpype.addClassPath('./lib/*')
+    jpype.addClassPath('./lib/*')
     jpype.startJVM(convertStrings=False)
+    jvmVersion = jpype.getJVMVersion()[0]
+    if jvmVersion<=8:
+        print('Your version of Java is not supported. Please upgrade to Java version 11 or higher.')
+        print('See: https://github.com/equinor/neqsimpython#prerequisites')
 
 jNeqSim = jpype.JPackage('neqsim')

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name="neqsim",
-    version="2.4.14",
+    version="2.4.15",
     author="Even Solbraa",
     author_email="[email protected]",
     description="NeqSim is a tool for thermodynamic and process calculations",

tests/test_NeqSim.py

@@ -23,6 +23,13 @@ def test_Viscosity():
     gasViscosity = thermoSystem.getPhase(0).getViscosity("kg/msec")
     assert abs(1.0760998263782569e-05 - gasViscosity) < 1e-10
 
+def test_updateDatabase():
+    jNeqSim.util.database.NeqSimDataBase.updateTable("COMP",
+        "classpath:/data/COMP.csv")
+
+def test_hasComponentDatabase():
+    assert jNeqSim.util.database.NeqSimDataBase.hasComponent("methane") == True
+
 def test_fullOffshoreProcess():
     import pandas as pd
     import math