Merge pull request #515 from notoraptor/fix-version

Fix versionning for auto-generated conda packages

Author: nouiz

.appveyor.yml

@@ -33,6 +33,7 @@ build: off
 
 test_script:
   - cmd: for /f "tokens=*" %%i in ('python -c "import versioneer; print(versioneer.get_version())"') do set GPUARRAY_VERSION=%%i
+  - cmd: echo %GPUARRAY_VERSION%
   - cmd: conda build conda
   - cmd: mkdir pkgs
   - cmd: xcopy "%CONDA_LOC%"\conda-bld\win-64\pygpu* pkgs\ /Y

.gitignore

@@ -3,6 +3,7 @@ build
 Debug
 Release
 lib
+.idea
 .*.sw[po]
 *~
 *.pyc

versioneer.py

@@ -1046,10 +1046,15 @@ 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)
-    describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
-                                          "--always", "--long",
-                                          "--match", "%s*" % tag_prefix],
-                                   cwd=root)
+    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)
     # --long was added in git-1.5.5
     if describe_out is None:
         raise NotThisMethod("'git describe' failed")