From 9f09c5e919ce91464f9aedc571c89310b95c33be Mon Sep 17 00:00:00 2001
From: msimonin <matthieu.simonin@inria.fr>
Date: Mon, 23 Sep 2019 13:28:13 +0200
Subject: [PATCH] add version in user agent
---
.bumpversion.cfg | 2 +-
grid5000/__init__.py | 3 ++-
grid5000/__version__.py | 1 +
setup.cfg | 1 -
setup.py | 9 ++++++++-
5 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 grid5000/__version__.py
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index a7eae63..8469ad0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -3,5 +3,5 @@ current_version = 0.1.0
commit = true
tag = true
-[bumpversion:file:setup.cfg]
+[bumpversion:file:grid5000/__version___.py]
diff --git a/grid5000/__init__.py b/grid5000/__init__.py
index ed28295..81a4f77 100644
--- a/grid5000/__init__.py
+++ b/grid5000/__init__.py
@@ -10,12 +10,13 @@ import yaml
from .exceptions import * # noqa
from .objects import * # noqa
+from .__version__ import __version__
logger = logging.getLogger(__name__)
DEFAULT_BASE_URL = "https://api.grid5000.fr/stable"
-USER_AGENT = "python-grid5000"
+USER_AGENT = f"python-grid5000 {__version__}"
def _create_session(
diff --git a/grid5000/__version__.py b/grid5000/__version__.py
new file mode 100644
index 0000000..a68927d
--- /dev/null
+++ b/grid5000/__version__.py
@@ -0,0 +1 @@
+__version__ = "0.1.0"
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index ad7d115..454cbd5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,5 @@
[metadata]
name = python-grid5000
-version = 0.1.0
keywords = REST, evaluation, reproducible research, Grid5000
license_file = LICENSE.txt
url = https://gitlab.inria.fr/msimonin/python-grid5000
diff --git a/setup.py b/setup.py
index 7c7c34e..bd459d1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,12 @@
# -*- coding: utf-8 -
from setuptools import setup
+import os
-setup()
+here = os.path.abspath(os.path.dirname(__file__))
+
+about = {}
+with open(os.path.join(here, 'grid5000', '__version__.py')) as f:
+ exec(f.read(), about)
+
+setup(version=about["__version__"])
--
GitLab