Merge branch 'idaholab:devel' into New_MELCOR_Interface

idaholab · Oct 28, 2022 · 446f280 · 446f280
2 parents 9e98ecb + c73d497
commit 446f280
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,4 +4,3 @@ recursive-include crow/contrib/include/Eigen *
 recursive-include crow/contrib/include/boost *
 include include/contrib/AMSC/*.h
 include include/contrib/ngl/*.h*
-include ravenframework/ROMExternal.py
diff --git a/setup.py b/setup.py
@@ -85,6 +85,6 @@ class CustomBuild(build):
                              'src/AMSC/UnionFind.cpp',
                              'src/AMSC/AMSC.cpp'],
                     include_dirs=include_dirs, swig_opts=swig_opts,extra_compile_args=extra_compile_args)],
-      py_modules=['AMSC.amsc','crow_modules.distribution1D','crow_modules.randomENG','crow_modules.interpolationND', 'AMSC.AMSC_Object']+['ravenframework.'+x for x in ['Application', 'ClassProperty', 'CodeInterfaceBaseClass', 'CodeInterfaces', 'CsvLoader', 'CustomCommandExecuter', 'Distributions', 'Driver', 'EntityFactoryBase', 'Files', 'Functions', 'GridEntities', 'IndexSets', 'Interaction', 'JobHandler', 'MessageHandler', 'MetricDistributor', 'OrthoPolynomials', 'PluginManager', 'Quadratures', 'Simulation', 'VariableGroups', 'h5py_interface_creator', 'raven_qsub_command', 'unSupervisedLearning']],
-      packages=['ravenframework.'+x for x in setuptools.find_packages('ravenframework')],
+      py_modules=['AMSC.amsc','crow_modules.distribution1D','crow_modules.randomENG','crow_modules.interpolationND', 'AMSC.AMSC_Object'],
+      packages=['ravenframework.'+x for x in setuptools.find_packages('ravenframework')]+['ravenframework'],
       cmdclass={'build': CustomBuild})