cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging ~harlowja/cloud-init:scm-version into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/+git/cloud-init/+merge/301727
-- 
Your team cloud init development team is requested to review the proposed merge of ~harlowja/cloud-init:scm-version into cloud-init:master.

diff --git a/cloudinit/version.py b/cloudinit/version.py
index 3d1d1d2..4fc958c 100644
--- a/cloudinit/version.py
+++ b/cloudinit/version.py
@@ -16,12 +16,4 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from distutils import version as vr
-
-
-def version():
-    return vr.StrictVersion("0.7.7")
-
-
-def version_string():
-    return str(version())
+from setuptools_scm import get_version as version_string
diff --git a/requirements.txt b/requirements.txt
index cc1dc05..b5a4ef2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 # Pypi requirements for cloud-init to work
+setuptools_scm
 
 # Used for untemplating any files or strings with parameters.
 jinja2
diff --git a/setup.py b/setup.py
index 0af576a..b07d0d2 100755
--- a/setup.py
+++ b/setup.py
@@ -209,6 +209,8 @@ setuptools.setup(
     data_files=data_files,
     install_requires=requirements,
     cmdclass=cmdclass,
+    use_scm_version=True,
+    setup_requires=['setuptools_scm'],
     entry_points={
         'console_scripts': [
             'cloud-init = cloudinit.cmd.main:main'