Skip to content

Commit f717745

Browse files
committed
Merge branch 'develop'
2 parents bc0f350 + 6eadbd5 commit f717745

34 files changed

+215
-40
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The ESA team works hard to ensure ESA is well tested, and we strive for
7676
testing coverage data for ESA, using `coverage
7777
<https://pypi.org/project/coverage/>`__.
7878

79-
.. table:: ESA's testing coverage as of 2022-02-05 (Git commit: fdc7641)
79+
.. table:: ESA's testing coverage as of 2022-02-10 (Git commit: 41ad7ed)
8080
:widths: auto
8181
:align: left
8282

@@ -85,7 +85,7 @@ testing coverage data for ESA, using `coverage
8585
+=================+===================+=================+=================+====================+
8686
| esa/__init__.py | 2 | 0 | 2 | 100 |
8787
+-----------------+-------------------+-----------------+-----------------+--------------------+
88-
| esa/saw.py | 740 | 0 | 740 | 100 |
88+
| esa/saw.py | 752 | 0 | 752 | 100 |
8989
+-----------------+-------------------+-----------------+-----------------+--------------------+
9090

9191
License

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.4
1+
1.2.5

compile_for_all_versions.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import shutil
77

88

9-
109
def main():
1110
list_of_envs = []
1211
envs = subprocess.check_output('conda env list').splitlines()[2:-1]
@@ -18,7 +17,7 @@ def main():
1817
print(list_of_envs)
1918
# print(env_name)
2019

21-
versions = ['37', '38', '39'] # pythran seems to only work in 3.7 3.8 3.9
20+
versions = ['37', '38', '39', '310'] # pythran seems to only work in 3.7 3.8 3.9
2221

2322
for ver in versions:
2423
# Create a virtual environment if necessary.
@@ -37,8 +36,6 @@ def main():
3736
print('ALL DONE!')
3837

3938

40-
41-
4239
if __name__ == '__main__':
4340
main()
4441

docs/doctrees/environment.pickle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:fddcac64c744b59206cfe60a5c05ed5c2704c7979c97ddd735cb5228a53ba0b0
3-
size 59296
2+
oid sha256:5ac4a5f1401618037c90b3292a6e401b0754ddf027b5c290113c0bf4de2ec5c1
3+
size 60341

docs/doctrees/esa.doctree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:cf5727ecfc2666d3a2fc439c436e5577f3fb90bc62cf23e27b9b4f855ef3b1f1
3-
size 384654
2+
oid sha256:a7169affc51293a491383c7d600cb06d59238c5c06412c05d9827e8f570d44ca
3+
size 391032

docs/doctrees/overview.doctree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:170e56f0ff24bf3f95d73fd8d15f2f97c1776bebd7da21a2cae8be3cc076c40a
2+
oid sha256:f1c99e9cd796c1049eb5c7e0f4bff8ada248e0b16d6c6fc62b99bf3c8b3ae447
33
size 30599

docs/doctrees/snippets.doctree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f7821b0ebcee489afa0888ab02c1a8b72e60db29ca3d61ab6838d103c4e85c99
3-
size 88220
2+
oid sha256:be1c0878bd1b910949f20228f4f58fcab4081add4682b793e17a96aef596b61a
3+
size 93956

docs/doctrees/welcome.doctree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:30647c29f21bf88bcfbe182e5959f06bb3ec6612eb3c6d8d68c11e94b25a5e81
3-
size 94990
2+
oid sha256:92f2da0e05d44bf0a4ab2adc54477498b7d7fde00aaa4330c17934e0012256d1
3+
size 95985

docs/html/.buildinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: efe423387c7e87f5685fbdb0fe19a20f
3+
config: 77715398b7bf42f986e4d37858004ae1
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/html/_sources/snippets.rst.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ Transient Stability Analysis
3838

3939
.. include:: snippets/ts_mycontingency_200.rst
4040

41+
Contingency Analysis
42+
--------------------
43+
44+
.. include:: snippets/contingency_analysis_2000.rst
45+
4146
Create Simple Graph Model
4247
-------------------------
4348

0 commit comments

Comments
 (0)