Commit 0840293f authored by Scott Wittenburg's avatar Scott Wittenburg Committed by Kitware Robot
Browse files

Merge topic 'add-back-install-rules-python-wheels-for-pvweb'

a89fcd61 Add back install rules
84301678 apple: look for Python modules in lib as well
61079bf8 win32: paraview.vtk is part of paraview now
d29f3084 Update paraviewweb test so it can work again
7b53d9a8 paraviewweb: fix packages
04af58aa paraview.test: test paraview web
2fc14a67 cmake: sort the project list
dcf6ffc6

 paraview.bundle: package matplotlib dependencies
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !415
parents 844212cf a89fcd61
......@@ -39,38 +39,43 @@ function (superbuild_find_projects var)
mark_as_advanced(USE_NONFREE_COMPONENTS)
list(APPEND projects
cuda
boost
bzip2
cuda
embree
freetype
hdf5
ispc
lapack
netcdf
las
matplotlib
mpi
netcdf
numpy
ospray
paraviewweb
paraviewwebvisualizer
paraviewweblightviz
paraviewwebdivvy
paraviewweblightviz
paraviewwebvisualizer
png
pythonautobahn
pythonconstantly
pythoncycler
pythondateutil
pythonhyperlink
pythonincremental
pythonpygments
pythonpyparsing
pythonsetuptools
pythonsix
pythontwisted
pythontxaio
pythonwslink
pythonzope
pythonzopeinterface
pytz
qt5
silo
las
szip
tbb
visitbridge
......
......@@ -90,6 +90,7 @@ if (python_enabled)
${python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/Applications/paraview.app/Contents/Python"
"${superbuild_install_location}/lib/python2.7/site-packages"
SEARCH_DIRECTORIES
"${superbuild_install_location}/Applications/paraview.app/Contents/Libraries"
"${superbuild_install_location}/lib")
......
......@@ -64,12 +64,16 @@ check_for_python_module(pythonpygments pygments)
check_for_python_module(pythonsix six)
check_for_python_module(pythonautobahn autobahn)
check_for_python_module(pythonconstantly constantly)
check_for_python_module(pythoncycler cycler)
check_for_python_module(pythondateutil dateutil)
check_for_python_module(pythonhyperlink hyperlink)
check_for_python_module(pythonincremental incremental)
check_for_python_module(pythonpyparsing pyparsing)
check_for_python_module(pythontwisted twisted)
check_for_python_module(pythontxaio txaio)
check_for_python_module(pythonwslink wslink)
check_for_python_module(pythonzopeinterface zope)
check_for_python_module(pytz pytz)
if (WIN32)
check_for_python_module(pywin32 adodbapi)
......
......@@ -75,16 +75,6 @@ if (python_enabled)
DESTINATION "bin/Lib/site-packages/matplotlib/mpl-data"
COMPONENT superbuild)
endif ()
superbuild_windows_install_python(
MODULES vtk
NAMESPACE "/paraview"
MODULE_DIRECTORIES
"${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version_major}.${paraview_version_minor}/site-packages"
SEARCH_DIRECTORIES "lib" "${superbuild_install_location}/bin")
endif ()
if (paraviewweb_enabled)
......
Subproject commit 98cbf6d39eeec705af7bf1daef1f07a277b27c67
Subproject commit 8a4f5bf6c760503dda588e34a81f4d8dcbb89ff6
......@@ -89,6 +89,11 @@ if (NOT WIN32)
paraview_add_pvbatch_test("pvbatch" "basic_python")
endif ()
# Simple test to test paraviewweb.
if (paraviewweb_enabled)
paraview_add_python_test("pvweb" "basic_paraviewweb")
endif ()
if (numpy_enabled)
paraview_add_python_test("import-numpy" "import_numpy")
endif ()
......@@ -154,7 +159,7 @@ if (mesa_enabled AND python_enabled)
if (mesa_USE_SWR)
# Either don't add or add but explicitly disable this test for now
# until the underlying VTK segfault is fixed.
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
paraview_add_test("mesa-swr" "${pvpython_exe}"
${mesa_swr_arg}
"${CMAKE_CURRENT_LIST_DIR}/python/CheckOpenGLVersion.py"
......@@ -163,8 +168,8 @@ if (mesa_enabled AND python_enabled)
set_tests_properties(paraview-mesa-swr PROPERTIES
PASS_REGULAR_EXPRESSION "SWR (detected|could not initialize)"
DISABLED TRUE)
endif()
endif()
endif ()
endif ()
endif ()
paraview_add_ui_test("loaddistributedplugins" "LoadDistributedPlugins"
......
from paraview.web import wamp, protocols, pv_web_visualizer
from vtk.web import server
from paraview.web import test_server
from wslink import server
# Configure our current application
pv_web_visualizer._VisualizerServer.authKey = 'paraviewweb-secret'
pv_web_visualizer._VisualizerServer.dataDir = '.'
test_server._TestServer.authKey = 'paraviewweb-secret'
test_server._TestServer.dataDir = '.'
# Setup static args
class TestArgs:
......@@ -41,5 +41,6 @@ args.lp = 'lp'
args.nows = False
args.nolp = False
args.nobws = False
args.fsEndpoints = ''
# Start server
server.start_webserver(options=args, protocol=pv_web_visualizer._VisualizerServer)
server.start_webserver(options=args, protocol=test_server._TestServer)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment