Skip to content

Commit

Permalink
formatted with trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
nh916 committed Sep 15, 2023
1 parent f42f31f commit d8b4fa7
Show file tree
Hide file tree
Showing 27 changed files with 33 additions and 50 deletions.
2 changes: 1 addition & 1 deletion tests/api/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

import pytest
import requests
from tests.conftest import HAS_INTEGRATION_TESTS_ENABLED

import cript
from cript.api.exceptions import InvalidVocabulary
from cript.api.paginator import Paginator
from cript.nodes.exceptions import CRIPTNodeSchemaError
from tests.conftest import HAS_INTEGRATION_TESTS_ENABLED


def test_api_with_invalid_host() -> None:
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
import os

import pytest

import cript
from tests.fixtures.primary_nodes import *
from tests.fixtures.subobjects import *
from tests.fixtures.supporting_nodes import *

import cript


def _get_cript_tests_env() -> bool:
"""
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/primary_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import uuid

import pytest
from tests.utils.util import strip_uid_from_dict

import cript
from tests.utils.util import strip_uid_from_dict


@pytest.fixture(scope="function")
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/subobjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import uuid

import pytest
from tests.utils.util import strip_uid_from_dict

import cript
from tests.utils.util import strip_uid_from_dict


@pytest.fixture(scope="function")
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_simple_collection(simple_experiment_node) -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_computation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_simple_computation_node() -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_computational_process.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_simple_computational_process(simple_data_node, complex_ingredient_node) -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_simple_data_node(complex_file_node) -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_simple_experiment() -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_inventory.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_get_and_set_inventory(simple_inventory_node) -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_material.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_complex_material(simple_material_node, simple_computational_forcefield_node, simple_process_node) -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_simple_process() -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/primary_nodes/test_project.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_simple_project(simple_collection_node) -> None:
"""
Expand Down
6 changes: 3 additions & 3 deletions tests/nodes/primary_nodes/test_reference.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import warnings

import pytest

import cript
from cript.api.exceptions import APIError
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript
from cript.api.exceptions import APIError


def test_create_simple_reference() -> None:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_algorithm.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_setter_getter(simple_algorithm_node, complex_citation_node, complex_parameter_node):
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_citation.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_json(complex_citation_node, complex_citation_dict):
c = complex_citation_node
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_computational_forcefield.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_computational_forcefield(complex_computational_forcefield_node, complex_computational_forcefield_dict):
cf = complex_computational_forcefield_node
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_ingredient.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_json(complex_ingredient_node, complex_ingredient_dict):
i = complex_ingredient_node
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_parameter.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_parameter_setter_getter(complex_parameter_node):
complex_parameter_node.key = "damping_time"
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_property.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_json(complex_property_node, complex_property_dict):
p = complex_property_node
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_quantity.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_json(complex_quantity_node, complex_quantity_dict):
q = complex_quantity_node
Expand Down
6 changes: 3 additions & 3 deletions tests/nodes/subobjects/test_software.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import uuid

import pytest

import cript
from cript.api.exceptions import APIError
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript
from cript.api.exceptions import APIError


def test_json(complex_software_node, complex_software_dict):
s = complex_software_node
Expand Down
3 changes: 1 addition & 2 deletions tests/nodes/subobjects/test_software_configuration.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import json
import uuid

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_json(complex_software_configuration_node, complex_software_configuration_dict):
sc = complex_software_configuration_node
Expand Down
4 changes: 2 additions & 2 deletions tests/nodes/supporting_nodes/test_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import uuid

import pytest

import cript
from tests.utils.integration_test_helper import (
delete_integration_node_helper,
save_integration_node_helper,
)
from tests.utils.util import strip_uid_from_dict

import cript


def test_create_file() -> None:
"""
Expand Down
2 changes: 1 addition & 1 deletion tests/nodes/supporting_nodes/test_user.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import json

import pytest
from tests.utils.util import strip_uid_from_dict

import cript
from tests.utils.util import strip_uid_from_dict


def test_user_serialization_and_deserialization(complex_user_dict, complex_user_node):
Expand Down
Loading

0 comments on commit d8b4fa7

Please sign in to comment.