Fixing pypi upload (#91)

* Fixing pypi upload

* Fixing regexp to find patch group as well

* Remove SHA part from the regexp due. Can't use PEP 440 local versions

* Add post release capability

Author: gabor-boros

Makefile

@@ -66,7 +66,7 @@ install-db:
 upload-coverage:
 	@sh scripts/upload-coverage.sh
 
-upload-pypi:
+upload-pypi: prepare
 	@sh scripts/upload-pypi.sh
 
 clean:

setup.py

@@ -30,17 +30,19 @@
 from rethinkdb.version import VERSION
 
 RETHINKDB_VERSION_DESCRIBE = os.environ.get("RETHINKDB_VERSION_DESCRIBE")
-VERSION_RE = r"^v(?P<version>\d+\.\d+)\.0(-(?P<patch>\d+))?(-(?P<sha>\w+))?$"
+VERSION_RE = r"^v(?P<version>\d+\.\d+)\.(?P<patch>\d+)?(\.(?P<post>\w+))?$"
 
 if RETHINKDB_VERSION_DESCRIBE:
     MATCH = re.match(VERSION_RE, RETHINKDB_VERSION_DESCRIBE)
 
     if MATCH:
         VERSION = MATCH.group("version")
+
         if MATCH.group("patch"):
             VERSION += "." + MATCH.group("patch")
-        if MATCH.group("sha"):
-            VERSION += "+" + MATCH.group("sha").lower()
+
+        if MATCH.group("post"):
+            VERSION += "." + MATCH.group("post")
 
         with open("rethinkdb/version.py", "w") as ostream:
             print("# Autogenerated version", file=ostream)