From ad97d2140b32499995433b69f752867a528bfc3c Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.dumon@gmail.com>
Date: Thu, 14 Jun 2018 13:55:24 +0200
Subject: [PATCH] Version bump

---
 MANIFEST.in        |  8 ++++++++
 bump_version_to.py |  4 ++--
 compile_bundle.py  | 13 -------------
 mvc/__version.py   |  2 +-
 pyxrd/__version.py |  2 +-
 setup.py           |  5 +++--
 6 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 compile_bundle.py

diff --git a/MANIFEST.in b/MANIFEST.in
index 134dd189..b73fbe82 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,15 @@
+exclude .gitignore
+exclude .gitattributes
+exclude bump_version_to.py
+exclude ez_setup.py
+exclude MANIFEST.in
+exclude run_tests.py
+exclude versioning.py
 recursive-exclude tests_mvc *
 recursive-exclude test *
 recursive-exclude build *
 recursive-exclude docs *
+recursive-exclude win_installer *
 
 recursive-include pyxrd *.glade
 recursive-include pyxrd/data *.atl
diff --git a/bump_version_to.py b/bump_version_to.py
index 925d291a..98906c8c 100644
--- a/bump_version_to.py
+++ b/bump_version_to.py
@@ -12,7 +12,7 @@ def update_version(filename, version):
         print line[0],
 
 assert len(sys.argv) > 1, "You need to specify the version (e.g. 6.6.6)"
-assert "v" not in sys.argv[1], "You need to the version (e.g. 6.6.6)"
+assert "v" not in sys.argv[1], "You need to specify the version (e.g. 6.6.6)"
 
 update_version(os.path.abspath("pyxrd/__version.py"), sys.argv[1])
 update_version(os.path.abspath("mvc/__version.py"), sys.argv[1])
@@ -20,4 +20,4 @@ def update_version(filename, version):
 print subprocess.check_output(['git', 'add', 'pyxrd/__version.py'])
 print subprocess.check_output(['git', 'add', 'mvc/__version.py'])
 print subprocess.check_output(['git', 'commit', '-m', 'Version bump', '--allow-empty'])
-print subprocess.check_output(['git', 'tag', '-a', 'v%s' % sys.argv[1], '-m', 'v%s' % sys.argv[1]])
+print subprocess.check_output(['git', 'tag', '-a', '%s' % sys.argv[1], '-m', '%s' % sys.argv[1]])
diff --git a/compile_bundle.py b/compile_bundle.py
deleted file mode 100644
index 5734dac9..00000000
--- a/compile_bundle.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python2
-
-import fileinput
-from subprocess import check_call
-from pyxrd import __version__
-
-from shutil import copyfile
-
-copyfile("PyXRDiss.iss", "PyXRD.iss")
-
-for line in fileinput.input("PyXRD.iss", inplace=True):
-    line = line.replace('|||VERSION|||', __version__)
-    print "%s" % (line),
diff --git a/mvc/__version.py b/mvc/__version.py
index a39a3c8a..4e56209f 100644
--- a/mvc/__version.py
+++ b/mvc/__version.py
@@ -24,7 +24,7 @@
 #  Boston, MA 02110, USA.
 #  -------------------------------------------------------------------------
 
-__version__ = ""
+__version__ = "0.8.1"
 
 
 
diff --git a/pyxrd/__version.py b/pyxrd/__version.py
index e5db6500..294d20b3 100644
--- a/pyxrd/__version.py
+++ b/pyxrd/__version.py
@@ -5,7 +5,7 @@
 # All rights reserved.
 # Complete license can be found in the LICENSE file.
 
-__version__ = ""
+__version__ = "0.8.1"
 
 
 
diff --git a/setup.py b/setup.py
index c7ca5546..34c3b0e2 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,9 @@
 
 def get_version():
     from pyxrd.__version import __version__
-    return __version__
+    if __version__.startswith("v"):
+        __version__ = __version__.replace("v", "")
+    return "%s" % __version__
 
 def get_install_requires():
     return [
@@ -37,7 +39,6 @@ def read(fname):
 
     license="BSD",
     setup_requires=[ "setuptools_git >= 1.2", ],
-    scripts=['win32_pyxrd_post_install.py'],
     packages=find_packages(exclude=["test.*", "test", "tests_mvc", "tests_mvc.*"]),
     include_package_data=True,
     install_requires=get_install_requires(),