Merge branch 'NREL:main' into main

Author: softwareengineerprogrammer

CONTRIBUTING.rst

@@ -50,10 +50,17 @@ Strongly recommended: use a Python IDE such as `PyCharm <https://www.jetbrains.c
 If you are using PyCharm, first open the the cloned repo by going to File → Open and selecting your ``GEOPHIRES-X`` directory (from the previous steps).
 Run commands in a terminal with View → Tool Windows → Terminal
 
-1. `Install virtualenv <https://virtualenv.pypa.io/en/latest/installation.html#via-pip>`__ if you don't have it already. Then set up and activate a virtual environment for the project::
+1. `Install virtualenv <https://virtualenv.pypa.io/en/latest/installation.html#via-pip>`__ if you don't have it already. Then set up and activate a virtual environment for the project:
 
-    python -m venv venv
-    source venv/bin/activate
+   - Windows::
+
+        python -m venv venv
+        venv\Scripts\activate
+
+   - macOS/Linux::
+
+        python -m venv venv
+        source venv/bin/activate
 
 (If you are using PyCharm, it may prompt you to set up the virtual environment automatically, allowing you to skip this step on the command line)
 

tests/geophires_x_client_tests/test_geophires_input_parameters.py

@@ -2,8 +2,8 @@
 import uuid
 from pathlib import Path
 
-from base_test_case import BaseTestCase
 from geophires_x_client import GeophiresInputParameters
+from tests.base_test_case import BaseTestCase
 
 
 class GeophiresInputParametersTestCase(BaseTestCase):

tests/geophires_x_tests/test_cylindrical_reservoir.py

@@ -2,7 +2,7 @@
 import unittest
 from pathlib import Path
 
-from base_test_case import BaseTestCase
+from tests.base_test_case import BaseTestCase
 
 # Ruff disabled because imports are order-dependent
 # ruff: noqa: I001

tests/geophires_x_tests/test_reservoir.py

@@ -4,10 +4,10 @@
 
 from pint.facets.plain import PlainQuantity
 
-from base_test_case import BaseTestCase
 from geophires_x.GeoPHIRESUtils import static_pressure_MPa
 from geophires_x.Model import Model
 from geophires_x.Reservoir import Reservoir
+from tests.base_test_case import BaseTestCase
 
 
 class ReservoirTestCase(BaseTestCase):

tests/test_base_test_case.py

@@ -1,6 +1,6 @@
 import unittest
 
-from base_test_case import BaseTestCase
+from tests.base_test_case import BaseTestCase
 
 
 class TestBaseTestCase(BaseTestCase):

tests/test_parameter.py

@@ -3,7 +3,6 @@
 import unittest
 from pathlib import Path
 
-from base_test_case import BaseTestCase
 from geophires_x.Model import Model
 from geophires_x.Parameter import OutputParameter
 from geophires_x.Parameter import Parameter
@@ -14,6 +13,7 @@
 from geophires_x.Units import LengthUnit
 from geophires_x.Units import PressureUnit
 from geophires_x.Units import Units
+from tests.base_test_case import BaseTestCase
 
 
 class ParameterTestCase(BaseTestCase):