Merge branch 'master' of https://gitlab.dune-project.org/core/dune-geometry

.gitignore

 *~
 /build*/
+# ignore files generated during python setup.py sdist
+MANIFEST
+_skbuild/
+dist

dune-geometry.pc.in

@@ -8,8 +8,8 @@ DEPENDENCIES=@REQUIRES@
 
 Name: @PACKAGE_NAME@
 Version: @VERSION@
-Description: DUNE (Distributed and Unified Numerics Environment) geometry module
-URL: http://dune-project.org/
+Description: @DESCRIPTION@
+URL: @URL@
 Requires: ${DEPENDENCIES}
 Libs: -L${libdir} -ldunegeometry
 Cflags: -I${includedir}

dune.module

 Module: dune-geometry
 Version: 2.8-git
+Author: The Dune Core developers
 Maintainer: dune-devel@lists.dune-project.org
+Description: Geometry Transformations, Reference Elements and Quadrature Rules
+URL: https://gitlab.dune-project.org/core/dune-geometry
 Depends: dune-common (>= 2.8)
 Whitespace-Hook: Yes

pyproject.toml

+[build-system]
+requires = ['setuptools', 'wheel', 'scikit-build', 'cmake', 'ninja', 'requests', 'dune-common>=2.8.0.dev0']
+build-backend = 'setuptools.build_meta'

python/dune/geometry/CMakeLists.txt

@@ -5,3 +5,4 @@ add_python_targets(geometry
 )
 dune_add_pybind11_module(NAME _geometry)
 set_property(TARGET _geometry PROPERTY LINK_LIBRARIES dunecommon dunegeometry APPEND)
+install(TARGETS _geometry LIBRARY DESTINATION python/dune/geometry)

python/dune/geometry/quadpy.py

@@ -80,7 +80,7 @@ try:
             quad = qp.hexahedron
             from quadpy.ncube import transform
         elif gt.isPyramid:
-            vertices = [[0.0, 0.0, 0.0], [1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [1.0, 1.0, 0.0] [0.0, 0.0, 1.0]]
+            vertices = [[0.0, 0.0, 0.0], [1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [1.0, 1.0, 0.0], [0.0, 0.0, 1.0]]
             quad = qp.pyramid
             raise ValueError("prism quadratures not yet fully supported")
         elif gt.isPrism:

python/setup.py.in

 from setuptools import setup, find_packages
 
-setup(name="dune.geometry",
+pkg = [m for m in "${ProjectPythonRequires}".split(' ') if "dune" not in m]
+
+setup(name="${ProjectName}",
     namespace_packages=['dune'],
-    description="Python lib for dune",
-    version="${DUNE_GEOMETRY_VERSION}",
-    author="Andreas Dedner and Martin Nolte",
+    description="${ProjectDescription}",
+    version="${ProjectVersionString}",
+    author="${ProjectAuthor}",
+    author_email="${ProjectMaintainerEmail}",
     packages = find_packages(),
     zip_safe = 0,
     package_data = {'': ['*.so']},
-    install_requires = ['portalocker']
+    install_requires = pkg
   )

setup.py

+try:
+    from dune.packagemetadata import metaData
+except ImportError:
+    from packagemetadata import metaData
+from skbuild import setup
+setup(**metaData()[1])