Fix VERSION file location to sources file folder

jjgomera · Jun 19, 2020 · 0bcfcd3 · 0bcfcd3
1 parent 63ae9c0
commit 0bcfcd3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.rst
 include LICENSE
-include VERSION
+include iapws/VERSION
diff --git a/docs/conf.py b/docs/conf.py
@@ -24,7 +24,7 @@
 import iapws  # noqa
 
 
-with open(os.path.join("..", 'VERSION')) as version_file:
+with open(os.path.join("..", "iapws", "VERSION")) as version_file:
     __version__ = version_file.read().strip()
 
 

diff --git a/VERSION → iapws/VERSION b/VERSION → iapws/VERSION
diff --git a/iapws/__init__.py b/iapws/__init__.py
@@ -11,7 +11,7 @@
 from .humidAir import HumidAir  # noqa
 from .ammonia import H2ONH3  # noqa
 
-basepath = os.path.dirname(os.path.dirname(__file__))
+basepath = os.path.dirname(__file__)
 with open(os.path.join(basepath, 'VERSION')) as version_file:
     __version__ = version_file.read().strip()
 

diff --git a/setup.py b/setup.py
@@ -1,9 +1,10 @@
 from setuptools import setup
 
 import io  # for backwards compatibility with Python 2
+import os
 
 
-with open('VERSION') as version_file:
+with open(os.path.join("iapws", "VERSION")) as version_file:
     __version__ = version_file.read().strip()
 
 with io.open('README.rst', encoding="utf8") as file: