Merge pull request #519 from notoraptor/test-other-version-fix

Test another possible fix for versionning

Author: abergeron

conda/pygpu/meta.yaml

@@ -13,9 +13,6 @@ build:
 
 requirements:
   build:
-    - m2-git         [win]
-    - m2-filesystem  [win]
-    - git            [not win]
     - python
     - cython >=0.25
     - numpy 1.11

versioneer.py

@@ -1046,15 +1046,10 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
 
     # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
     # if there isn't one, this yields HEX[-dirty] (no NUM)
-    if sys.platform == 'win32':
-        describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
-                                              "--always", "--long"],
-                                       cwd=root)
-    else:
-        describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
-                                              "--always", "--long",
-                                              "--match", "%s*" % tag_prefix],
-                                       cwd=root)
+    describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
+                                          "--always", "--long",
+                                          "--match", "%s*" % tag_prefix],
+                                   cwd=root)
     # --long was added in git-1.5.5
     if describe_out is None:
         raise NotThisMethod("'git describe' failed")