Ticket #8039 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Straggling references to PythonAPI

Reported by: Martyn Gigg Owned by: Martyn Gigg
Priority: blocker Milestone: Release 3.0
Component: Python Keywords:
Cc: Blocked By:
Blocking: Tester: Owen Arnold

Description

This is the current list of references to PythonAPI. The generateWxs ones are handled in #8011. 

find . -path '*/.svn' -prune -o -type f -print | xargs -e grep -I -n -e PythonAPI
./Build/cmakelists_utils.py:114:    projects = ["Algorithms", "DataObjects", "MDAlgorithms", "PythonAPI", "API", 
./MantidPlot/FixBundle.cmake.in:82:set ( other_libs ${bundle}/Contents/MacOS/libMantidPythonAPI.so
./Framework/MPIAlgorithms/scripts/EnsembleSamples.sh:15:export PYTHONPATH=/home/vel/Mantid/Code/mpi-build/bin:/home/tr9/mantid-deps/site-packages:/home/vel/Mantid/Code/Mantid/Framework/PythonAPI/PythonAlgorithms
./Framework/CMakeLists.txt:141:                     PythonGeometryModule PythonAPIModule DataObjects
./Framework/PythonInterface/test/testhelpers/CMakeLists.txt:33:target_link_libraries ( PythonWorkspaceCreationHelper PythonAPIModule DataObjects MDEvents DataHandling )
./Framework/PythonInterface/test/cpp/CMakeLists.txt:18:  target_link_libraries( PythonInterfaceCppTest PythonKernelModule PythonAPIModule )
./Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py:4:The source code for the Python Algorithm may be viewed at: [http://trac.mantidproject.org/mantid/browser/trunk/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/OSIRISDiffractionReduction.py OSIRISDiffractionReduction.py]
./Framework/PythonInterface/mantid/CMakeLists.txt:52:add_custom_target ( PythonInterface DEPENDS PythonKernelModule PythonGeometryModule PythonAPIModule  )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:115:add_library ( PythonAPIModule ${SRC_FILES} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:116:set_python_properties( PythonAPIModule _api )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:117:set_target_output_directory ( PythonAPIModule ${OUTPUT_DIR} .pyd )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:120:target_link_libraries ( PythonAPIModule PythonGeometryModule PythonKernelModule ${PYTHON_DEPS} )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:125:install ( TARGETS PythonAPIModule ${SYSTEM_PACKAGE_TARGET} DESTINATION ${BIN_DIR}/mantid/api )
./Framework/Properties/Mantid.properties.template:26:plugins.exclude = MantidPythonAPI;dlopen
./Framework/WorkflowAlgorithms/PythonWorkflowAlgorithms_README.txt:3:Framework/PythonAPI/PythonAlgorithms/WorkflowAlgorithms
./Framework/Kernel/CMakeLists.txt:400:set ( PYTHONALG_DIRS "${MANTID_ROOT}/Framework/PythonAPI/PythonAlgorithms;${MANTID_ROOT}/Framework/PythonInterface/PythonAlgorithms" ) # deprecated
./Framework/Kernel/CMakeLists.txt:401:set ( PYTHONPLUGIN_DIRS "${MANTID_ROOT}/Framework/PythonAPI/PythonAlgorithms;${MANTID_ROOT}/Framework/PythonInterface/plugins" )
./Framework/API/inc/MantidAPI/IEventList.h:17:   * expose to PythonAPI
./Framework/Doxygen/Mantid_template.doxyfile:105:        @CMAKE_CURRENT_SOURCE_DIR@/../PythonAPI/inc/MantidPythonAPI \
./Framework/Doxygen/Mantid_template.doxyfile:106:        @CMAKE_CURRENT_SOURCE_DIR@/../PythonAPI/src \
./Framework/Doxygen/Mantid_template.doxyfile:156:			 @CMAKE_CURRENT_SOURCE_DIR@/../PythonAPI/src/boostpython.cpp \
./Framework/Doxygen/Mantid_template.doxyfile:157:			 @CMAKE_CURRENT_SOURCE_DIR@/../PythonAPI/src/boostpython \
./scripts/lib1to2/grammar.py:19:        version 1 of Mantid's Python API, to version 2 of the PythonAPI
./Installers/WinInstaller/generateWxs.py:534:MantidScript = addFileV('MantidScript','MScr.bat','MantidScript.bat',FRAMEWORKDIR + '/PythonAPI/MantidScript.bat',MantidDlls)
./Installers/WinInstaller/generateWxs.py:536:addFileV('MantidStartup','MStart.py','MantidStartup.py',FRAMEWORKDIR + '/PythonAPI/MantidStartup.py',MantidDlls)
./Installers/WinInstaller/generateWxs.py:537:addFileV('MantidPythonAPI_pyd','MPAPI.pyd','MantidPythonAPI.pyd',MANTIDRELEASE + '/MantidPythonAPI.pyd',MantidDlls)
./Installers/WinInstaller/generateWxs.py:572:addFileV('MtdFramework_py', 'MFWork.py', 'MantidFramework.py', FRAMEWORKDIR + '/PythonAPI/MantidFramework.py', MantidDlls)
./Installers/WinInstaller/generateWxs.py:573:addFileV('MtdSimple_py', 'MSimple.py', 'mantidsimple.py', FRAMEWORKDIR + '/PythonAPI/mantidsimple.py', MantidDlls)
./Installers/WinInstaller/generateWxs.py:647:pyalgsList = addCompList("PyAlgsDir",FRAMEWORKDIR + "/PythonAPI/PythonAlgorithms","PythonAlgs",pluginsDir,exclude_suffix=['.pyc'])[0]

Change History

comment:1 Changed 7 years ago by Martyn Gigg

  • Status changed from new to inprogress

Remove PythonAPI reference from Kerne;/CmakeLists.txt

Refs #8039

Changeset: 9e0d50a79dc8e4ca0bc5b29a330cd61b0631efea

comment:2 Changed 7 years ago by Martyn Gigg

Remove stale references to PythonAPI directories.

Refs #8039

Changeset: 51a5cf1e198362f891a01eb7654da0891309fbb2

comment:3 Changed 7 years ago by Martyn Gigg

  • Status changed from inprogress to verify
  • Resolution set to fixed

A search for PythonAPI now yields (excluding the generateWxs.py refs mentioned above): 

find . -path '*/.svn' -prune -o -type f -print | xargs -e grep -I -n -e PythonAPI
./Framework/CMakeLists.txt:141:                     PythonGeometryModule PythonAPIModule DataObjects
./Framework/PythonInterface/test/testhelpers/CMakeLists.txt:33:target_link_libraries ( PythonWorkspaceCreationHelper PythonAPIModule DataObjects MDEvents DataHandling )
./Framework/PythonInterface/test/cpp/CMakeLists.txt:18:  target_link_libraries( PythonInterfaceCppTest PythonKernelModule PythonAPIModule )
./Framework/PythonInterface/mantid/CMakeLists.txt:52:add_custom_target ( PythonInterface DEPENDS PythonKernelModule PythonGeometryModule PythonAPIModule  )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:115:add_library ( PythonAPIModule ${SRC_FILES} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:116:set_python_properties( PythonAPIModule _api )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:117:set_target_output_directory ( PythonAPIModule ${OUTPUT_DIR} .pyd )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:120:target_link_libraries ( PythonAPIModule PythonGeometryModule PythonKernelModule ${PYTHON_DEPS} )
./Framework/PythonInterface/mantid/api/CMakeLists.txt:125:install ( TARGETS PythonAPIModule ${SYSTEM_PACKAGE_TARGET} DESTINATION ${BIN_DIR}/mantid/api )
./Framework/API/inc/MantidAPI/IEventList.h:17:   * expose to PythonAPI
./scripts/lib1to2/grammar.py:19:        version 1 of Mantid's Python API, to version 2 of the PythonAPI

This is fine. The PythonAPIModule is the api module in the new PythonInterface directory. The ref in scripts/lib1to2/grammar.py:19 relates to the migration tool and IEventList is just a comment referring generally to the Python api.

comment:4 Changed 7 years ago by Martyn Gigg

Branch: bugfix/8039_remove_pythonapi_refs

Tester: Search through the source code and the only references should be the ones mentioned above.

comment:5 Changed 7 years ago by Owen Arnold

  • Status changed from verify to verifying
  • Tester set to Owen Arnold

comment:6 Changed 7 years ago by Owen Arnold

All good apart from TestViewer. We no longer need this anyway. #8040 created to remove the TestViewer.

comment:7 Changed 7 years ago by Owen Arnold

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/bugfix/8039_remove_pythonapi_refs'

comment:8 Changed 7 years ago by Nick Draper

  • Component changed from Framework to Python API

comment:9 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​8884

Note: See TracTickets for help on using tickets.