Skip to content

Commit

Permalink
Merge pull request #173 from asmfstatoil/interactive
Browse files Browse the repository at this point in the history
chore: modified setup.py to include optional packages if installing with interactive flag
  • Loading branch information
asmfstatoil authored Nov 14, 2022
2 parents ada227f + fd34be7 commit 40272d7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
17 changes: 12 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
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.6",
version="2.4.7",
author="Even Solbraa",
author_email="[email protected]",
description="NeqSim is a tool for thermodynamic and process calculations",
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=[
"Programming Language :: Python :: 3",
"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'
)

0 comments on commit 40272d7

Please sign in to comment.