fix(dev-deps): Fix dev requirements

I'm also changing some of the lists of static values to be tuples
ladybug-tools · Jan 13, 2021 · 4e2d57c · 4e2d57c
1 parent 8c686f7
commit 4e2d57c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,12 +1,12 @@
 click==7.1.2
 coverage==5.3.1
 coveralls==1.7.0;python_version<'3.0'
-coveralls==3.0.0;python_version>='3.6'
+coveralls==2.2.0;python_version>='3.6'
 pytest==4.6.9;python_version<'3.0'
 pytest==6.2.1;python_version>='3.6'
 pytest-cov==2.10.1
 Sphinx==1.8.5;python_version<'3.0'
-Sphinx==3.4.3;python_version>='3.6'
+Sphinx==3.4.1;python_version>='3.6'
 sphinx-bootstrap-theme==0.7.1
 sphinxcontrib-fulltoc==1.2.0
 sphinxcontrib-websupport==1.1.2;python_version<'3.0'
@@ -16,6 +16,7 @@ twine==1.13.0;python_version<'3.0'
 twine==3.3.0;python_version>='3.6'
 wheel==0.36.2
 setuptools==44.1.0;python_version<'3.0'
-setuptools==51.1.2;python_version>='3.6'
-importlib-metadata==3.4.0
-uwg-schema==0.2.1;python_version>='3.6'
+setuptools==51.1.1;python_version>='3.6'
+importlib-metadata==3.3.0;python_version>='3.6'
+importlib-metadata==2.0.0;python_version<'3.0'
+uwg-schema==0.2.1;python_version>='3.6'
diff --git a/uwg/uwg.py b/uwg/uwg.py
@@ -159,26 +159,26 @@ class UWG(object):
     WGMAX = 0.005  # maximum film water depth on horizontal surfaces (m)
 
     # UWG object constants
-    PARAMETER_LIST = ['month', 'day', 'nday', 'dtsim', 'dtweather', 'autosize',
+    PARAMETER_LIST = ('month', 'day', 'nday', 'dtsim', 'dtweather', 'autosize',
                       'sensocc', 'latfocc', 'radfocc', 'radfequip', 'radflight',
                       'h_ubl1', 'h_ubl2', 'h_ref', 'h_temp', 'h_wind', 'c_circ',
                       'c_exch', 'maxday', 'maxnight', 'windmin', 'h_obs', 'bldheight',
                       'h_mix', 'blddensity', 'vertohor', 'charlength', 'albroad',
                       'droad', 'sensanth', 'zone', 'grasscover', 'treecover',
                       'vegstart', 'vegend', 'albveg', 'rurvegcover', 'latgrss',
                       'lattree', 'schtraffic', 'kroad', 'croad', 'bld', 'shgc',
-                      'albroof', 'glzr', 'vegroof', 'albwall', 'flr_h']
+                      'albroof', 'glzr', 'vegroof', 'albwall', 'flr_h')
     OPTIONAL_PARAMETER_SET = {'shgc', 'albroof',
                               'glzr', 'vegroof', 'albwall', 'flr_h'}
-    DEFAULT_BLD = [('largeoffice', 'pst80', 0.4),
-                   ('midriseapartment', 'pst80', 0.6)]
-    DEFAULT_SCHTRAFFIC = [
-        [0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.7, 0.9, 0.9, 0.6, 0.6, 0.6, 0.6, 0.6, 0.7, 0.8,
-         0.9, 0.9, 0.8, 0.8, 0.7, 0.3, 0.2, 0.2],  # Weekday
-        [0.2, 0.2, 0.2, 0.2, 0.2, 0.3, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.6, 0.7,
-         0.7, 0.7, 0.7, 0.5, 0.4, 0.3, 0.2, 0.2],  # Saturday
-        [0.2, 0.2, 0.2, 0.2, 0.2, 0.3, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-         0.4, 0.4, 0.4, 0.4, 0.3, 0.3, 0.2, 0.2]]  # Sunday
+    DEFAULT_BLD = (('largeoffice', 'pst80', 0.4),
+                   ('midriseapartment', 'pst80', 0.6))
+    DEFAULT_SCHTRAFFIC = (
+        (0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.7, 0.9, 0.9, 0.6, 0.6, 0.6, 0.6, 0.6, 0.7, 0.8,
+         0.9, 0.9, 0.8, 0.8, 0.7, 0.3, 0.2, 0.2),  # Weekday
+        (0.2, 0.2, 0.2, 0.2, 0.2, 0.3, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.6, 0.7,
+         0.7, 0.7, 0.7, 0.5, 0.4, 0.3, 0.2, 0.2),  # Saturday
+        (0.2, 0.2, 0.2, 0.2, 0.2, 0.3, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+         0.4, 0.4, 0.4, 0.4, 0.3, 0.3, 0.2, 0.2))  # Sunday
 
     # Constant file paths
     CURRENT_PATH = os.path.abspath(os.path.dirname(__file__))
@@ -217,7 +217,7 @@ def from_param_file(cls, param_path, epw_path=None, new_epw_dir=None,
                         new_epw_name=None):
         """Create a UWG object from the .uwg parameter file.
 
-        Note: this method of initializating the UWG object doesn't permit adding custom
+        Note: this method of initializing the UWG object doesn't permit adding custom
         reference data.
 
         Args: