davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=c7ae54df152446433592cd8ce868cc00d78aad61
commit c7ae54df152446433592cd8ce868cc00d78aad61 Author: davemds <[email protected]> Date: Sat Aug 16 14:11:06 2014 +0200 Add version info in the efl package. Also removed the logger import in efl, not usefull and only create problems --- efl/__init__.py | 4 +++- setup.py | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/efl/__init__.py b/efl/__init__.py index 5fc98c8..6db8b76 100644 --- a/efl/__init__.py +++ b/efl/__init__.py @@ -1 +1,3 @@ -import efl.utils.logger + +__version__ = "1.10.99" +__version_info__ = ( 1, 10, 99 ) diff --git a/setup.py b/setup.py index dee9e17..2e48c24 100755 --- a/setup.py +++ b/setup.py @@ -7,16 +7,23 @@ import subprocess from distutils.core import setup, Command from distutils.extension import Extension from distutils.version import StrictVersion, LooseVersion +from efl import __version_info__ as vers script_path = os.path.dirname(os.path.abspath(__file__)) -# python-efl version -VERSION = "1.11" -RELEASE = "1.10.99" +# python-efl version (change in efl/__init__.py) +RELEASE = "%d.%d.%d" % (vers[0], vers[1], vers[2]) +VERSION = "%d.%d" % (vers[0], vers[1] if vers[2] < 99 else vers[1] + 1) + +# dependencies +CYTHON_MIN_VERSION = "0.19" +EFL_MIN_VERSION = RELEASE +ELM_MIN_VERSION = RELEASE + # Add git commit count for dev builds -if RELEASE.split(".")[2] == "99": +if vers[2] >= 99: call = subprocess.Popen( ["git", "log", "--oneline"], stdout=subprocess.PIPE) out, err = call.communicate() @@ -25,11 +32,6 @@ if RELEASE.split(".")[2] == "99": ver = log.count("\n") RELEASE += "a" + str(ver) -# dependencies -CYTHON_MIN_VERSION = "0.19" -EFL_MIN_VERSION = "1.10.99" -ELM_MIN_VERSION = "1.10.99" - # XXX: Force default visibility. See phab T504 if os.getenv("CFLAGS") is not None and "-fvisibility=" in os.environ["CFLAGS"]: --
