Renamed package. Added setup.py

j-jith · Nov 15, 2016 · 637b2b0 · 637b2b0
1 parent a00a3b3
commit 637b2b0
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 10 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include README.rst
diff --git a/README → README.rst b/README → README.rst
diff --git a/compare/gen_data.py b/compare/gen_data.py
@@ -5,7 +5,7 @@
 
 import sys
 sys.path.append('../')
-import eos
+import pythermophy as eos
 
 ### Mean temperature of fluid
 T_0 = np.array([40, 60, 80, 100]) + 273.15 # [K]

diff --git a/eos/__init__.py → pythermophy/__init__.py b/eos/__init__.py → pythermophy/__init__.py
@@ -1,13 +1,13 @@
-from fluid import Fluid
+from .fluid import Fluid
 
 #from parent_class import EOS
-from ideal_gas import IdealGas
+from .ideal_gas import IdealGas
 
-from cubic_eos import RedlichKwong
-from cubic_eos import SoaveRedlichKwong
-from cubic_eos import PengRobinson
+from .cubic_eos import RedlichKwong
+from .cubic_eos import SoaveRedlichKwong
+from .cubic_eos import PengRobinson
 
-from lee_kesler import LeeKesler
+from .lee_kesler import LeeKesler
 
 # Shorter aliases for class names
 class RK(RedlichKwong):

diff --git a/eos/cubic_eos.py → pythermophy/cubic_eos.py b/eos/cubic_eos.py → pythermophy/cubic_eos.py
diff --git a/eos/cubic_parent.py → pythermophy/cubic_parent.py b/eos/cubic_parent.py → pythermophy/cubic_parent.py
diff --git a/eos/deprecated/lee_kesler.py.old → pythermophy/deprecated/lee_kesler.py.old b/eos/deprecated/lee_kesler.py.old → pythermophy/deprecated/lee_kesler.py.old
diff --git a/eos/deprecated/peng_robinson.py → pythermophy/deprecated/peng_robinson.py b/eos/deprecated/peng_robinson.py → pythermophy/deprecated/peng_robinson.py
diff --git a/eos/deprecated/redlich_kwong.py → pythermophy/deprecated/redlich_kwong.py b/eos/deprecated/redlich_kwong.py → pythermophy/deprecated/redlich_kwong.py
diff --git a/eos/deprecated/soave_redlich_kwong.py → ...ermophy/deprecated/soave_redlich_kwong.py b/eos/deprecated/soave_redlich_kwong.py → ...ermophy/deprecated/soave_redlich_kwong.py
diff --git a/eos/fluid.py → pythermophy/fluid.py b/eos/fluid.py → pythermophy/fluid.py
diff --git a/eos/ideal_gas.py → pythermophy/ideal_gas.py b/eos/ideal_gas.py → pythermophy/ideal_gas.py
diff --git a/eos/lee_kesler.py → pythermophy/lee_kesler.py b/eos/lee_kesler.py → pythermophy/lee_kesler.py
diff --git a/eos/parent_class.py → pythermophy/parent_class.py b/eos/parent_class.py → pythermophy/parent_class.py
diff --git a/setup.py b/setup.py
@@ -0,0 +1,28 @@
+from setuptools import setup
+
+def readme():
+    with open('README.rst') as fileh:
+        return fileh.read()
+
+setup(name = 'pythermophy',
+      version = '0.1',
+      description = 'Predict density, speed of sound and heat capacities of pure fluids',
+      long_description=readme(),
+      classifiers = [
+        'Development Status :: 3 - Alpha',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Scientific/Engineering'
+      ],
+      url = 'http://github.com/j-jith/pythermophy',
+      author = 'Jithin Jith',
+      author_email = '[email protected]',
+      license = 'MIT',
+      packages = ['pythermophy'],
+      install_requires = [
+          'numpy',
+          'scipy'
+      ],
+      include_package_data=True,
+      zip_safe = False)
diff --git a/symbolic/cubic_eq.py → test/symbolic/cubic_eq.py b/symbolic/cubic_eq.py → test/symbolic/cubic_eq.py
diff --git a/symbolic/departure.py → test/symbolic/departure.py b/symbolic/departure.py → test/symbolic/departure.py
diff --git a/symbolic/diff_Z.py → test/symbolic/diff_Z.py b/symbolic/diff_Z.py → test/symbolic/diff_Z.py
diff --git a/symbolic/lee_kesler.py → test/symbolic/lee_kesler.py b/symbolic/lee_kesler.py → test/symbolic/lee_kesler.py
diff --git a/test.py → test/test.py b/test.py → test/test.py
@@ -3,7 +3,9 @@
 from CoolProp.CoolProp import PropsSI
 import matplotlib.pyplot as plt
 
-import eos
+import sys
+sys.path.append('../')
+import pythermophy as eos
 
 ### Mean temperature of fluid
 T_0 = 328.79 # [K]
@@ -16,7 +18,7 @@
 #Tc = 31.1 + 273.15 # K
 #omega = 0.228 # acentric factor
 
-fluid = eos.Fluid.init_from_file('fluids/CO2')
+fluid = eos.Fluid.init_from_file('../fluids/CO2')
 M = fluid.molar_mass
 
 ig = eos.IdealGas(fluid)

diff --git a/test_lk.py → test/test_lk.py b/test_lk.py → test/test_lk.py
@@ -1,6 +1,6 @@
 from __future__ import print_function, division
 import numpy as np
-import eos
+import pythermophy as eos
 
 ### Mean temperature of fluid
 #T_0 = 328.79 # [K]