switch to hgversion

4 files changed, 3 insertions, 35 deletions

diff --git a/setup.py b/setup.py
index 0a84aa2..fe36244 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
 from setuptools import setup
-import version_detect
+import hgvers
 
 setup(
     name = "urllib2_kerberos",
-    version = version_detect.version,
-    py_modules = [ 'urllib2_kerberos' ],
+    version = hgvers.version,
+    py_modules = [ 'urllib2_kerberos', 'hgvers' ],
 
 #    install_requires = ['kerberos'],
 
diff --git a/version_detect/__init__.py b/version_detect/__init__.py
deleted file mode 100644
index 2eb889b..0000000
--- a/version_detect/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from version import version
diff --git a/version_detect/hg_keywords.py b/version_detect/hg_keywords.py
deleted file mode 100644
index edc9bae..0000000
--- a/version_detect/hg_keywords.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import re
-
-keyword_rx = re.compile('^\$(\w+)\:\s+(\S*)\s*\$$')
-
-# returns tuple (key, value)
-# returns None if kwstring is not a keyword expansion
-def extract_keyvalue(kwstring):
-    mo = keyword_rx.match(kwstring)
-    if mo is None: return None
-
-    try:
-        return mo.group(1,2)
-    except IndexError:
-        return None
-
-
-    
-def keywords(*kwstrings):
-    keyvalues = [extract_keyvalue(kws) for kws in kwstrings]
-    compacted_keyvalues = [kv for kv in keyvalues if kv is not None]
-    return dict(compacted_keyvalues)
diff --git a/version_detect/version.py b/version_detect/version.py
deleted file mode 100644
index f9efac4..0000000
--- a/version_detect/version.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import hg_keywords
-
-keywords = hg_keywords.keywords(
-    "$branches$",
-    "$node$",
-    "$rev$",
-    "$tags$"
-    )
-
-version = "dev_%s_%s" % tuple([keywords[x] for x in 'rev', 'node'])