Build system update for 0.10.1 dev (#22)

* Workaround for conda-build using separate win32 and win64 environments; closes #20
* Enable CI on all commits
* Disable conda-build on non-tagged commits
* Cache downloaded dependencies on AppVeyor
* Increment version

Author: PMeira

README.md

@@ -8,7 +8,7 @@ Python bindings and misc tools for using OpenDSS (EPRI Distribution System Simul
 
 If you are looking for the custom OpenDSS C-API library, see [`DSS C-API`](http://github.com/dss-extensions/dss_capi/).
 
-Version 0.10.0, based on OpenDSS revision 2395. While we plan to add a lot more funcionality into DSS Python, the main goal of creating a COM-compatible API has been reached.
+Version 0.10.1, based on OpenDSS revision 2504. While we plan to add a lot more funcionality into DSS Python, the main goal of creating a COM-compatible API has been reached.
 
 This module mimics the COM structure (as exposed via `win32com` or `comtypes`), effectively enabling multi-platform compatibility at Python level.
 Most of the COM documentation can be used as-is, but instead of returning tuples or lists, this modules returns/accepts NumPy arrays for numeric data exchange. 
@@ -19,7 +19,8 @@ If you are not bound to the COM API and its quirks, you might be insterested in
 
 ## Recent changes
 
-- **2018-11-17 / version 0.10.0: Lots of changes, fixes and new features. Check the new [changelog](docs/changelog.md#0100) document for a list.**
+- **2019-02-17 / version 0.10.1: Under development. Check the new [changelog](docs/changelog.md#0101) document for a list.**
+- 2018-11-17 / version 0.10.0: Lots of changes, fixes and new features. Check the new [changelog](docs/changelog.md#0100) document for a list.
 - 2018-08-12 / version 0.9.8: Reorganize modules (v7 and v8), adds 8 missing methods and new backend methods for OpenDSSDirect.py v0.3+. Integrates many fixes from DSS_CAPI and the upstream OpenDSS.
 - 2018-04-30 / version 0.9.7: Fix some of the setters that used array data.
 - 2018-04-05 / version 0.9.6: Adds missing `ActiveCircuit.CktElements[index]` (or `...CktElements(index)`) and `ActiveCircuit.Buses[index]` (or `...Buses(index)`).

appveyor.yml

@@ -1,10 +1,17 @@
 version: '{build}'
-skip_non_tags: true
-image: Previous Visual Studio 2017
+skip_non_tags: false
+image: Visual Studio 2017
 clone_folder: c:\projects\dss_python
+cache:
+  - c:\projects\VCForPython27.msi
+  - c:\projects\FPC-win32-win64-3.0.4.7z
+  - c:\projects\SuiteSparse-5.3.0.tar.gz
 environment:
   ANACONDA_API_TOKEN: 
     secure: 78d9aslKXYoP2gVc7p5A5BJj3bSDPd2kZjQAlvEd64cCcxaf185CexeDNYNeNPuU
+  matrix:
+    - CONDA_SUBDIR: win-32
+    - CONDA_SUBDIR: win-64
 
 build_script:
 - cmd: >-
@@ -14,9 +21,28 @@ build_script:
 
     git clone --branch 0.10.1 https://github.com/dss-extensions/dss_capi ../dss_capi
 
-    set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;c:\miniconda3-x64;c:\miniconda3-x64\scripts;%path%
+    set originalpath=%path%
+    
+    IF "%CONDA_SUBDIR%"=="win-32" SET MINICONDA_DIR=c:\miniconda3
+    
+    IF "%CONDA_SUBDIR%"=="win-64" SET MINICONDA_DIR=c:\miniconda3-x64
+    
+    set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
 
     c:\cygwin64\bin\bash ci/build_windows.sh
 
+    set path=c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+
+    %MINICONDA_DIR%\scripts\activate %MINICONDA_DIR%
+    
+    conda config --set always_yes yes
+    
+    IF DEFINED APPVEYOR_REPO_TAG_NAME conda-build --quiet --no-test --output-folder "c:\projects\artifacts" conda
+    
+    set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+
+    c:\cygwin64\bin\bash ci/upload_windows.sh
+
     dir ..\artifacts\*.whl ..\artifacts\*.tar.bz2 /s
+    
 test: off

ci/build_linux.sh

@@ -1,7 +1,5 @@
 set -e -x
 
-# This will run in the docker environment, we need to install CMake
-
 cd /io
 
 if [ ! -f /io/dss_capi/lib/linux_x64/libklusolve.so ]; then

ci/build_linux_conda.sh

@@ -1,18 +1,20 @@
-# Install Miniconda
-wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh -q
-bash miniconda.sh -b -p $HOME/miniconda
-export PATH="$HOME/miniconda/bin:$PATH"
-conda config --set always_yes yes --set changeps1 no
-conda install conda-build anaconda-client
-conda update -q conda-build
-#conda info -a
+if [ -n "$TRAVIS_TAG" ]; then # only run conda-build on tags, takes too long
+    # Install Miniconda
+    wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh -q
+    bash miniconda.sh -b -p $HOME/miniconda
+    export PATH="$HOME/miniconda/bin:$PATH"
+    conda config --set always_yes yes --set changeps1 no
+    conda install conda-build anaconda-client
+    conda update -q conda-build
+    #conda info -a
 
-# Build conda packages (no wheels with conda on Linux)
-export ARTIFACTS_FOLDER=`readlink -f ./artifacts`
-cd dss_python
-conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda 
+    # Build conda packages (no wheels with conda on Linux)
+    export ARTIFACTS_FOLDER=`readlink -f ./artifacts`
+    cd dss_python
+    conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda 
 
-# Upload artifacts to anaconda.org
-if [ -n "$ANACONDA_API_TOKEN" ]; then 
-    find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
+    # Upload artifacts to anaconda.org
+    if [ -n "$ANACONDA_API_TOKEN" ]; then 
+        find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
+    fi
 fi

ci/build_osx.sh

@@ -50,7 +50,9 @@ for PYVERSION in 2.7 3.4 3.5 3.6 3.7; do
 done
 
 # Build conda packages
-conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda 
+if [ -n "$TRAVIS_TAG" ]; then  # only run conda-build on tags, takes too long
+    conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda 
+fi
 
 # # Build wheels with conda
 # # (if we keep the output section always, the default package
@@ -62,6 +64,8 @@ conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda
 # git checkout conda/meta.yaml
 
 # Upload artifacts to anaconda.org
-if [ -n "$ANACONDA_API_TOKEN" ]; then 
-    find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
+if [ -n "$TRAVIS_TAG" ]; then
+    if [ -n "$ANACONDA_API_TOKEN" ]; then 
+        find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
+    fi
 fi

ci/build_windows.sh

@@ -1,52 +1,65 @@
 set -e -x
 
 WGET=wget
+ln -s /cygdrive/c /c
 
 cd ..
 export ARTIFACTS_FOLDER=`cygpath -a -w ./artifacts`
 
 # Install Visual Studio Compiler for Python 2.7
 #choco install -y vcpython27 
+if [ ! -f "/c/projects/VCForPython27.msi" ]; then
+    $WGET https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -q -O /c/projects/VCForPython27.msi
+fi
 cd dss_python/ci
-$WGET https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -q
 cmd "/c install_vcforpython27.bat"
-rm -rf VCForPython27.msi
+# rm -rf /c/projects/VCForPython27.msi
 cd ../..
 
-
 # Install the FreePascal compiler
-$WGET https://sourceforge.net/projects/dss-capi/files/FPC/FPC-win32-win64-3.0.4.7z/download -O FPC-win32-win64-3.0.4.7z -q
-7z x -oC:/ FPC-win32-win64-3.0.4.7z
+if [ ! -f "/c/projects/FPC-win32-win64-3.0.4.7z" ]; then
+    $WGET https://sourceforge.net/projects/dss-capi/files/FPC/FPC-win32-win64-3.0.4.7z/download -q -O /c/projects/FPC-win32-win64-3.0.4.7z
+fi    
+7z x -oC:/ c:/projects/FPC-win32-win64-3.0.4.7z
+    
 export PATH="$PATH:/c/FPC/3.0.4/bin/i386-win32"
 export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
 
 
 # Download SuiteSparse (once, otherwise the CMake script will download it multiple times)
-$WGET http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.3.0.tar.gz -O suitesparse.tar.gz -q
-tar zxf suitesparse.tar.gz
+if [ ! -f "/c/projects/SuiteSparse-5.3.0.tar.gz" ]; then
+    $WGET http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.3.0.tar.gz -O /c/projects/SuiteSparse-5.3.0.tar.gz -q
+fi
+tar zxf /c/projects/SuiteSparse-5.3.0.tar.gz
 export SUITESPARSE_SRC=`cygpath -a -w ./SuiteSparse`
 
 BUILD_WHEELS=1
 if [ "$BUILD_WHEELS" == "1" ]; then
     # Build KLUSolve
-    mkdir dss_capi/klusolve/build_x86
-    mkdir dss_capi/klusolve/build_x64
-
-    ## x86
-    cd dss_capi/klusolve/build_x86
-    cmake .. -DUSE_SYSTEM_SUITESPARSE=OFF -G"Visual Studio 15 2017"
-    cmake --build . --config Release
+    if [ "$CONDA_SUBDIR" == "win-32" ]; then
+        ## x86
+        mkdir dss_capi/klusolve/build_x86
+        cd dss_capi/klusolve/build_x86
+        cmake .. -DUSE_SYSTEM_SUITESPARSE=OFF -G"Visual Studio 15 2017"
+        cmake --build . --config Release
+    else
+        ## x64
+        mkdir dss_capi/klusolve/build_x64
+        cd dss_capi/klusolve/build_x64
+        cmake .. -DUSE_SYSTEM_SUITESPARSE=OFF -G"Visual Studio 15 2017 Win64"
+        cmake --build . --config Release
+    fi
 
-    ## x64
-    cd ../build_x64
-    cmake .. -DUSE_SYSTEM_SUITESPARSE=OFF -G"Visual Studio 15 2017 Win64"
-    cmake --build . --config Release
 
     # Build DSS C-API
     cd ../..
     bash ./make_metadata.sh
-    cmd "/c build_win_x86.bat"
-    cmd "/c build_win_x64.bat"
+    if [ "$CONDA_SUBDIR" == "win-32" ]; then
+        cmd "/c build_win_x86.bat"
+    else
+        cmd "/c build_win_x64.bat"
+    fi
+    
     cd ..
 
 
@@ -57,7 +70,12 @@ if [ "$BUILD_WHEELS" == "1" ]; then
         cd dss_python
 
         # Python 27 is kept last since we rebuild klusolve for it
-        PYTHON_VERSIONS="35 36 37 27"
+        if [ "$CONDA_SUBDIR" == "win-32" ]; then
+            PYTHON_VERSIONS="35 36 37 27"
+        else
+            PYTHON_VERSIONS="35-x64 36-x64 37-x64 27-x64"
+        fi
+        
         for A in $PYTHON_VERSIONS
         do
             if [ "$A" == "27" ]; then
@@ -67,22 +85,17 @@ if [ "$BUILD_WHEELS" == "1" ]; then
                 cd "$OLD_DIR"
             fi
 
-            echo Building for Python $A x86...
+            echo Building for Python $A $CONDA_SUBDIR...
             c:/Python${A}/scripts/pip install cffi wheel
             rm -rf .eggs build
             c:/Python${A}/python setup.py --quiet bdist_wheel --dist-dir="$ARTIFACTS_FOLDER"
-            
-            echo Building for Python $A x64...
-            c:/Python${A}-x64/scripts/pip install cffi wheel
-            rm -rf .eggs build
-            c:/Python${A}-x64/python setup.py --quiet bdist_wheel --dist-dir="$ARTIFACTS_FOLDER"
         done
 
         # Add Miniconda to PATH and install conda-build
         # export PATH="/c/miniconda3-x64:/c/miniconda3-x64/scripts:$PATH"
         conda config --set always_yes yes
         conda install conda-build anaconda-client
-        conda update -q conda-build
+        # conda update -q conda-build
     else
         # Install Miniconda
         cd dss_python/ci
@@ -93,21 +106,15 @@ if [ "$BUILD_WHEELS" == "1" ]; then
         export PATH="/c/miniconda:/c/miniconda/scripts:$PATH"
         conda config --set always_yes yes
         conda install conda-build anaconda-client
-        conda update -q conda-build
-        #conda update -q conda
-        #conda info -a
+        # conda update -q conda-build
+        # conda update -q conda
+        # conda info -a
 
         PYTHON_VERSIONS="2.7 3.5 3.6 3.7"
+        
         for A in $PYTHON_VERSIONS
         do
-            echo Building for Python $A x86...
-            export CONDA_FORCE_32BIT=1
-            conda create -p ../py${A}_x86 python=$A cffi
-            rm -rf .eggs build
-            ../py$A_x86/python setup.py --quiet bdist_wheel --dist-dir="$ARTIFACTS_FOLDER"
-            
-            echo Building for Python $A x64...
-            export CONDA_FORCE_32BIT=
+            echo Building for Python $A $CONDA_SUBDIR...
             conda create -p ../py${A} python=$A cffi
             rm -rf .eggs build
             ../py$A/python setup.py --quiet bdist_wheel --dist-dir="$ARTIFACTS_FOLDER"
@@ -129,30 +136,30 @@ else
     fi
     conda config --set always_yes yes
     conda install conda-build anaconda-client
-    conda update -q conda-build
+    # conda install -q conda-build=3.10.9
 fi # BUILD_WHEELS
 
-# Build conda packages
-export CONDA_FORCE_32BIT=1
-conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda
-export CONDA_FORCE_32BIT=
-conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda
-
-# # Build wheels with conda
-# # (if we keep the output section always, the default package
-# # is ignored, uses wrong names, etc.)
-# rm -rf conda_wheels
-# cp -R conda conda_wheels
-# cat conda/meta_wheels.yaml >> conda_wheels/meta.yaml
-# export CONDA_FORCE_32BIT=1
-# conda-build --output-folder ../artifacts conda_wheels
-# export CONDA_FORCE_32BIT=
-# conda-build --output-folder ../artifacts conda_wheels
-
-# # undo the change, just in case
-# git checkout conda/meta.yaml
-
-if [ -n "$ANACONDA_API_TOKEN" ]; then 
-    echo Upload artifacts to anaconda.org...
-    find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
-fi
+# # Build conda packages
+# export CONDA_SUBDIR=win-32
+# conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda
+# export CONDA_SUBDIR=win-64
+# conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda
+
+# # # Build wheels with conda
+# # # (if we keep the output section always, the default package
+# # # is ignored, uses wrong names, etc.)
+# # rm -rf conda_wheels
+# # cp -R conda conda_wheels
+# # cat conda/meta_wheels.yaml >> conda_wheels/meta.yaml
+# # export CONDA_SUBDIR=win-32
+# # conda-build --output-folder ../artifacts conda_wheels
+# # export CONDA_SUBDIR=win-64
+# # conda-build --output-folder ../artifacts conda_wheels
+
+# # # undo the change, just in case
+# # git checkout conda/meta.yaml
+
+# if [ -n "$ANACONDA_API_TOKEN" ]; then 
+    # echo Upload artifacts to anaconda.org...
+    # find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
+# fi

ci/install_vcforpython27.bat

@@ -1 +1 @@
-msiexec /i %cd%\VCForPython27.msi /quiet /qn /norestart ALLUSERS=1
+msiexec /i c:\projects\VCForPython27.msi /quiet /qn /norestart ALLUSERS=1

ci/upload_windows.sh

@@ -0,0 +1,6 @@
+if [ -n "$APPVEYOR_REPO_TAG_NAME" ]; then
+    if [ -n "$ANACONDA_API_TOKEN" ]; then 
+        echo Upload artifacts to anaconda.org...
+        find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
+    fi
+fi

conda/bld.bat

@@ -1,7 +1,7 @@
 set BLD_PREV_DIR=%cd%
 set BLD_PREV_PATH=%path%
-set ELECTRICDSS_SRC_VERSION=0.10.0
-set DSS_CAPI_VERSION=0.10.0
+set ELECTRICDSS_SRC_VERSION=0.10.1
+set DSS_CAPI_VERSION=0.10.1
 
 REM Clone dependency repositories
 if not exist ..\electricdss-src (

conda/build.sh

@@ -1,7 +1,7 @@
 BLD_PREV_DIR=`pwd`
 BLD_PREV_PATH=$PATH
-ELECTRICDSS_SRC_VERSION=0.10.0
-DSS_CAPI_VERSION=0.10.0
+ELECTRICDSS_SRC_VERSION=0.10.1
+DSS_CAPI_VERSION=0.10.1
 
 echo "Building in $BLD_PREV_DIR"