Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade: Importing Fixtures Automatically into conftest.py #219

Merged
merged 4 commits into from
Jul 21, 2023
Merged

Upgrade: Importing Fixtures Automatically into conftest.py #219

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cf0b5a
import all fixtures in primary, subobject, and supporting nodes
nh916 Jul 21, 2023
1ba6106
formatted with trunk
nh916 Jul 21, 2023
9844ed7
ignoring ruff formatting error
nh916 Jul 21, 2023
cbcc2d0
optimizing imports with isort
nh916 Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 4 additions & 63 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# trunk-ignore-all(ruff/F401)
# trunk-ignore-all(ruff/F403)
"""
This conftest file contains simple nodes (nodes with minimal required arguments)
and complex node (nodes that have all possible arguments), to use for testing.
Expand All @@ -9,69 +9,10 @@
The fixtures are all functional fixtures that stay consistent between all tests.
"""

import json

import pytest
from fixtures.primary_nodes import (
complex_collection_node,
complex_data_node,
complex_material_dict,
complex_material_node,
complex_process_node,
complex_project_dict,
complex_project_node,
simple_collection_node,
simple_computation_node,
simple_computation_process_node,
simple_computational_process_node,
simple_data_node,
simple_experiment_node,
simple_inventory_node,
simple_material_dict,
simple_material_node,
simple_process_node,
simple_project_node,
simplest_computational_process_node,
)
from fixtures.subobjects import (
complex_algorithm_dict,
complex_algorithm_node,
complex_citation_dict,
complex_citation_node,
complex_computational_forcefield_dict,
complex_computational_forcefield_node,
complex_condition_dict,
complex_condition_node,
complex_equipment_dict,
complex_equipment_node,
complex_ingredient_dict,
complex_ingredient_node,
complex_parameter_dict,
complex_parameter_node,
complex_property_dict,
complex_property_node,
complex_quantity_dict,
complex_quantity_node,
complex_reference_dict,
complex_reference_node,
complex_software_configuration_dict,
complex_software_configuration_node,
complex_software_dict,
complex_software_node,
simple_computational_forcefield_node,
simple_condition_node,
simple_equipment_node,
simple_ingredient_node,
simple_property_dict,
simple_property_node,
simple_software_configuration,
)
from fixtures.supporting_nodes import (
complex_file_node,
complex_user_dict,
complex_user_node,
)
from util import strip_uid_from_dict
from fixtures.primary_nodes import *
from fixtures.subobjects import *
from fixtures.supporting_nodes import *

import cript

Expand Down
Loading