Skip to content
This repository was archived by the owner on Mar 18, 2024. It is now read-only.

Commit 46a98d9

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent fc40d91 commit 46a98d9

File tree

8 files changed

+0
-20
lines changed

8 files changed

+0
-20
lines changed

network_manager/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
def main(global_config, **settings):
7-
87
engine = engine_from_config(settings, "sqlalchemy.")
98
DBSession.configure(bind=engine)
109
Base.metadata.bind = engine

network_manager/db.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def local_node() -> Optional[Node]:
2929

3030
@staticmethod
3131
def refresh_github_node_registry():
32-
3332
node_registry_data = NodeRegistry.get_node_registry()
3433
node_info_data = NodeRegistry.get_node_info()
3534

network_manager/node_registry.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ def get_node_registry():
2626

2727
@staticmethod
2828
def get_node_info():
29-
3029
"""
3130
Gets information from the node info repository at the given url.
3231
Returns the information in json format

network_manager/views.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class NodeViews:
1919
"""
2020

2121
def __init__(self, request):
22-
2322
self.request = request
2423

2524
@property
@@ -63,7 +62,6 @@ def node_form(self):
6362

6463
# Used for Node Update form
6564
class NodeForm(colander.MappingSchema):
66-
6765
name = colander.SchemaNode(colander.String(), default=node_name_default)
6866
url = colander.SchemaNode(colander.String(), default=node_url_default)
6967
location = colander.SchemaNode(colander.String(), default=node_location_default)

tests/conftest.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@
3030

3131

3232
def get_engine(settings, prefix="sqlalchemy."):
33-
3433
return engine_from_config(settings, prefix)
3534

3635

3736
def get_session_factory(engine):
38-
3937
factory = sessionmaker()
4038

4139
factory.configure(bind=engine)
@@ -44,7 +42,6 @@ def get_session_factory(engine):
4442

4543

4644
def get_tm_session(session_factory, transaction_manager, request=None):
47-
4845
"""
4946
5047
Get a ``sqlalchemy.orm.Session`` instance backed by a transaction.
@@ -207,7 +204,6 @@ def tm():
207204

208205
@pytest.fixture
209206
def dbsession(app, tm):
210-
211207
DBSession = scoped_session(sessionmaker())
212208
return DBSession
213209

tests/old_test_expectation.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
@pytest.mark.parametrize("test_input,expected", [(1, "PAVICS"), (2, "UofT")])
1212
class TestNodeFunctionalTestsPyTest:
13-
1413
# If the table is created, test if the information for a specific node is as expected
1514
# Uses sample information from the node registry
1615
def test_node_info_view(self, test_input, expected):

tests/test_views.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@
99

1010

1111
def makeUser(name, role):
12-
1312
return models.User(name=name, role=role)
1413

1514

1615
def setUser(config, user):
17-
1816
config.set_security_policy(DummySecurityPolicy(identity=user))
1917

2018

2119
def makeNode(node_id, node_name, url, location, affiliation, support_contact, deployed_since, data, compute, local):
22-
2320
return models.Node(
2421
id=node_id,
2522
name=node_name,
@@ -212,7 +209,6 @@ def _addRoutes(self, config):
212209

213210
# @requests_mock.Mocker()
214211
def test_it(self, dummy_config, dummy_request, requests_mock):
215-
216212
self._addRoutes(dummy_config)
217213

218214
# requests_mock_post = requests_mock.post('http://localhost:6543/node/edit', text='mockposttest')

tests/tests.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88

99
def _initTestingDB():
10-
1110
from sqlalchemy import create_engine
1211

1312
from network_manager.models import (
@@ -23,7 +22,6 @@ def _initTestingDB():
2322
DBSession.configure(bind=engine)
2423

2524
with transaction.manager:
26-
2725
model = Node(node_name="node test", node_description="This is the description for node test")
2826

2927
DBSession.add(model)
@@ -33,13 +31,11 @@ def _initTestingDB():
3331

3432
class NodeViewTests(unittest.TestCase):
3533
def setUp(self):
36-
3734
self.session = _initTestingDB()
3835

3936
self.config = testing.setUp()
4037

4138
def tearDown(self):
42-
4339
self.session.remove()
4440

4541
testing.tearDown()
@@ -65,7 +61,6 @@ def test_node_register_view(self):
6561

6662
class NodeFunctionalTests(unittest.TestCase):
6763
def setUp(self):
68-
6964
from pyramid.paster import get_app
7065

7166
app = get_app("development.ini")
@@ -75,7 +70,6 @@ def setUp(self):
7570
self.testapp = TestApp(app)
7671

7772
def tearDown(self):
78-
7973
from network_manager.models import DBSession
8074

8175
DBSession.remove()

0 commit comments

Comments
 (0)