update of package dependencies to latest versions

RWTH-EBC · Nov 23, 2023 · 3a7a38c · 3a7a38c
1 parent 88c832a
commit 3a7a38c
Show file tree

Hide file tree

Showing 40 changed files with 155 additions and 173 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,20 @@
 language: python
 matrix:
     include:
-        - python: 3.6
-          dist: trusty
+        - python: 3.9
+          dist: focal
           sudo: false
-        - python: 3.7
-          dist: xenial
+        - python: 3.10
+          dist: focal
           sudo: true
-        - python: 3.8
-          dist: bionic
+        - python: 3.11
+          dist: focal
           sudo: true
 
 install:
   - pip install --upgrade pip setuptools wheel
-  - pip install --upgrade --only-binary=numpy,scipy numpy scipy
   - pip install -e git+https://github.com/RWTH-EBC/richardsonpy.git#egg=richardsonpy
-  - pip install .
+  - pip install -e .
   - pip install pytest-cov
   - pip install coveralls
   - pip install flake8

diff --git a/License.txt b/License.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (C) 2015-2020  Thomas Schütz, Jan Schiefelbein, Sebastian Schwarz
+Copyright (C) 2015-2023  Thomas Schütz, Jan Schiefelbein, Sebastian Schwarz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -29,14 +29,13 @@ the pycity package on pypi! This (other) pycity package is installable via
 pip. However, if you want to install pycity_base, follow this instruction.*
 
 pycity_base requires the following Python packages:
-- numpy==1.19.5
-- matplotlib==3.3.4
-- pandas==1.1.5
-- pytest==6.2.4
-- xlrd==1.2.0
+- numpy==1.26.0
+- matplotlib==3.8.0
+- pandas==2.1.1
+- Shapely==2.0.1
+- openpyxl==3.1.2
 - networkx==2.5.1
-- Shapely==1.7.1
-- pyproj==3.0.1
+- pyproj==3.6.1
 
 as well as the EBC Python packages:
 
@@ -53,7 +52,7 @@ richardsonpy and uesgraphs can be installed via pip.
 
 ### Installation of pycity_base
 
-The latest version of pycity_base is 0.3.2.
+The latest version of pycity_base is 0.3.3.
 
 When uesgraph and its dependencies are installed, you should be able to install
 pycity_base via pip:

diff --git a/doc/Dockerfile b/doc/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.7
 RUN  pip3 install --upgrade pip setuptools wheel &&\
      pip3 install numpy scipy &&\
      pip3 install networkx &&\
-     pip3 install xlrd &&\
+     pip3 install openpyxl &&\
      pip3 install pandas &&\
      pip3 install shapely &&\
      pip3 install pyproj &&\

diff --git a/doc/_build/html/_sources/index.rst.txt b/doc/_build/html/_sources/index.rst.txt
@@ -52,7 +52,7 @@ pycity_base requires the following Python packages:
 	- networkX
 	- pandas
 	- pytest
-	- xlrd
+	- openpyxl
 
 as well as the EBC Python packages:
 

diff --git a/doc/_build/html/_static/documentation_options.js b/doc/_build/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.3.2',
+    VERSION: '0.3.3',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/doc/_build/html/genindex.html b/doc/_build/html/genindex.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Index &#8212; pycity_base 0.3.2 documentation</title>
+    <title>Index &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/index.html b/doc/_build/html/index.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -72,7 +72,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Permalink to t
 <li><p>networkX</p></li>
 <li><p>pandas</p></li>
 <li><p>pytest</p></li>
-<li><p>xlrd</p></li>
+<li><p>openpyxl</p></li>
 </ul>
 </dd>
 </dl>

diff --git a/doc/_build/html/py-modindex.html b/doc/_build/html/py-modindex.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Python Module Index &#8212; pycity_base 0.3.2 documentation</title>
+    <title>Python Module Index &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.classes.demand.html b/doc/_build/html/pycity_base.classes.demand.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.classes.demand package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.classes.demand package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.classes.html b/doc/_build/html/pycity_base.classes.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.classes package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.classes package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.classes.supply.html b/doc/_build/html/pycity_base.classes.supply.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.classes.supply package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.classes.supply package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.examples.html b/doc/_build/html/pycity_base.examples.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.examples package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.examples package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.examples.tutorials.html b/doc/_build/html/pycity_base.examples.tutorials.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.examples.tutorials package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.examples.tutorials package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.examples.validation_ashrae140.html b/doc/_build/html/pycity_base.examples.validation_ashrae140.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.examples.validation_ashrae140 package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.examples.validation_ashrae140 package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.functions.html b/doc/_build/html/pycity_base.functions.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.functions package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.functions package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.functions.scripts.city_generators.html b/doc/_build/html/pycity_base.functions.scripts.city_generators.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.functions.scripts.city_generators package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.functions.scripts.city_generators package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.functions.scripts.city_generators.input.html b/doc/_build/html/pycity_base.functions.scripts.city_generators.input.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.functions.scripts.city_generators.input package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.functions.scripts.city_generators.input package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.functions.scripts.city_generators.output.html b/doc/_build/html/pycity_base.functions.scripts.city_generators.output.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.functions.scripts.city_generators.output package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.functions.scripts.city_generators.output package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.functions.scripts.html b/doc/_build/html/pycity_base.functions.scripts.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.functions.scripts package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.functions.scripts package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.functions.scripts.profile_pool.html b/doc/_build/html/pycity_base.functions.scripts.profile_pool.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.functions.scripts.profile_pool package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.functions.scripts.profile_pool package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.html b/doc/_build/html/pycity_base.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.test.html b/doc/_build/html/pycity_base.test.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.test package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.test package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/pycity_base.test.richardson_check.html b/doc/_build/html/pycity_base.test.richardson_check.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>pycity_base.test.richardson_check package &#8212; pycity_base 0.3.2 documentation</title>
+    <title>pycity_base.test.richardson_check package &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/doc/_build/html/search.html b/doc/_build/html/search.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Search &#8212; pycity_base 0.3.2 documentation</title>
+    <title>Search &#8212; pycity_base 0.3.3 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 

