Skip to content
This repository
Browse code

Tidy up deployment version stuff

  • Loading branch information...
commit 2b66f49602266ab4bfd7b67f9f6e95bb115265a0 1 parent c1e57b4
dbr/Ben authored April 16, 2012
5  fabfile.py
@@ -6,7 +6,7 @@
6 6
 pep8_disable = ",".join(["E501"])
7 7
 
8 8
 
9  
-@task(default=True)
  9
+@task
10 10
 def pyflakes():
11 11
     local("pyflakes .")
12 12
 
@@ -32,8 +32,9 @@ def topypi():
32 32
     sys.path.insert(0, ".")
33 33
     import tvnamer
34 34
     version = tvnamer.__version__
  35
+    tvnamer_version = ".".join(str(x) for x in version)
35 36
 
36  
-    msg = "Upload tvnamer {0} to PyPi?".format(".".join(str(x) for x in version))
  37
+    msg = "Upload tvnamer {0} to PyPi?".format(tvnamer_version)
37 38
     if not confirm(msg, default = False):
38 39
         print "Cancelled"
39 40
         return
10  setup.py
... ...
@@ -1,6 +1,14 @@
1 1
 """Setup tools for tvnamer,
2 2
 """
3 3
 
  4
+import os
  5
+import sys
  6
+
  7
+# Ensure dir containing script is on PYTHONPATH
  8
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
  9
+
  10
+from tvnamer import __version__
  11
+
4 12
 needed_pkgs = []
5 13
 
6 14
 try:
@@ -14,7 +22,7 @@
14 22
 from setuptools import setup
15 23
 setup(
16 24
 name = 'tvnamer',
17  
-version='2.2',
  25
+version=__version__,
18 26
 
19 27
 author='dbr/Ben',
20 28
 description='Automatic TV episode namer',
2  tvnamer/__init__.py
@@ -6,5 +6,5 @@
6 6
 "some.show.name.s01e01.blah.avi" to "Some Show Name - [01x01] - The First.avi"
7 7
 """
8 8
 
9  
-__version__ = (2, 2)
  9
+__version__ = (2, 2, 1)
10 10
 __author__ = "dbr/Ben"

0 notes on commit 2b66f49

Please sign in to comment.
Something went wrong with that request. Please try again.