Merge Pull Request #12596 from trilinos/Trilinos/master_merge_2023121…

…0_180617 Automatically Merged using Trilinos Master Merge AutoTester PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20231210_180617 branch to master' PR Author: trilinos-autotester
trilinos · Dec 11, 2023 · 5d204ff · 5d204ff
2 parents 6779ba1 + 0b9a298
commit 5d204ff
Show file tree

Hide file tree

Showing 287 changed files with 11,016 additions and 4,196 deletions.
diff --git a/PackagesList.cmake b/PackagesList.cmake
@@ -138,6 +138,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
   Panzer                packages/panzer                   PT
   CTrilinos             packages/CTrilinos                ST # Switched to ST to speed up checkin testing
   PyTrilinos            packages/PyTrilinos               ST
+  PyTrilinos2           packages/PyTrilinos2              EX
   WebTrilinos           packages/WebTrilinos              EX # Should be ST
   NewPackage            packages/new_package              EX # Should be ST
   Optika		packages/optika		          EX

diff --git a/packages/PyTrilinos2/.gitignore b/packages/PyTrilinos2/.gitignore
@@ -0,0 +1,11 @@
+.DS_Store
+Makefile
+TAGS
+config.log
+config.status
+*~
+build
+dist
+*.err
+examples/*.png
+python/getTpetraTypeName.py