1. Ready for release.

mzy2240 · Feb 5, 2022 · b6561d6 · b6561d6
1 parent fdc7641
commit b6561d6
Show file tree

Hide file tree

Showing 26 changed files with 65 additions and 36 deletions.
diff --git a/README.rst b/README.rst
@@ -68,7 +68,7 @@ The ESA team works hard to ensure ESA is well tested, and we strive for
 testing coverage data for ESA, using `coverage
 <https://pypi.org/project/coverage/>`__.
 
-.. table:: ESA's testing coverage as of 2022-01-28 (Git commit: b8cef3a)
+.. table:: ESA's testing coverage as of 2022-02-05 (Git commit: fdc7641)
     :widths: auto
     :align: left
 
@@ -77,7 +77,7 @@ testing coverage data for ESA, using `coverage
     +=================+===================+=================+=================+====================+
     | esa/__init__.py |                 2 |               0 |               2 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
-    | esa/saw.py      |               726 |               0 |             726 |                100 |
+    | esa/saw.py      |               740 |               0 |             740 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
 
 License

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.3
+1.2.4
diff --git a/docs/doctrees/environment.pickle b/docs/doctrees/environment.pickle
diff --git a/docs/doctrees/esa.doctree b/docs/doctrees/esa.doctree
diff --git a/docs/doctrees/overview.doctree b/docs/doctrees/overview.doctree
diff --git a/docs/doctrees/welcome.doctree b/docs/doctrees/welcome.doctree
diff --git a/docs/html/.buildinfo b/docs/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: b91676f50c7e1b59278324ea19e6c581
+config: efe423387c7e87f5685fbdb0fe19a20f
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/html/_static/documentation_options.js b/docs/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '1.2.3',
+    VERSION: '1.2.4',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/docs/html/common_issues.html b/docs/html/common_issues.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>Common Issues &#8212; ESA 1.2.3 documentation</title>
+    <title>Common Issues &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>

diff --git a/docs/html/esa.html b/docs/html/esa.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>esa API Documentation &#8212; ESA 1.2.3 documentation</title>
+    <title>esa API Documentation &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -308,6 +308,11 @@
 <span class="sig-name descname"><span class="pre">FIELD_LIST_COLUMNS</span></span><em class="property"> <span class="pre">=</span> <span class="pre">['key_field',</span> <span class="pre">'internal_field_name',</span> <span class="pre">'field_data_type',</span> <span class="pre">'description',</span> <span class="pre">'display_name']</span></em><a class="headerlink" href="#esa.saw.SAW.FIELD_LIST_COLUMNS" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
+<dl class="py attribute">
+<dt class="sig sig-object py" id="esa.saw.SAW.FIELD_LIST_COLUMNS_NEW">
+<span class="sig-name descname"><span class="pre">FIELD_LIST_COLUMNS_NEW</span></span><em class="property"> <span class="pre">=</span> <span class="pre">['key_field',</span> <span class="pre">'internal_field_name',</span> <span class="pre">'field_data_type',</span> <span class="pre">'description',</span> <span class="pre">'display_name',</span> <span class="pre">'enterable']</span></em><a class="headerlink" href="#esa.saw.SAW.FIELD_LIST_COLUMNS_NEW" title="Permalink to this definition">¶</a></dt>
+<dd></dd></dl>
+
 <dl class="py attribute">
 <dt class="sig sig-object py" id="esa.saw.SAW.FIELD_LIST_COLUMNS_OLD">
 <span class="sig-name descname"><span class="pre">FIELD_LIST_COLUMNS_OLD</span></span><em class="property"> <span class="pre">=</span> <span class="pre">['key_field',</span> <span class="pre">'internal_field_name',</span> <span class="pre">'field_data_type',</span> <span class="pre">'description']</span></em><a class="headerlink" href="#esa.saw.SAW.FIELD_LIST_COLUMNS_OLD" title="Permalink to this definition">¶</a></dt>
@@ -866,6 +871,11 @@
 <span class="sig-name descname"><span class="pre">SPECIFIC_FIELD_LIST_COLUMNS</span></span><em class="property"> <span class="pre">=</span> <span class="pre">['variablename:location',</span> <span class="pre">'field',</span> <span class="pre">'column</span> <span class="pre">header',</span> <span class="pre">'field</span> <span class="pre">description']</span></em><a class="headerlink" href="#esa.saw.SAW.SPECIFIC_FIELD_LIST_COLUMNS" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
+<dl class="py attribute">
+<dt class="sig sig-object py" id="esa.saw.SAW.SPECIFIC_FIELD_LIST_COLUMNS_NEW">
+<span class="sig-name descname"><span class="pre">SPECIFIC_FIELD_LIST_COLUMNS_NEW</span></span><em class="property"> <span class="pre">=</span> <span class="pre">['variablename:location',</span> <span class="pre">'field',</span> <span class="pre">'column</span> <span class="pre">header',</span> <span class="pre">'field</span> <span class="pre">description',</span> <span class="pre">'enterable']</span></em><a class="headerlink" href="#esa.saw.SAW.SPECIFIC_FIELD_LIST_COLUMNS_NEW" title="Permalink to this definition">¶</a></dt>
+<dd></dd></dl>
+
 <dl class="py method">
 <dt class="sig sig-object py" id="esa.saw.SAW.SaveCase">
 <span class="sig-name descname"><span class="pre">SaveCase</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">FileName</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">FileType</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'PWB'</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">Overwrite</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.SaveCase" title="Permalink to this definition">¶</a></dt>

diff --git a/docs/html/genindex.html b/docs/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; ESA 1.2.3 documentation</title>
+    <title>Index &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -128,6 +128,8 @@ <h2 id="F">F</h2>
 </li>
   </ul></td>
   <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="esa.html#esa.saw.SAW.FIELD_LIST_COLUMNS_NEW">FIELD_LIST_COLUMNS_NEW (esa.saw.SAW attribute)</a>
+</li>
       <li><a href="esa.html#esa.saw.SAW.FIELD_LIST_COLUMNS_OLD">FIELD_LIST_COLUMNS_OLD (esa.saw.SAW attribute)</a>
 </li>
   </ul></td>
@@ -292,6 +294,8 @@ <h2 id="S">S</h2>
       <li><a href="esa.html#esa.saw.SAW.SolvePowerFlow">SolvePowerFlow() (esa.saw.SAW method)</a>
 </li>
       <li><a href="esa.html#esa.saw.SAW.SPECIFIC_FIELD_LIST_COLUMNS">SPECIFIC_FIELD_LIST_COLUMNS (esa.saw.SAW attribute)</a>
+</li>
+      <li><a href="esa.html#esa.saw.SAW.SPECIFIC_FIELD_LIST_COLUMNS_NEW">SPECIFIC_FIELD_LIST_COLUMNS_NEW (esa.saw.SAW attribute)</a>
 </li>
   </ul></td>
 </tr></table>

diff --git a/docs/html/index.html b/docs/html/index.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>Easy SimAuto (ESA) Documentation &#8212; ESA 1.2.3 documentation</title>
+    <title>Easy SimAuto (ESA) Documentation &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>

diff --git a/docs/html/installation.html b/docs/html/installation.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>Installing ESA &#8212; ESA 1.2.3 documentation</title>
+    <title>Installing ESA &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>

diff --git a/docs/html/objects.inv b/docs/html/objects.inv
diff --git a/docs/html/overview.html b/docs/html/overview.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>ESA Overview &#8212; ESA 1.2.3 documentation</title>
+    <title>ESA Overview &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -133,7 +133,7 @@ <h2>Testing Coverage<a class="headerlink" href="#testing-coverage" title="Permal
 <p>The ESA team strives to write good tests with 100% coverage. The table
 below provides the latest test coverage data for ESA.</p>
 <table class="colwidths-auto docutils align-left" id="id3">
-<caption><span class="caption-text">ESA’s testing coverage as of 2022-01-28 (Git commit: b8cef3a)</span><a class="headerlink" href="#id3" title="Permalink to this table">¶</a></caption>
+<caption><span class="caption-text">ESA’s testing coverage as of 2022-02-05 (Git commit: fdc7641)</span><a class="headerlink" href="#id3" title="Permalink to this table">¶</a></caption>
 <thead>
 <tr class="row-odd"><th class="head"><p>Name</p></th>
 <th class="head"><p>Num. Statements</p></th>
@@ -150,9 +150,9 @@ <h2>Testing Coverage<a class="headerlink" href="#testing-coverage" title="Permal
 <td><p>100</p></td>
 </tr>
 <tr class="row-odd"><td><p>esa/saw.py</p></td>
-<td><p>726</p></td>
+<td><p>740</p></td>
 <td><p>0</p></td>
-<td><p>726</p></td>
+<td><p>740</p></td>
 <td><p>100</p></td>
 </tr>
 </tbody>

diff --git a/docs/html/py-modindex.html b/docs/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; ESA 1.2.3 documentation</title>
+    <title>Python Module Index &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>

diff --git a/docs/html/quick_start.html b/docs/html/quick_start.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>Quick Start &#8212; ESA 1.2.3 documentation</title>
+    <title>Quick Start &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>

diff --git a/docs/html/search.html b/docs/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; ESA 1.2.3 documentation</title>
+    <title>Search &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
 

diff --git a/docs/html/searchindex.js b/docs/html/searchindex.js
diff --git a/docs/html/snippets.html b/docs/html/snippets.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>Examples &#8212; ESA 1.2.3 documentation</title>
+    <title>Examples &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>

diff --git a/docs/html/welcome.html b/docs/html/welcome.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
-    <title>Welcome! &#8212; ESA 1.2.3 documentation</title>
+    <title>Welcome! &#8212; ESA 1.2.4 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -357,6 +357,12 @@ <h3>Credits and Thanks<a class="headerlink" href="#credits-and-thanks" title="Pe
 <p>Changes made with each ESA release are listed here. Please note that
 versions prior to 1.0.0 are not listed here, but are still available on
 <a class="reference external" href="https://pypi.org/project/esa/#history">PyPi</a>.</p>
+<section id="version-1-2-4">
+<h3>Version 1.2.4<a class="headerlink" href="#version-1-2-4" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li><p>Supports latest PW22 (Nov and Dec build) and PW23</p></li>
+</ul>
+</section>
 <section id="version-1-2-3">
 <h3>Version 1.2.3<a class="headerlink" href="#version-1-2-3" title="Permalink to this headline">¶</a></h3>
 <ul class="simple">

diff --git a/docs/rst/coverage.rst b/docs/rst/coverage.rst
@@ -1,4 +1,4 @@
-.. table:: ESA's testing coverage as of 2022-01-28 (Git commit: b8cef3a)
+.. table:: ESA's testing coverage as of 2022-02-05 (Git commit: fdc7641)
     :widths: auto
     :align: left
 
@@ -7,5 +7,5 @@
     +=================+===================+=================+=================+====================+
     | esa/__init__.py |                 2 |               0 |               2 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
-    | esa/saw.py      |               726 |               0 |             726 |                100 |
+    | esa/saw.py      |               740 |               0 |             740 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
diff --git a/docs/rst/welcome/changelog.rst b/docs/rst/welcome/changelog.rst
@@ -2,6 +2,11 @@ Changes made with each ESA release are listed here. Please note that
 versions prior to 1.0.0 are not listed here, but are still available on
 `PyPi <https://pypi.org/project/esa/#history>`__.
 
