Skip to content

Commit

Permalink
PyTrilinos: Replace PYTHON_EXECUTABLE with Python3_EXECUTABLE (TriBIT…
Browse files Browse the repository at this point in the history
…SPub/TriBITS#610)

There are a bunch of non-CMake or RST files in PyTrilinos that use
PYTHON_EXECUTABLE.  Not sure how all of this works but hopefully this does the
right thing.

Signed-off-by: Roscoe A. Bartlett <[email protected]>
  • Loading branch information
bartlettroscoe committed Oct 11, 2024
1 parent c4c71e5 commit 600198f
Show file tree
Hide file tree
Showing 114 changed files with 114 additions and 114 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ <h2><a class="toc-backref" href="#id26">Build System</a></h2>
during the copy procedure. For example, the first line of each test
script source file is now:</p>
<pre class="literal-block">
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
</pre>
<p>which means that the python executable that is recognized (and
compiled against) by the CMake build system will also be the python
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/doc/DevelopersGuide/Testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ reason for this is that CMake variable values can be substituted
during the copy procedure. For example, the first line of each test
script source file is now::

#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}

which means that the python executable that is recognized (and
compiled against) by the CMake build system will also be the python
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/doc/Doxygen/docstrings.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}

# System includes
from __future__ import print_function
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/doc/Doxygen/doxy2swig.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
"""
Doxygen XML to SWIG docstring converter.

Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/doc/Doxygen/makedeps.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}

"""
Create a Makefile dependency file that includes all of the names of the source
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Python and SWIG
You may specify the python interpreter (and thus the version of the
Python/C API) with the ``cmake`` option::

-D PYTHON_EXECUTABLE:FILEPATH=...
-D Python3_EXECUTABLE:FILEPATH=...

If you do not specify this option, ``cmake`` actually looks for an
executable named ``python2.7`` (and then ``python2.6``, etc., down to
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/doc/UsersGuide/UsersGuide.html
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ <h2><a class="toc-backref" href="#id4">Python and SWIG</a></h2>
<p>You may specify the python interpreter (and thus the version of the
Python/C API) with the <tt class="docutils literal">cmake</tt> option:</p>
<pre class="literal-block">
-D PYTHON_EXECUTABLE:FILEPATH=...
-D Python3_EXECUTABLE:FILEPATH=...
</pre>
<p>If you do not specify this option, <tt class="docutils literal">cmake</tt> actually looks for an
executable named <tt class="docutils literal">python2.7</tt> (and then <tt class="docutils literal">python2.6</tt>, etc., down to
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exAmesos_Factory.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exAmesos_Solvers.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exAnasazi_BlockDavidson.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exAztecOO.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exAztecOO_BasicRowMatrix.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exAztecOO_Operator.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exAztecOO_RowMatrix.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exDomi_Simple.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetra.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetraExt_IO_HDF5.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetraExt_IO_XML.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetraExt_MatrixMatrix.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetra_Comm.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetra_CrsMatrix_Easy.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetra_DAP.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exEpetra_ImportExport.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exGaleri.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exGaleri_ReadHB.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exIFPACK.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exIsorropia.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exKomplex_Simple.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exLOCA_Chan.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# ************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exLOCA_Chan_Jac.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# ************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exMLAPI.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exMLAPI_AztecOO.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exMLAPI_Iterate.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exMLAPI_PyMatrix.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exMLAPI_Simple.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exMLAPI_Smoother.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exMPI_Init.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exNOXEpetraExt_2DSim.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exNOX_1Dfdm.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exNOX_2DSim.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exTeuchos.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/exThyra.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/example/testutil.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/src/PyTrilinos/LOCA/__init__.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/src/PyTrilinos/NOX/__init__.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/src/PyTrilinos/Teuchos/__init__.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/src/PyTrilinos/__init__.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/src/gen_teuchos_rcp.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

import glob
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/src/scripts/IsorropiaVisualizer.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# TODO:
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/src/scripts/testutil.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/test/testAmesos.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/test/testAnasazi.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/test/testAztecOO.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
2 changes: 1 addition & 1 deletion packages/PyTrilinos/test/testEpetraExt_Coloring.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! ${PYTHON_EXECUTABLE}
#! ${Python3_EXECUTABLE}
# -*- python -*-

# @HEADER
Expand Down
Loading

0 comments on commit 600198f

Please sign in to comment.