diff --git a/doc/_build/html/searchindex.js b/doc/_build/html/searchindex.js
diff --git a/doc/conf.py b/doc/conf.py
@@ -24,9 +24,9 @@
 author = 'Institute for Energy Efficient Buildings and Indoor Climate, Institute for Automation of Complex Power Systems, E.ON Energy Research Center, RWTH Aachen University'
 
 # The short X.Y version
-version = '0.3.2'
+version = '0.3.3'
 # The full version, including alpha/beta/rc tags
-release = '0.3.2'
+release = '0.3.3'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/doc/index.rst b/doc/index.rst
@@ -52,7 +52,7 @@ pycity_base requires the following Python packages:
 	- networkX
 	- pandas
 	- pytest
-	- xlrd
+	- openpyxl
 
 as well as the EBC Python packages:
 

diff --git a/pycity_base/classes/building.py b/pycity_base/classes/building.py
@@ -48,9 +48,16 @@ def __init__(self, environment):
     def kind(self):
         return self._kind
 
-    def addEntity(self, entity):
+    def addEntity(self, entity, warn=False):
         """ 
         Add an entity (apartment, BES or heating curve) to the building.
+
+        Parameters
+        ----------
+        entity : object
+            Entity object.
+        warn : bool, optional
+            Throw a warning, if an unknown entity is added (default: False)
         
         Examples
         --------
@@ -71,7 +78,8 @@ def addEntity(self, entity):
             self.has_heating_curve = True
 
         else:
-            warnings.warn('Kind of entity is unknown. Entity has not been added!')
+            if warn:
+                warnings.warn('Kind of entity is unknown. Entity has not been added!')
 
     def addMultipleEntities(self, entities):
         """

diff --git a/pycity_base/classes/demand/apartment.py b/pycity_base/classes/demand/apartment.py
@@ -59,7 +59,7 @@ def __init__(self, environment, net_floor_area=None, occupancy=None):
     def kind(self):
         return self._kind
 
-    def addEntity(self, entity):
+    def addEntity(self, entity, warn=False):
         """
         Add an entity to apartment.
 
@@ -73,6 +73,8 @@ def addEntity(self, entity):
             - Space cooling demand (entity.kind == "spacecooling")
             - Occupancy (entity.kind == 'occupancy')
             - Room (entity.kind == "room"
+        warn : bool, optional
+            Throw a warning, if an unknown entity is added (default: False)
         
         Examples
         --------
@@ -96,11 +98,12 @@ def addEntity(self, entity):
         elif entity.kind == 'occupancy':
             self.occupancy = entity
 
-        elif entity.kind == "room":  # pragma: no cover
+        elif entity.kind == "room":
             self.rooms.append(entity)
 
-        else:  # pragma: no cover
-            warnings.warn('Kind of entity is unknown. Entity has not been added!')
+        else:
+            if warn:
+                warnings.warn('Kind of entity is unknown. Entity has not been added!')
 
     def addMultipleEntities(self, entities):
         """

diff --git a/pycity_base/classes/demand/space_heating.py b/pycity_base/classes/demand/space_heating.py
@@ -132,13 +132,12 @@ def __init__(self, environment, method=0, loadcurve=[],
             annual_demand = living_area * specific_demand  # kWh
             profile = 1
 
-            fun = slp_th.calculate
-            loadcurve = fun(environment.weather.t_ambient,
-                            environment.timer.current_day,
-                            SpaceHeating.slp_prof[profile_type][profile],
-                            SpaceHeating.slp_week[profile_type],
-                            SpaceHeating.slp_hour[profile_type],
-                            annual_demand)
+            loadcurve = slp_th.calculate(environment.weather.t_ambient,
+                                         environment.timer.current_day,
+                                         SpaceHeating.slp_prof[profile_type][profile],
+                                         SpaceHeating.slp_week[profile_type],
+                                         SpaceHeating.slp_hour[profile_type],
+                                         annual_demand)
 
             super(SpaceHeating, self).__init__(environment, loadcurve)
 
@@ -147,12 +146,12 @@ def __init__(self, environment, method=0, loadcurve=[],
             self.zone_parameters = zone_parameters
             # Create zone_inputs (this already creates the full year inputs!)
             self.zone_inputs = zi.ZoneInputs(environment,
-                                            zone_parameters,
-                                            t_m_init,
-                                            ventilation=ventilation,
-                                            occupancy=occupancy,
-                                            appliances=appliances,
-                                            lighting=lighting)
+                                             zone_parameters,
+                                             t_m_init,
+                                             ventilation=ventilation,
+                                             occupancy=occupancy,
+                                             appliances=appliances,
+                                             lighting=lighting)
 
             calc = zmodel.calc
             res = calc(zone_parameters=self.zone_parameters,