Merge pull request #436 from RWTH-EBC/issue434_hotfix05

Issue434 hotfix05

README.md

@@ -4,7 +4,7 @@
 
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)
 [![Coverage Status](https://coveralls.io/repos/github/RWTH-EBC/TEASER/badge.svg)](https://coveralls.io/github/RWTH-EBC/TEASER)
-[![Build Status](https://travis-ci.org/RWTH-EBC/TEASER.svg)](https://travis-ci.org/RWTH-EBC/TEASER)
+[![Build Status](https://travis-ci.org/RWTH-EBC/TEASER.svg?branch=master)](https://travis-ci.org/RWTH-EBC/TEASER.svg?branch=master)
 
 TEASER (Tool for Energy Analysis and Simulation for Efficient Retrofit) allows
 fast generation of archetype buildings with low input requirements and the
@@ -46,7 +46,7 @@ models for [AixLib](https://github.com/RWTH-EBC/AixLib) and
 
 ## Version
 
-TEASER is a ongoing research project, the current version is 0.5.0, which is
+TEASER is a ongoing research project, the current version is 0.5.1, which is
 still a pre-release.
 
 ## How to use TEASER

doc/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '0.5.'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.0'
+release = '0.5.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -2,7 +2,7 @@
 from sys import platform
 
 setup(name='teaser',
-      version='0.5.0',
+      version='0.5.1',
       description='Tool for Energy Analysis and Simulation for '
                   'Efficient Retrofit ',
       url='https://github.com/RWTH-EBC/TEASER',
@@ -36,7 +36,13 @@
           'teaser.data.bindings.v_0_4',
           'teaser.data.bindings.v_0_5',
           'teaser.data.input',
+          'teaser.data.input.inputdata',
+          'teaser.data.input.inputdata.weatherdata',
           'teaser.data.output',
+          'teaser.data.output.texttemplate',
+          'teaser.data.output.modelicatemplate',
+          'teaser.data.output.modelicatemplate.AixLib',
+          'teaser.data.output.modelicatemplate.IBPSA',
           'teaser.examples',
           'teaser.examples.simulation',
           'teaser.examples.verification',
@@ -47,11 +53,10 @@
           'teaser.gui.guihelp',
           'teaser.gui.guiimages',
           'teaser.gui.guiimages.OfficeBuildings',
-          'teaser.gui.guiimages.Residentials',
-          'tests'],
+          'teaser.gui.guiimages.Residentials'],
       package_data={
           'teaser.data.input.inputdata': ['*.xml'],
-          'teaser.data.input.inputdata.weaterdata': [
+          'teaser.data.input.inputdata.weatherdata': [
               'DEU_BW_Mannheim_107290_TRY2010_12_Jahr_BBSR.mos'],
           'teaser.data.output.modelicatemplate': [
               'package',
@@ -64,11 +69,11 @@
               'AixLib_ThermalZoneRecord_TwoElement',
               'AixLib_ThermalZoneRecord_ThreeElement',
               'AixLib_ThermalZoneRecord_FourElement'],
-          'teaser.data.output.modelicatemplate.Annex60': [
-              'Annex60_OneElement',
-              'Annex60_TwoElements',
-              'Annex60_ThreeElements',
-              'Annex60_FourElements'],
+          'teaser.data.output.modelicatemplate.IBPSA': [
+              'IBPSA_OneElement',
+              'IBPSA_TwoElements',
+              'IBPSA_ThreeElements',
+              'IBPSA_FourElements'],
           'teaser.data.output.texttemplate': [
               'ReadableBuilding_OneElement',
               'ReadableBuilding_TwoElement',
@@ -78,7 +83,7 @@
           'teaser.gui.guiimages': ['*.png'],
           'teaser.gui.guiimages.OfficeBuildings': ['*.png'],
           'teaser.gui.guiimages.Residentials': ['*.png'],
-          'teaser.examples.examplefiles': ['*.teaserXML'],
+          'teaser.examples.examplefiles': ['*.teaserXML', '*.gml'],
           'teaser.examples.examplefiles.MelatenXML': ['*.xml']},
       classifiers=[
           'License :: OSI Approved :: MIT License',

teaser/gui/mainui.py

@@ -109,7 +109,7 @@ def __init__(self, parent=None, gui=True, dir=None, file=None):
             utilitis.get_full_path(
                 'gui/guiimages/Teaser_logo.png'), QtCore.QSize(16, 16))
         self.setWindowIcon(self.teaser_icon)
-        teaserVersion = "0.5"
+        teaserVersion = "0.5.1"
         self.setWindowTitle("TEASER Version %s" % teaserVersion)
         self.central_widget = QtGui.QWidget(self)
         self.central_widget.setObjectName(_fromUtf8("central_widget"))