Skip to content

Commit

Permalink
#646 revert version changes
Browse files Browse the repository at this point in the history
  • Loading branch information
valentinsulzer committed Nov 8, 2019
1 parent af39ac2 commit bd290f8
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 5 deletions.
14 changes: 12 additions & 2 deletions pybamm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,19 @@

#
# Version info
# Keep up to date with setup.py!
#
__version_int__ = (0, 1, 0)
def _load_version_int():
try:
root = os.path.abspath(os.path.dirname(__file__))
with open(os.path.join(root, "version"), "r") as f:
version = f.read().strip().split(",")
major, minor, revision = [int(x) for x in version]
return major, minor, revision
except Exception as e:
raise RuntimeError("Unable to read version number (" + str(e) + ").")


__version_int__ = _load_version_int()
__version__ = ".".join([str(x) for x in __version_int__])
if sys.version_info[0] < 3:
del x # Before Python3, list comprehension iterators leaked
Expand Down
1 change: 1 addition & 0 deletions pybamm/version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0, 1, 0
16 changes: 13 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,22 @@
readme = f.read()


# Keep up to date with __init__!
version = "0.1.0"
# Read version number from file
def load_version():
try:
import os

root = os.path.abspath(os.path.dirname(__file__))
with open(os.path.join(root, "pybamm", "version"), "r") as f:
version = f.read().strip().split(",")
return ".".join([str(int(x)) for x in version])
except Exception as e:
raise RuntimeError("Unable to read version number (" + str(e) + ").")


setup(
name="pybamm",
version=version,
version=load_version(),
description="Python Battery Mathematical Modelling.",
long_description=readme,
url="https://github.com/pybamm-team/PyBaMM",
Expand Down

0 comments on commit bd290f8

Please sign in to comment.