Repackage unstable release for 0.4.2 cd3ee1c

Author: dahlia

docs/changes.rst

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+Unstable version 0.4.2.20140529.cd3ee1cbe3
+------------------------------------------
+
+Released on May 29, 2014.
+
+- Version scheme changed to use periods (``.``) instead of hyphens (``-``)
+  due to setuptools seems to treat hyphens special.
+- Fixed malformed packaging that doesn't correctly preserve the package name
+  and version.
+
+
 Unstable Version 0.4.2-20140528-cd3ee1cbe3
 ------------------------------------------
 

release-unstable.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+commit=$1
+if [[ "$commit" = "" ]]; then
+  echo "missing argument: commit sha1" 1>&2
+  exit 1
+fi
+git show -q $commit || exit 1
+echo $commit > .unstable-release
+echo include .unstable-release >> MANIFEST.in
+python setup.py sdist upload
+git checkout MANIFEST.in
+rm .unstable-release

setup.py

@@ -100,20 +100,15 @@ def version(sass_filename='sass.py'):
                 return node.value.s
 
 
-def current_branch():
-    if os.path.isdir('.git'):
-        try:
-            with os.popen('git branch') as f:
-                for line in f:
-                    line = line.strip()
-                    if line.startswith('*'):
-                        return line.split()[1]
-        except (IOError, OSError):
-            pass
-    return
+def get_unstable_commit():
+    try:
+        with open('.unstable-release') as f:
+            return f.read().strip() or None
+    except (IOError, OSError):
+        return
 
 
-unstable = current_branch() == 'unstable'
+unstable_commit = get_unstable_commit()
 
 
 def readme():
@@ -153,11 +148,12 @@ def run(self):
 
 
 setup(
-    name='libsass' + ('-unstable' if unstable else ''),
+    name='libsass' + ('-unstable' if unstable_commit else ''),
     description='SASS for Python: '
                 'A straightforward binding of libsass for Python.',
     long_description=readme(),
-    version=version() + (time.strftime('-%Y%m%d') if unstable else ''),
+    version=version() + (time.strftime('.%Y%m%d.') + unstable_commit
+                         if unstable_commit else ''),
     ext_modules=[sass_extension],
     packages=['sassutils'],
     py_modules=['sass', 'sassc', 'sasstests'],