Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
mathijs-dumon committed Jun 14, 2018
1 parent 889aa9d commit ad97d21
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 19 deletions.
8 changes: 8 additions & 0 deletions 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
Expand Down
4 changes: 2 additions & 2 deletions bump_version_to.py
Expand Up @@ -12,12 +12,12 @@ 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])

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]])
13 changes: 0 additions & 13 deletions compile_bundle.py

This file was deleted.

2 changes: 1 addition & 1 deletion mvc/__version.py
Expand Up @@ -24,7 +24,7 @@
# Boston, MA 02110, USA.
# -------------------------------------------------------------------------

__version__ = ""
__version__ = "0.8.1"



Expand Down
2 changes: 1 addition & 1 deletion pyxrd/__version.py
Expand Up @@ -5,7 +5,7 @@
# All rights reserved.
# Complete license can be found in the LICENSE file.

__version__ = ""
__version__ = "0.8.1"



Expand Down
5 changes: 3 additions & 2 deletions setup.py
Expand Up @@ -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 [
Expand Down Expand Up @@ -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(),
Expand Down

0 comments on commit ad97d21

Please sign in to comment.