+Version 1.2.4
+^^^^^^^^^^^^^
+
+* Supports latest PW22 (Nov and Dec build) and PW23
+
 Version 1.2.3
 ^^^^^^^^^^^^^
 

diff --git a/esa/__init__.py b/esa/__init__.py
@@ -16,4 +16,4 @@
 # Please keep the docstring above up to date with all the imports.
 from .saw import SAW, PowerWorldError, COMError, CommandNotRespectedError,\
     Error
-__version__ = "1.2.3"
+__version__ = "1.2.4"
diff --git a/esa/saw.py b/esa/saw.py
@@ -152,9 +152,14 @@ def __init__(self, FileName, early_bind=False, UIVisible=False,
         # https://youtu.be/xPtp8qFAHuA
         try:
             if early_bind:
-                # Use early binding.
-                self._pwcom = win32com.client.gencache.EnsureDispatch(
-                    'pwrworld.SimulatorAuto')
+                try:
+                    # Use early binding.
+                    self._pwcom = win32com.client.gencache.EnsureDispatch(
+                        'pwrworld.SimulatorAuto')
+                except AttributeError:
+                    # Use late binding.
+                    self._pwcom = win32com.client.dynamic.Dispatch(
+                        'pwrworld.SimulatorAuto')
             else:
                 # Use late binding.
                 self._pwcom = win32com.client.dynamic.Dispatch(

diff --git a/setup.py b/setup.py
@@ -38,11 +38,10 @@
     include_package_data=True,
     classifiers=[
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "License :: OSI Approved :: MIT License",
         "Operating System :: Microsoft :: Windows",
         "Development Status :: 5 - Production/Stable",
@@ -62,7 +61,7 @@
               'Easy SimAuto', 'ESA', 'Smart Grid', 'Numpy', 'Pandas'],
     install_requires=['pandas >= 0.25', 'numpy >= 1.19.5, <1.22', 'scipy', 'pywin32',
                       'pypiwin32', 'networkx', 'tqdm', 'numba'],
-    python_requires='>=3.5',
+    python_requires='>=3.7',
     # There are a couple tests that use networkx, and we use the magic
     # of sphinx for documentation. Coverage is necessary to keep the
     # coverage report up to date.