Skip to content

Commit 58a3544

Browse files
committed
Fixed import of version
1 parent b32f1d4 commit 58a3544

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

lib/pycarl/__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
from . import core
22
from .core import *
3-
from . import infinity
4-
from . import _config
3+
from . import infinity, _config
54

65
__version__ = "unknown"
76
try:
8-
from _version import __version__
7+
from ._version import __version__
98
except ImportError:
109
# We're running in a tree that doesn't have a _version.py, so we don't know what our version is.
1110
pass

tests/core/test_core.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ def test_config(self):
3030
def test_version(self):
3131
import pycarl
3232
from distutils.version import StrictVersion
33-
version = StrictVersion(pycarl.carl_version())
34-
assert version > StrictVersion("17.07.50")
33+
version = StrictVersion(pycarl.__version__)
34+
assert version > StrictVersion("2.0.0")
35+
carl_version = StrictVersion(pycarl.carl_version())
36+
assert carl_version > StrictVersion("17.07.50")
3537

3638
def test_pickle(self):
3739
import pycarl

0 commit comments

Comments
 (0)