From 4735ebcb2e430d0a7f11e2f72acc5e95749b0768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Fri, 11 Nov 2022 14:45:35 +0100
Subject: [PATCH 1/2] chore: new install packages

---
 README.md |  8 +++-----
 setup.py  | 15 +++++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 4771794..323cd71 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,13 @@ NeqSim Python is part of the [NeqSim project](https://equinor.github.io/neqsimho
 
 ## Releases
 
-The NeqSim Python package is distributed as a pip package. Install the package by running
+NeqSim Python is distributed as a pip package.  
 
+End-users should install neqsim python with some additional packages by running
 ```
-pip install neqsim
+pip install neqsim[interactive]
 ```
 
-NB! The python package matplotlib is used to show results but is not an requirement to run calculations.
-
-
 ## Getting Started
 
 See the [NeqSim Python Wiki](https://github.com/equinor/neqsimpython/wiki) for how to use NeqSim Python via Python or in Jupyter notebooks. Also see [examples of use of NeqSim for Gas Processing in Colab](https://colab.research.google.com/github/EvenSol/NeqSim-Colab/blob/master/notebooks/examples_of_NeqSim_in_Colab.ipynb#scrollTo=kHt6u-utpvYf). Learn and ask questions in [Discussions for use and development of NeqSim](https://github.com/equinor/neqsim/discussions).
diff --git a/setup.py b/setup.py
index ee581b2..67a5eb0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,13 @@
-import setuptools
+from setuptools import find_packages, setup
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-setuptools.setup(
+install_req = ['jpype1', 'pandas']
+test_req = ['pytest']
+interactive_req = ['matplotlib', 'tabulate', 'jupyter']
+
+setup(
     name="neqsim",
     version="2.4.5",
     author="Even Solbraa",
@@ -12,7 +16,7 @@
     long_description="NeqSim (Non-Equilibrium Simulator) is a library for estimation of fluid behaviour for oil and gas production. The basis for NeqSim is fundamental mathematical models related to phase behaviour and physical properties of oil and gas.",
     long_description_content_type="text/markdown",
     url="https://github.com/Equinor/neqsimpython",
-    packages=setuptools.find_packages(),
+    packages=find_packages(),
     package_data={'neqsim': ['lib/*.jar','lib/libj8/*.jar']},
     include_package_data=True,
     classifiers=[
@@ -20,6 +24,9 @@
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
     ],
-    install_requires=['jpype1', 'pandas', 'tabulate'],
+    install_requires=install_req,
+    tests_suite='tests',
+    test_requirements=test_req,
+    extras_require={'test': test_req, 'interactive': interactive_req},
     python_requires='>=3'
 )

From be89d5746b50038dfa9eae49232ba306d3e0cb9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Mon, 14 Nov 2022 14:07:46 +0100
Subject: [PATCH 2/2] chore: version 2.4.7

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 67a5eb0..933dde2 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name="neqsim",
-    version="2.4.5",
+    version="2.4.7",
     author="Even Solbraa",
     author_email="esolbraa@gmail.com",
     description="NeqSim is a tool for thermodynamic and process calculations",