Skip to content

Commit cfc8970

Browse files
Jason Millerloganharbour
authored andcommitted
Merge pull request #29624 from farscape-project/hit
Regen hit.cpp w/ cython 3.0.11, remove conda/pyhit and fix find_moose_executable util
2 parents dba2e66 + bf8fe99 commit cfc8970

File tree

10 files changed

+1348
-1406
lines changed

10 files changed

+1348
-1406
lines changed

conda/moose-dev/conda_build_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ moose_libmesh:
77
- moose-libmesh 2024.12.02 openmpi_1
88

99
moose_wasp:
10-
- moose-wasp 2024.12.23
10+
- moose-wasp 2025.01.07
1111

1212
moose_tools:
1313
- moose-tools 2024.12.23

conda/moose-dev/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# REMEMBER TO UPDATE the .yaml files for the following packages:
33
# moose/conda_build_config.yaml
44
# As well as any directions pertaining to modifying those files.
5-
{% set version = "2024.02.12" %}
5+
{% set version = "2025.02.18" %}
66

77
package:
88
name: moose-dev

conda/moose/conda_build_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mpi:
33
- openmpi
44

55
moose_dev:
6-
- moose-dev 2024.02.12
6+
- moose-dev 2025.02.18
77

88
#### Darwin SDK SYSROOT
99
CONDA_BUILD_SYSROOT: # [osx]

conda/pyhit/build.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

conda/pyhit/conda_build_config.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

conda/pyhit/meta.yaml

Lines changed: 0 additions & 46 deletions
This file was deleted.

conda/wasp/meta.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# As well as any directions pertaining to modifying those files.
66
# ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml
7-
{% set version = "2024.12.23" %}
7+
{% set version = "2025.01.07" %}
88

99
package:
1010
name: moose-wasp
@@ -13,7 +13,6 @@ package:
1313
source:
1414
- path: ../../framework/contrib/wasp
1515
- path: ../../scripts/configure_wasp.sh
16-
- path: ../pyhit
1716
- path: ../../python/moosetree
1817
folder: pyhit/moosetree
1918
- path: ../../python/mooseutils/message.py

0 commit comments

Comments
 (0)