From 99e1ee452e4068f130ddec31b31b6bbf8ed43852 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Fri, 3 Apr 2015 17:24:02 -0500 Subject: [PATCH 1/2] Add a version_info attribute This makes comparing docker-py versions *much* easier. Having to account for the potential of a "-dev" suffix is a PITA. --- docker/__init__.py | 2 +- docker/version.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/__init__.py b/docker/__init__.py index 1edc0e1c..3844c81a 100644 --- a/docker/__init__.py +++ b/docker/__init__.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .version import version +from .version import version, version_info __version__ = version __title__ = 'docker-py' diff --git a/docker/version.py b/docker/version.py index eaab84f1..acc7545e 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1 +1,2 @@ version = "1.1.1-dev" +version_info = (1, 1, 1) From cab86bb1709a63f462a4582639426e1c4045637a Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 22 Apr 2015 11:14:32 -0700 Subject: [PATCH 2/2] Automatically generate version_info from version string --- docker/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/version.py b/docker/version.py index acc7545e..e6e54204 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ version = "1.1.1-dev" -version_info = (1, 1, 1) +version_info = tuple([int(d) for d in version.replace("-dev", "").split(".")])