Fix build on appveyor + Windows

This includes using dirname(abspath(__file__)), otherwise dirname returns empty string (!) on Windows.
equinor · Nov 5, 2018 · be19714 · be19714
1 parent 90ac195
commit be19714
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,5 @@
 version: 1.0.{build}
 
-clone_depth: 1
-
 configuration:
     - Release
 
@@ -33,6 +31,7 @@ install:
                                     pytest
                                     pytest-runner
                                     setuptools
+                                    setuptools_scm
                                     pybind11
                                     hypothesis
                                     twine
@@ -51,15 +50,12 @@ build_script:
             -DCMAKE_CXX_FLAGS=/D_CRT_SECURE_NO_WARNINGS
     - cmake --build .
             --config %configuration%
-    - ps: |
-          popd
-          pushd python
-          python setup.py bdist_wheel
-          popd
-
-test_script:
-    - ps: pushd build
-    - ctest --build-config %configuration% --output-on-failure
+    - ctest --build-config %configuration%
+            --output-on-failure
+    - ps: popd
+    - ps: pushd python
+    - git describe
+    - IF DEFINED PYTHON python setup.py bdist_wheel
     - ps: popd
 
 before_deploy:

diff --git a/python/setup.py b/python/setup.py
@@ -41,10 +41,11 @@ def build_extensions(self):
 
 def getversion():
     if os.path.isdir('.git'):
+        print('Getversion == True')
         return True
 
     return {
-        'relative_to': os.path.dirname(__file__),
+        'relative_to': os.path.dirname(os.path.abspath(__file__)),
     }
 
 setup(