From 725aedf92fa4261312a0219698994c07672ad798 Mon Sep 17 00:00:00 2001
From: Tim Brooks <41971846+timryanb@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:55:37 -0400
Subject: [PATCH] Bumping tacs version to 3.7.0 (#299)

* Bumping tacs version to 3.7.0

* Making MPhys deprecation warning an error

* Removed temp mphys fix from CI
---
 .github/workflows/unit_tests.yml |  2 --
 setup.py                         |  2 +-
 tacs/mphys/builder.py            | 30 ++----------------------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 750b86799..a9ce4fa40 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -103,8 +103,6 @@ jobs:
           make TACS_DIR=$TACS_DIR METIS_INCLUDE=-I${CONDA_PREFIX}/include/ METIS_LIB="-L${CONDA_PREFIX}/lib/ -lmetis";
       - name: Install optional dependencies
         run: |
-          # Temp fix until MPhys 1.3.0 is released
-          pip install openmdao==3.30.0;
           # Install petsc for openmdao tests
           conda install -c conda-forge petsc=3.19 petsc4py -q -y;
           # Install ESP/CAPS prebuilt for shape derivatives, only in Real mode
diff --git a/setup.py b/setup.py
index 1f797395f..6cf5a14f1 100644
--- a/setup.py
+++ b/setup.py
@@ -119,7 +119,7 @@ def get_mpi_flags():
 
 setup(
     name="tacs",
-    version="3.6.0",
+    version="3.7.0",
     description="Parallel finite-element analysis package",
     long_description=long_description,
     long_description_content_type="text/markdown",
diff --git a/tacs/mphys/builder.py b/tacs/mphys/builder.py
index 3c5dd37e8..f012ecf37 100644
--- a/tacs/mphys/builder.py
+++ b/tacs/mphys/builder.py
@@ -190,36 +190,10 @@ def buckling_setup(scenario_name, fea_assembler)
 
         """
         if isinstance(mesh_file, dict):
-            warnings.warn(
+            raise ValueError(
                 "The signature for TacsBuilder has changed. Arguments such as 'mesh_file' must be passed directly as "
-                "arguments to TacsBuilder. Please see the TacsBuilder docstring for more info. This will become an "
-                "error in tacs 3.7.0",
-                DeprecationWarning,
+                "arguments to TacsBuilder. Please see the TacsBuilder docstring for more info."
             )
-            options = mesh_file
-            # Make deep copy of dict so we can modify it
-            pytacs_options = copy.deepcopy(options)
-            mesh_file = pytacs_options.pop("mesh_file")
-
-            # Load optional user-defined callback function for setting up tacs elements
-            if "assembler_setup" in pytacs_options:
-                assembler_setup = pytacs_options.pop("assembler_setup")
-
-            # Load optional user-defined callback function for setting up tacs elements
-            if "element_callback" in pytacs_options:
-                element_callback = pytacs_options.pop("element_callback")
-
-            # Load optional user-defined callback function for setting up tacs elements
-            if "problem_setup" in pytacs_options:
-                problem_setup = pytacs_options.pop("problem_setup")
-
-            # Load optional user-defined callback function for setting up constraints
-            if "constraint_setup" in pytacs_options:
-                constraint_setup = pytacs_options.pop("constraint_setup")
-
-            # Load optional user-defined callback function for setting up buckling problem
-            if "buckling_setup" in pytacs_options:
-                buckling_setup = pytacs_options.pop("buckling_setup")
 
         self.mesh_file = mesh_file
         self.assembler_setup = assembler_setup