Merge pull request #171 from santoshphilip/i170_develop

I170 develop

.coveragerc

@@ -1,7 +1,8 @@
 # .coveragerc to control coverage.py
 [run]
 # don't report on coverage of files in the tests dir itself
-omit = 
+omit =
+  venv/*
   eppy/tests/*
   eppy/iddv*
   eppy/Main_Tutorial.py

.travis.yml

@@ -8,10 +8,15 @@ dist: trusty
 sudo: required 
 
 env:
+  - PYTHON=2.7 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.8.0 ENERGYPLUS_SHA=7c3bbe4830 ENERGYPLUS_INSTALL_VERSION=8-8-0
+  - PYTHON=3.5 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.8.0 ENERGYPLUS_SHA=7c3bbe4830 ENERGYPLUS_INSTALL_VERSION=8-8-0
+  - PYTHON=3.6 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.8.0 ENERGYPLUS_SHA=7c3bbe4830 ENERGYPLUS_INSTALL_VERSION=8-8-0
   - PYTHON=2.7 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.7.0 ENERGYPLUS_SHA=78a111df4a ENERGYPLUS_INSTALL_VERSION=8-7-0
   - PYTHON=3.5 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.7.0 ENERGYPLUS_SHA=78a111df4a ENERGYPLUS_INSTALL_VERSION=8-7-0
+  - PYTHON=3.6 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.7.0 ENERGYPLUS_SHA=78a111df4a ENERGYPLUS_INSTALL_VERSION=8-7-0
   - PYTHON=2.7 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.6.0 ENERGYPLUS_SHA=198c6a3cff ENERGYPLUS_INSTALL_VERSION=8-6-0
   - PYTHON=3.5 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.6.0 ENERGYPLUS_SHA=198c6a3cff ENERGYPLUS_INSTALL_VERSION=8-6-0
+  - PYTHON=3.6 EPPY_INTEGRATION=True ENERGYPLUS_VERSION=8.6.0 ENERGYPLUS_SHA=198c6a3cff ENERGYPLUS_INSTALL_VERSION=8-6-0
 
 before_install:
   # install EnergyPlus

appveyor.yml

@@ -1,60 +1,115 @@
-environment:
+build: false
+
+matrix:
+  fast_finish: true
 
+environment:
   matrix:
     - PYTHON: "C:\\Python27"
+      PYTHONVERSION: 2.7
       ARCHITECTURE: "i386"
-    - PYTHON: "C:\\Python27-x64" 
+      MINICONDA: "C:\\Miniconda"
+      ENERGYPLUS_VERSION: "8.8.0"
+      ENERGYPLUS_SHA: "7c3bbe4830"
+    - PYTHON: "C:\\Python27-x64"
+      PYTHONVERSION: 2.7
       ARCHITECTURE: "x86_64"
-    - PYTHON: "C:\\Python35" 
+      MINICONDA: "C:\\Miniconda"
+      ENERGYPLUS_VERSION: "8.8.0"
+      ENERGYPLUS_SHA: "7c3bbe4830"
+    - PYTHON: "C:\\Python35"
+      PYTHONVERSION: 3.5
       ARCHITECTURE: "i386"
+      MINICONDA: "C:\\Miniconda35"
+      ENERGYPLUS_VERSION: "8.8.0"
+      ENERGYPLUS_SHA: "7c3bbe4830"
     - PYTHON: "C:\\Python35-x64"
+      PYTHONVERSION: 3.5
       ARCHITECTURE: "x86_64"
+      MINICONDA: "C:\\Miniconda35-x64"
+      ENERGYPLUS_VERSION: "8.8.0"
+      ENERGYPLUS_SHA: "7c3bbe4830"
+    - PYTHON: "C:\\Python36"
+      PYTHONVERSION: 3.6
+      ARCHITECTURE: "i386"
+      MINICONDA: "C:\\Miniconda36"
+      ENERGYPLUS_VERSION: "8.8.0"
+      ENERGYPLUS_SHA: "7c3bbe4830"
+    - PYTHON: "C:\\Python36-x64"
+      PYTHONVERSION: 3.6
+      ARCHITECTURE: "x86_64"
+      MINICONDA: "C:\\Miniconda36-x64"
+      ENERGYPLUS_VERSION: "8.8.0"
+      ENERGYPLUS_SHA: "7c3bbe4830"
+
+    - PYTHON: "C:\\Python27"
+      PYTHONVERSION: 2.7
+      ARCHITECTURE: "i386"
+      MINICONDA: "C:\\Miniconda"
+      ENERGYPLUS_VERSION: "8.7.0"
+      ENERGYPLUS_SHA: "78a111df4a"
+    - PYTHON: "C:\\Python27-x64"
+      PYTHONVERSION: 2.7
+      ARCHITECTURE: "x86_64"
+      MINICONDA: "C:\\Miniconda"
+      ENERGYPLUS_VERSION: "8.7.0"
+      ENERGYPLUS_SHA: "78a111df4a"
+    - PYTHON: "C:\\Python35"
+      PYTHONVERSION: 3.5
+      ARCHITECTURE: "i386"
+      MINICONDA: "C:\\Miniconda35"
+      ENERGYPLUS_VERSION: "8.7.0"
+      ENERGYPLUS_SHA: "78a111df4a"
+    - PYTHON: "C:\\Python35-x64"
+      PYTHONVERSION: 3.5
+      ARCHITECTURE: "x86_64"
+      MINICONDA: "C:\\Miniconda35-x64"
+      ENERGYPLUS_VERSION: "8.7.0"
+      ENERGYPLUS_SHA: "78a111df4a"
+    - PYTHON: "C:\\Python36"
+      PYTHONVERSION: 3.6
+      ARCHITECTURE: "i386"
+      MINICONDA: "C:\\Miniconda36"
+      ENERGYPLUS_VERSION: "8.7.0"
+      ENERGYPLUS_SHA: "78a111df4a"
+    - PYTHON: "C:\\Python36-x64"
+      PYTHONVERSION: 3.6
+      ARCHITECTURE: "x86_64"
+      MINICONDA: "C:\\Miniconda36-x64"
+      ENERGYPLUS_VERSION: "8.7.0"
+      ENERGYPLUS_SHA: "78a111df4a"
 
 install:
+  # set up Miniconda test environment
+  - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
+  - conda config --set always_yes yes --set changeps1 no
+  - conda info -a
+  - conda update -q conda
+  - "conda create -n test-env python=%PYTHONVERSION% pytest lxml"
+  - "activate test-env"
+
   - ECHO "Filesystem root:"
   - ps: "ls \"C:/\""
 
   - ECHO "Installed SDKs:"
   - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
-
   # install EnergyPlus
   - ECHO "Installing EnergyPlus"
-  - ps: $env:ENERGYPLUS_VERSION = "8.7.0"
-  - ps: $env:ENERGYPLUS_TAG = "v8.7.0"
-  - ps: $env:ENERGYPLUS_SHA = "78a111df4a"
-  - ps: $env:ENERGYPLUS_INSTALL_VERSION = "8-7-0"
-  - ps: $env:ENERGYPLUS_DOWNLOAD_BASE_URL = "https://github.com/NREL/EnergyPlus/releases/download/$env:ENERGYPLUS_TAG"
+  - ps: $env:ENERGYPLUS_INSTALL_VERSION = $env:ENERGYPLUS_VERSION -replace '\.','-'
+  - ps: $env:ENERGYPLUS_DOWNLOAD_BASE_URL = "https://github.com/NREL/EnergyPlus/releases/download/v$env:ENERGYPLUS_VERSION"
   - ps: $env:ENERGYPLUS_DOWNLOAD_FILENAME = "EnergyPlus-$env:ENERGYPLUS_VERSION-$env:ENERGYPLUS_SHA-Windows-$env:ARCHITECTURE.exe"
   - ps: $env:ENERGYPLUS_DOWNLOAD_URL = "$env:ENERGYPLUS_DOWNLOAD_BASE_URL/$env:ENERGYPLUS_DOWNLOAD_FILENAME"
 
   - ps: "curl $env:ENERGYPLUS_DOWNLOAD_URL -OutFile $env:TMP\\$env:ENERGYPLUS_DOWNLOAD_FILENAME"
   - ps: "& $env:TMP\\$env:ENERGYPLUS_DOWNLOAD_FILENAME /S | Out-Null"
 
-  # Install Python (from the official .msi of http://python.org) and pip when
-  # not already installed.
-  - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
-
-  # Prepend newly installed Python to the PATH of this build (this cannot be
-  # done from inside the powershell script as it would require to restart
-  # the parent CMD process).
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-
-  # Check that we have the expected version and architecture for Python
-  - "python --version"
-  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-
-  # Upgrade to the latest version of pip to avoid it displaying warnings
-  # about it being out of date.
-  - "pip install --disable-pip-version-check --user --upgrade pip"
   - ps: echo $env:PYTHON
-  - "%PYTHON%\\python.exe -m pip install pytest"
+
   # set the integration test environment variable
   - "SET EPPY_INTEGRATION=TRUE"
   # install eppy
-  - "%PYTHON%\\python.exe setup.py install"
-
-build: off
+  - "python setup.py install"
 
 test_script:
   # Test command.
-  - "%PYTHON%\\python.exe -m pytest eppy -v"
+  - "python -m pytest eppy -v"