Skip to content

Commit c157e24

Browse files
committed
fix lint, python requires >= 3.10
1 parent 16a1f57 commit c157e24

File tree

9 files changed

+24
-21
lines changed

9 files changed

+24
-21
lines changed

pygridsim/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@
55
__author__ = 'Angela Zhao'
66
__email__ = '[email protected]'
77
__version__ = '0.1.0.dev1'
8-
9-
from pygridsim.core import PyGridSim as PyGridSim

pygridsim/configs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from pygridsim.enums import LoadType, LineType, GeneratorType, SourceType
21
import pygridsim.defaults as defaults
2+
from pygridsim.enums import GeneratorType, LineType, LoadType, SourceType
33

44
LOAD_CONFIGURATIONS = {
55
LoadType.HOUSE: {

pygridsim/core.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# -*- coding: utf-8 -*-
22
from altdss import altdss
3-
from pygridsim.parameters import _make_load_node, _make_source_node, _make_generator, _make_pv
4-
from pygridsim.results import _query_solution, _export_results
3+
54
from pygridsim.lines import _make_line
5+
from pygridsim.parameters import _make_generator, _make_load_node, _make_pv, _make_source_node
6+
from pygridsim.results import _export_results, _query_solution
67

78
"""Main module."""
89

@@ -40,7 +41,8 @@ def add_load_nodes(self,
4041
4142
Args:
4243
load_type (str, optional):
43-
Load type as a string, one of "house", "commercial", "industrial". Defaults to "house".
44+
Load type as a string, one of "house", "commercial", "industrial".
45+
Defaults to "house".
4446
params (dict[str, int], optional):
4547
Load parameters for these manual additions. Defaults to empty dictionary.
4648
num (int, optional):

pygridsim/defaults.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Set any defaults (i.e. default source voltage, default node load etc.)
33
"""
44
from altdss import Connection
5+
56
"""
67
Overall Defaults, used for load, sources, lines, etc.
78
https://www.anker.com/blogs/home-power-backup/electricity-usage-how-much-energy-does-an-average-house-use

pygridsim/lines.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
from altdss import altdss
2-
from altdss import Transformer
3-
from pygridsim.configs import LINE_CONFIGURATIONS
1+
from altdss import Transformer, altdss
2+
from dss.enums import LineUnits
3+
44
import pygridsim.defaults as defaults
5+
from pygridsim.configs import LINE_CONFIGURATIONS
56
from pygridsim.enums import LineType
6-
from pygridsim.parameters import _get_param, _random_param, _check_valid_params, _get_enum_obj
7-
from dss.enums import LineUnits
7+
from pygridsim.parameters import _check_valid_params, _get_enum_obj, _get_param, _random_param
88

99

1010
def _get_kv(node_name):

pygridsim/parameters.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
"""
22
Helper functions to parse the parameters used for loads and sources
33
"""
4-
from altdss import altdss
5-
from altdss import Load, PVSystem, Generator
6-
from pygridsim.enums import LoadType, SourceType, GeneratorType
7-
from pygridsim.configs import LOAD_CONFIGURATIONS, SOURCE_CONFIGURATIONS, GENERATOR_CONFIGURATIONS
8-
import pygridsim.defaults as defaults
94
import random
105

6+
from altdss import Generator, Load, PVSystem, altdss
7+
8+
import pygridsim.defaults as defaults
9+
from pygridsim.configs import GENERATOR_CONFIGURATIONS, LOAD_CONFIGURATIONS, SOURCE_CONFIGURATIONS
10+
from pygridsim.enums import GeneratorType, LoadType, SourceType
11+
1112

1213
def _get_enum_obj(enum_class, enum_val):
1314
enum_obj = None

pygridsim/results.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
Defines the set of allowed queries (i.e. baseKV at every node) and
33
provides helpers for the solve/results function.
44
"""
5-
from altdss import altdss
65
import json
76

7+
from altdss import altdss
8+
89

910
def _query_solution(query):
1011
match query:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
keywords='pygridsim pygridsim PyGridSim',
8585
name='pygridsim',
8686
packages=find_packages(include=['pygridsim', 'pygridsim.*']),
87-
python_requires='>=3.8, <3.13',
87+
python_requires='>=3.10, <3.13',
8888
setup_requires=setup_requires,
8989
test_suite='tests',
9090
tests_require=tests_require,

tests/test_circuit.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
3-
from pygridsim.core import PyGridSim
4-
from pygridsim.enums import LineType, LoadType, SourceType, GeneratorType
53
import unittest
64

5+
from pygridsim.core import PyGridSim
6+
from pygridsim.enums import GeneratorType, LineType, LoadType, SourceType
7+
78
"""Tests for `pygridsim` package."""
89

910

@@ -173,7 +174,6 @@ def setUp(self):
173174

174175
def tearDown(self):
175176
"""Tear down test fixtures, if any."""
176-
pass
177177

178178
def test_100_one_source_one_load(self):
179179
circuit = PyGridSim()

0 commit comments

Comments
 (0)