testing

conda/pyhit/build.sh

@@ -1,11 +1,18 @@
 #!/bin/bash
 set -eu
 
-git clean -xfd
-git submodule update --init moose
 cp -R pyhit $SP_DIR/
 cd src
+
+printf '\n\n\nDEBUG BUILDING\n'
+printf 'FLAGS?\n%s\n\n' "$LDFLAGS"
+
 make bindings
+
+printf '\n\n\nWHAT ARE THE LINKS\n'
+ldd hit.so
+printf '\n\n\n'
+
 cp hit.so $SP_DIR/pyhit/
 cat > $SP_DIR/pyhit-$PKG_VERSION.egg-info <<FAKE_EGG
 Metadata-Version: 2.1

conda/pyhit/conda_build_config.yaml

@@ -1,10 +1,12 @@
 moose_wasp:
-  moose-wasp 2024.05.08
+  moose-wasp 2024.08.30
 
 moose_python:
-  - python 3.10
-  - python 3.9
-  - python 3.8
+  - python 3.11
+  # for speedy troubleshooting only do one for now
+  #- python 3.10
+  #- python 3.9
+  #- python 3.8
 
 # Pesky packages that break internal CI
 # Note: Modifying/Updating this will require changes to conda/mpich!

conda/pyhit/meta.yaml

@@ -1,35 +1,43 @@
-{% set version = "2024.05.08" %}
+{% set version = "2024.08.30" %}
 
 package:
   name: moose-pyhit
   version: {{ version }}
 
 source:
-  git_url: https://github.com/milljm/moose-pyhit.git
+  - path: ../pyhit
+  - path: ../../python/moosetree
+    folder: pyhit/moosetree
+  - path: ../../python/mooseutils/message.py
+    folder: pyhit/mooseutils/message.py
+  - path: ../../python/mooseutils/mooseutils.py
+    folder: pyhit/mooseutils/mooseutils.py
+  - path: ../../framework/contrib/hit
+    folder: src
+  - path: ../../python/pyhit/pyhit.py
+    folder: pyhit
+  - patches:
+      - pyhit.patch
 
 build:
   number: 0
   string: build_0
   skip: true           # [win]
-  pin_depends: record
 
 requirements:
   build:
     - {{ compiler('cxx') }}
     - {{ moose_python }}
     - {{ moose_wasp }}
+    - make
     - cython
     - setuptools
 
   host:
-    - {{ compiler('cxx') }}
     - {{ moose_python }}
-    - make
-    - cython
 
   run:
     - {{ moose_wasp }}
-    - setuptools
     - python
 
 test:

conda/pyhit/pyhit.patch

@@ -0,0 +1,17 @@
+diff --git a/pyhit/pyhit.py b/pyhit/pyhit.py
+index c484b9e6a6..4fc6c1ff95 100644
+--- a/pyhit/pyhit.py
++++ b/pyhit/pyhit.py
+@@ -10,9 +10,9 @@
+ """Wrapper for hit parser."""
+ import os
+ import subprocess
+-import moosetree
+-import hit
+-from mooseutils import message
++from . import moosetree
++from . import hit
++from .mooseutils import message
+
+ class Node(moosetree.Node):
+     """

conda/pyhit/pyhit/__init__.py

@@ -0,0 +1,10 @@
+#* This file is part of the MOOSE framework
+#* https://www.mooseframework.org
+#*
+#* All rights reserved, see COPYRIGHT for full restrictions
+#* https://github.com/idaholab/moose/blob/master/COPYRIGHT
+#*
+#* Licensed under LGPL 2.1, please see LICENSE for details
+#* https://www.gnu.org/licenses/lgpl-2.1.html
+
+from .pyhit import Node, load, write, parse

conda/pyhit/pyhit/mooseutils/__init__.py

@@ -0,0 +1,10 @@
+#* This file is part of the MOOSE framework
+#* https://www.mooseframework.org
+#*
+#* All rights reserved, see COPYRIGHT for full restrictions
+#* https://github.com/idaholab/moose/blob/master/COPYRIGHT
+#*
+#* Licensed under LGPL 2.1, please see LICENSE for details
+#* https://www.gnu.org/licenses/lgpl-2.1.html
+
+from .mooseutils import colorText

conda/wasp/meta.yaml

@@ -5,7 +5,7 @@
 #
 # As well as any directions pertaining to modifying those files.
 # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml
-{% set version = "2024.05.08" %}
+{% set version = "2024.08.30" %}
 
 package:
   name: moose-wasp