Commit 25c8efa4 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'add-meshio'

1533ee35 ci: enable meshio for aeva binaries
fe5263c0 pythonmeshio: use setuptools
0df762a5 pythonmeshio: add project
d707daa1 superbuild: bump for the wheel package
17e7d416 versions: use computationalmodelbuilder.org for python sources
440dda93 versions: use https for computationalmodelbuilder.org
127b099c

 gitlab-ci: remove unnecessary comment
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson's avatarDavid Thompson <david.thompson@kitware.com>
Merge-request: !733
parents 86ba369c 1533ee35
Pipeline #218782 failed with stages
in 178 minutes and 34 seconds
set(ENABLE_aeva ON CACHE BOOL "")
set(ENABLE_cmb OFF CACHE BOOL "")
set(ENABLE_pythonmeshio ON CACHE BOOL "")
......@@ -68,8 +68,6 @@
- export PATH=$PWD/.gitlab:$PWD/.gitlab/cmake/bin:$PATH
- cmake --version
- ninja --version
# Initialize submodules first. Older Git versions (like ones shipped in
# CentOS 7) seem to have different behavior.
- "git submodule update --init --recursive || :"
- git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
......
......@@ -160,11 +160,13 @@ function (superbuild_find_projects var)
pythondiskcache
pythongirderclient
pythonkiwisolver
pythonmeshio
pythonpyparsing
pythonrequests
pythonrequeststoolbelt
pythonsetuptools
pythonsix
pythonwheel
pytz
qt5
remus
......
......@@ -188,6 +188,11 @@ if (numpy_enabled)
numpy)
endif ()
if (pythonmeshio_enabled)
list(APPEND cmb_python_modules
meshio)
endif ()
if (pythongirderclient_enabled)
list(APPEND cmb_python_modules
diskcache
......
diff -u -Nru5 meshio-4.3.11/setup.py meshio-4.3.11.setuptools/setup.py
--- meshio-4.3.11/setup.py 1969-12-31 19:00:00.000000000 -0500
+++ meshio-4.3.11.setuptools/setup.py 2021-03-12 15:34:43.463971326 -0500
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import setuptools
+
+if __name__ == "__main__":
+ setuptools.setup()
superbuild_add_project_python(pythonmeshio
PACKAGE meshio
DEPENDS pythonsetuptools pythonwheel)
# meshio uses this new `pyproject.toml` setup which doesn't support our use
# case. Just ignore this and use `setup.py`.
superbuild_apply_patch(pythonmeshio setup.py
"Add a setup.py")
Subproject commit a4372c91300e8c9266f8d1e73ffdd04f2342fcdc
Subproject commit 8f195d2cb9f981bb464a9ba4bd20856892a4a744
......@@ -104,13 +104,13 @@ superbuild_set_revision(itkvtkglue
# Use opencv from Thu Oct 6 13:40:33 2016 +0000
superbuild_set_revision(opencv
# https://github.com/opencv/opencv.git
URL "http://www.computationalmodelbuilder.org/files/dependencies/opencv-dd379ec9fddc1a1886766cf85844a6e18d38c4f1.tar.bz2"
URL "https://www.computationalmodelbuilder.org/files/dependencies/opencv-dd379ec9fddc1a1886766cf85844a6e18d38c4f1.tar.bz2"
URL_MD5 19bbd14ed1bd741beccd6d19e444552f)
# Use the tweaked cmake build of zeromq
superbuild_set_revision(zeromq
# https://github.com/robertmaynard/zeromq4-x.git
URL "http://www.computationalmodelbuilder.org/files/dependencies/zeromq4-6d787cf69da6c69550e85a45be1bee1eb0e1c415-no-symlink.tar.bz2"
URL "https://www.computationalmodelbuilder.org/files/dependencies/zeromq4-6d787cf69da6c69550e85a45be1bee1eb0e1c415-no-symlink.tar.bz2"
URL_MD5 741e15aafbb9f98c48433186ddc484fa)
# Use remus from Thu Nov 7 16:05:31 2019 +0000
......@@ -120,17 +120,17 @@ superbuild_set_revision(remus
superbuild_set_revision(gdal
# https://github.com/judajake/gdal-svn.git
URL "http://www.computationalmodelbuilder.org/files/dependencies/gdal-98353693d6f1d607954220b2f8b040375e3d1744.tar.bz2"
URL "https://www.computationalmodelbuilder.org/files/dependencies/gdal-98353693d6f1d607954220b2f8b040375e3d1744.tar.bz2"
URL_MD5 5aa285dcc856f98ce44020ae1ae192cb)
superbuild_set_revision(eigen
# https://github.com/eigenteam/eigen-git-mirror/releases/tag/3.3.7
URL "http://www.computationalmodelbuilder.org/files/dependencies/eigen-git-mirror-3.3.7.tar.gz"
URL "https://www.computationalmodelbuilder.org/files/dependencies/eigen-git-mirror-3.3.7.tar.gz"
URL_MD5 77a2c934eaf35943c43ee600a83b72df)
superbuild_set_revision(moab
# https://bitbucket.org/fathomteam/moab.git
URL "http://www.computationalmodelbuilder.org/files/dependencies/moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.tar.bz2"
URL "https://www.computationalmodelbuilder.org/files/dependencies/moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.tar.bz2"
URL_MD5 5946a405cddce972d54044fca6c87b11)
superbuild_set_revision(triangle
......@@ -138,25 +138,29 @@ superbuild_set_revision(triangle
URL "https://www.paraview.org/files/dependencies/triangle-4c20820448cdfa27f968cfd7cb33ea5b9426ad91.tar.bz2"
URL_MD5 9a016bc90f1cdff441c75ceb53741b11)
superbuild_set_revision(pythonmeshio
URL "https://www.computationalmodelbuilder.org/files/dependencies/meshio-4.3.11.tar.gz"
URL_MD5 56593e77540413ceaccaecccd6b55585)
superbuild_set_revision(pythondiskcache
URL "https://files.pythonhosted.org/packages/1b/18/ef9b2748bfadc2035d20076869db2dd5d4e22858dd819776bc8f488ec152/diskcache-3.1.0.tar.gz"
URL "https://www.computationalmodelbuilder.org/files/dependencies/diskcache-3.1.0.tar.gz"
URL_HASH SHA256=96cd1be1240257167a090794cce45db02ecf39d20b7a062580299b42107690ac)
superbuild_set_revision(pythongirderclient
URL "https://files.pythonhosted.org/packages/42/49/a8772bc89b348b0a41e2d583a6aa04d4d9db21a3568a7df17d68029ebb84/girder-client-2.4.0.tar.gz"
URL "https://www.computationalmodelbuilder.org/files/dependencies/girder-client-2.4.0.tar.gz"
URL_HASH SHA256=1a9c882b8bce2e8233f572a4df9565c678e5614993e6606cdff04251532cddcb)
superbuild_set_revision(pythonrequests
URL "https://pypi.python.org/packages/source/r/requests/requests-2.9.1.tar.gz"
URL "https://www.computationalmodelbuilder.org/files/dependencies/requests-2.9.1.tar.gz"
URL_MD5 0b7f480d19012ec52bab78292efd976d)
superbuild_set_revision(pythonrequeststoolbelt
URL "https://files.pythonhosted.org/packages/86/f9/e80fa23edca6c554f1994040064760c12b51daff54b55f9e379e899cd3d4/requests-toolbelt-0.8.0.tar.gz"
URL "https://www.computationalmodelbuilder.org/files/dependencies/requests-toolbelt-0.8.0.tar.gz"
URL_HASH SHA256=f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5)
superbuild_set_revision(pybind11
# https://github.com/pybind/pybind11.git
URL "http://www.computationalmodelbuilder.org/files/dependencies/pybind11-97784dad3e518ccb415d5db57ff9b933495d9024.tar.bz2"
URL "https://www.computationalmodelbuilder.org/files/dependencies/pybind11-97784dad3e518ccb415d5db57ff9b933495d9024.tar.bz2"
URL_MD5 3e20adc18562f482b86bebaed19c55d2)
superbuild_set_revision(ftgl
......@@ -168,7 +172,7 @@ superbuild_set_revision(occt
# https://git.dev.opencascade.org/gitweb/?p=occt.git pick the tag you want, and download a snapshot.
# current: 7.4.0p1
# Extract, delete docs, tests, and sample data, and recompress as .tar.bz2
URL "http://www.computationalmodelbuilder.org/files/dependencies/occt-7.4.0p1-stripped.tar.bz2"
URL "https://www.computationalmodelbuilder.org/files/dependencies/occt-7.4.0p1-stripped.tar.bz2"
URL_MD5 24b95c5d55558ba087b9565f30c67718)
superbuild_set_revision(paraviewwebvisualizer
......@@ -201,7 +205,7 @@ superbuild_set_revision(aevaexampledata
# Use json from Wed Mar 20 21:03:30 2019 +0100
superbuild_set_revision(nlohmannjson
URL "http://www.computationalmodelbuilder.org/files/dependencies/json-295732a81780378c62d1c095078b4634dac8ec28.tar.bz2"
URL "https://www.computationalmodelbuilder.org/files/dependencies/json-295732a81780378c62d1c095078b4634dac8ec28.tar.bz2"
URL_MD5 2113211f84a0b01c1c70900285c81e2c)
superbuild_set_revision(meshkit
......@@ -228,7 +232,7 @@ superbuild_set_revision(smtkprojectmanager
superbuild_set_revision(pegtl
# https://github.com/taocpp/PEGTL/releases/tag/2.7.1
URL "http://www.computationalmodelbuilder.org/files/dependencies/PEGTL-2.7.1.tar.gz"
URL "https://www.computationalmodelbuilder.org/files/dependencies/PEGTL-2.7.1.tar.gz"
URL_MD5 da0363623cf0936e4cb2648b001af257)
superbuild_set_revision(las
......
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