Merge 3dfb356 into ff2effc

.travis.yml

@@ -6,7 +6,8 @@ env: ARCHETYPAL_INTEGRATION=True ENERGYPLUS_VERSION=8.9.0 ENERGYPLUS_SHA=40101ea
 addons:
   apt:
     packages:
-      wine
+      - wine
+      - libgfortran3
 
 before_install:
   # install EnergyPlus
@@ -28,8 +29,9 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     sudo chmod +x $ENERGYPLUS_DOWNLOAD_FILENAME.$EXT;
     echo "y\r" | sudo ./$ENERGYPLUS_DOWNLOAD_FILENAME.$EXT;
-    sudo tar -C /usr/local/EnergyPlus-$ENERGYPLUS_INSTALL_VERSION/PreProcess/IDFVersionUpdater -xvf 8230;
-    sudo chmod -R a+rX /usr/local/EnergyPlus-$ENERGYPLUS_INSTALL_VERSION/PreProcess/IDFVersionUpdater/*; fi
+    sudo tar zxvf 8230 -C /usr/local/EnergyPlus-$ENERGYPLUS_INSTALL_VERSION/PreProcess/IDFVersionUpdater;
+    sudo chmod -R a+rwx /usr/local/EnergyPlus-$ENERGYPLUS_INSTALL_VERSION/PreProcess/IDFVersionUpdater;
+    sudo chmod -R a+rwx /usr/local/EnergyPlus-$ENERGYPLUS_INSTALL_VERSION/ExampleFiles; fi
   - if [ "$TRAVIS_OS_NAME" == "windows" ]; then
     sudo chmod +x $ENERGYPLUS_DOWNLOAD_FILENAME.$EXT;
     echo "y\r" | sudo ./$ENERGYPLUS_DOWNLOAD_FILENAME.$EXT; fi
@@ -42,14 +44,7 @@ before_install:
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
-  - conda config --set always_yes yes --set show_channel_urls true
-  - conda update -n base conda
-  - conda config --prepend channels conda-forge
-  - conda create -n archetypal python=$TRAVIS_PYTHON_VERSION
-  - conda env update -n archetypal -f environment.yml --prune
-  - conda install -n archetypal --file requirements-dev.txt
-  - source activate archetypal
-  - conda info --all
+  - pip install .[dev]
 
 install:
   - python setup.py install

MANIFEST.in

@@ -1,6 +1,7 @@
 # package_data is a low-down, dirty lie. It is only used when building binary packages (python setup.py bdist ...) but
 # not when building source packages (python setup.py sdist ...)
 
-include archetypal/templates/*
+include archetypal/ressources/*
+include archetypal/template/*
 include requirements.txt
 include requirements-dev.txt

archetypal/__init__.py

@@ -6,19 +6,27 @@
 ################################################################################
 
 # Version of the package
-__version__ = '1.2.6'
+__version__ = "1.2.6"
 # Latest version of EnergyPlus compatible with archetypal
-ep_version = '8-9-0'
+ep_version = "8-9-0"
 
 # warn if a newer version of archetypal is available
 from outdated import warn_if_outdated
-warn_if_outdated('archetypal', __version__)
+
+warn_if_outdated("archetypal", __version__)
 
 from .utils import *
 from .simple_glazing import *
+from .energyseries import EnergySeries
+from .energydataframe import EnergyDataFrame
+from .reportdata import ReportData
+from .tabulardata import TabularData
 from .idfclass import *
 from .schedule import Schedule
 from .dataportal import *
 from .plot import *
 from .trnsys import *
-from .cli import *
+from .template import *
+from .core import *
+from .umi_template import *
+from .cli import *