Permalink
Browse files

Tidy up deployment version stuff

  • Loading branch information...
dbr committed Apr 16, 2012
1 parent c1e57b4 commit 2b66f49602266ab4bfd7b67f9f6e95bb115265a0
Showing with 13 additions and 4 deletions.
  1. +3 −2 fabfile.py
  2. +9 −1 setup.py
  3. +1 −1 tvnamer/__init__.py
View
@@ -6,7 +6,7 @@
pep8_disable = ",".join(["E501"])
-@task(default=True)
+@task
def pyflakes():
local("pyflakes .")
@@ -32,8 +32,9 @@ def topypi():
sys.path.insert(0, ".")
import tvnamer
version = tvnamer.__version__
+ tvnamer_version = ".".join(str(x) for x in version)
- msg = "Upload tvnamer {0} to PyPi?".format(".".join(str(x) for x in version))
+ msg = "Upload tvnamer {0} to PyPi?".format(tvnamer_version)
if not confirm(msg, default = False):
print "Cancelled"
return
View
@@ -1,6 +1,14 @@
"""Setup tools for tvnamer,
"""
+import os
+import sys
+
+# Ensure dir containing script is on PYTHONPATH
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from tvnamer import __version__
+
needed_pkgs = []
try:
@@ -14,7 +22,7 @@
from setuptools import setup
setup(
name = 'tvnamer',
-version='2.2',
+version=__version__,
author='dbr/Ben',
description='Automatic TV episode namer',
View
@@ -6,5 +6,5 @@
"some.show.name.s01e01.blah.avi" to "Some Show Name - [01x01] - The First.avi"
"""
-__version__ = (2, 2)
+__version__ = (2, 2, 1)
__author__ = "dbr/Ben"

0 comments on commit 2b66f49

Please sign in to comment.