Testing

sci-visus · Nov 18, 2018 · 11bced4 · 11bced4
1 parent 904a15b
commit 11bced4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -19,8 +19,10 @@ environment:
     secure: 6DHH80JPNRCtIYxWc/h88Q==   
   matrix:
     - PYTHON_EXECUTABLE: C:/Python37-x64/python.exe 
+      PYTHON_VERSION: 37
       DEFAULT_ENABLED: true  
-    - PYTHON_EXECUTABLE: C:/Python36-x64/python.exe
+    - PYTHON_EXECUTABLE: C:/Python36-x64/python.exe 
+      PYTHON_VERSION: 36
       DEFAULT_ENABLED: false
 
 # enable cache for vcpkg

diff --git a/.travis.yml b/.travis.yml
@@ -74,8 +74,8 @@ script:
      if [[ "${TRAVIS_TAG}" != "" ]]; then
         echo "Doing deploy to github..."
         cmake --build ./ --target sdist --config ${CMAKE_BUILD_TYPE}
-        SDIST_FILE=$(find ./install/dist -iname "*.tar.gz")
-        mv ${SDIST_FILE} ${SDIST_FILE/.tar.gz/.${OS_NAME}_${OS_VERSION}.tar.gz}
+        __file__=$(find ./install/dist -iname "*.tar.gz")
+        mv ${__file__} ${__file__/.tar.gz/-${PYTHON_VERSION}-${OS_NAME}_${OS_VERSION}.tar.gz}
      fi
      if [[ "${DEPLOY_PYPI_ENABLED}" == "1" && "${TRAVIS_TAG}" != "" ]] ; then 
         echo "Doing deploy to pypi..."

diff --git a/CMake/build_win.bat b/CMake/build_win.bat
@@ -26,13 +26,13 @@ cmake ^
 
 cmake --build . --target ALL_BUILD --config RelWithDebInfo
 cmake --build . --target RUN_TESTS --config RelWithDebInfo
-cmake --build . --target INSTALL       --config RelWithDebInfo
-cmake --build . --target deploy        --config RelWithDebInfo
+cmake --build . --target INSTALL   --config RelWithDebInfo
+cmake --build . --target deploy    --config RelWithDebInfo
 
 if %DEPLOY_GITHUB%==1 (
    echo "Deploying to github enabled"
    cmake --build . --target sdist --config RelWithDebInfo
-   "%PYTHON_EXECUTABLE%" -c "import os;import glob;filename=glob.glob('install/dist/*.zip')[0];os.rename(filename,filename.replace('.zip','.win_amd64.zip'))" 
+   "%PYTHON_EXECUTABLE%" -c "import os;import glob;filename=glob.glob('install/dist/*.zip')[0];os.rename(filename,filename.replace('.zip','-%PYTHON_VERSION%-win_amd64.zip'))" 
 )
 
 if %DEPLOY_PYPI%==1 (

diff --git a/CMake/setup.py b/CMake/setup.py
@@ -4,7 +4,7 @@
 import glob
 
 #increase this number for PIP
-VERSION="1.2.76"
+VERSION="1.2.77"
 
 
 # ////////////////////////////////////////////////////////////////////