Commit 1f491f09 authored by René Fritze's avatar René Fritze Committed by René Fritze

add gmsh as python dependency

parent 7f6deeff
......@@ -5,7 +5,7 @@
# the container, local dev needs it in path from mounted src
# we trick docker into fulfilling both roles via a conditional ONBUILD
# if you want to use the local dev setup, see docker/docker-compose.yml
ARG BASE=pymor/jupyter_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
ARG BASE=pymor/jupyter_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
ARG BUILD_ENV=binder
FROM $BASE as image_binder
......
......@@ -22,8 +22,8 @@ stages:
when: never
- when: on_success
variables:
PYPI_MIRROR_TAG: 9e10c0ed1e4756107c9899ca617319b24753b5e8
CI_IMAGE_TAG: 6482589aa9345c76ae77437661ecb4d67a1963d4
PYPI_MIRROR_TAG: 06d87fc5395c39231eb05b6df06266dab9a4dbf9
CI_IMAGE_TAG: 06d87fc5395c39231eb05b6df06266dab9a4dbf9
PYMOR_HYPOTHESIS_PROFILE: ci
.pytest:
......@@ -146,7 +146,7 @@ stages:
.sanity_checks:
extends: .test_base
image: pymor/ci_sanity:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/ci_sanity:06d87fc5395c39231eb05b6df06266dab9a4dbf9
stage: sanity
#******** end definition of base jobs *********************************************************************************#
......@@ -177,9 +177,9 @@ minimal_cpp_demo:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script: ./.ci/gitlab/cpp_demo.bash
mpi 3 6:
extends: .pytest
......@@ -188,9 +188,9 @@ mpi 3 6:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.6:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.6:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -208,9 +208,9 @@ mpi 3 7:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -228,9 +228,9 @@ mpi 3 8:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.8:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.8:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -248,9 +248,9 @@ notebooks_dir 3 6:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.6:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.6:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -268,9 +268,9 @@ notebooks_dir 3 7:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -288,9 +288,9 @@ notebooks_dir 3 8:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.8:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.8:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -308,9 +308,9 @@ pip_installed 3 6:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.6:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.6:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -328,9 +328,9 @@ pip_installed 3 7:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -348,9 +348,9 @@ pip_installed 3 8:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.8:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.8:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -368,9 +368,9 @@ vanilla 3 6:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.6:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.6:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -388,9 +388,9 @@ vanilla 3 7:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -408,9 +408,9 @@ vanilla 3 8:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.8:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.8:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -428,9 +428,9 @@ numpy_git 3 8:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.8:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.8:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -448,9 +448,9 @@ oldest 3 6:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_oldest_py3.6:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_oldest_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.6:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- |
if [[ "$CI_COMMIT_REF_NAME" == *"github/PR_"* ]]; then
......@@ -468,9 +468,9 @@ ci_weekly 3 6:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: always
services:
- name: pymor/pypi-mirror_stable_py3.6:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.6:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script: ./.ci/gitlab/test_vanilla.bash
ci_weekly 3 7:
......@@ -480,9 +480,9 @@ ci_weekly 3 7:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: always
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script: ./.ci/gitlab/test_vanilla.bash
ci_weekly 3 8:
......@@ -492,9 +492,9 @@ ci_weekly 3 8:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: always
services:
- name: pymor/pypi-mirror_stable_py3.8:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/testing_py3.8:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/testing_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script: ./.ci/gitlab/test_vanilla.bash
submit vanilla 3 6:
......@@ -596,40 +596,40 @@ submit ci_weekly 3 8:
pip 1/3:
tags: [mike]
services:
- name: pymor/pypi-mirror_stable_py3.6:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.6:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: never
- when: on_success
stage: install_checks
image: pymor/deploy_checks_centos_8:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/deploy_checks_centos_8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script: ./.ci/gitlab/install_checks/centos_8/check.bash
pip 2/3:
tags: [mike]
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: never
- when: on_success
stage: install_checks
image: pymor/deploy_checks_debian_buster:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/deploy_checks_debian_buster:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script: ./.ci/gitlab/install_checks/debian_buster/check.bash
pip 3/3:
tags: [mike]
services:
- name: pymor/pypi-mirror_stable_py3.8:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.8:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: never
- when: on_success
stage: install_checks
image: pymor/deploy_checks_debian_bullseye:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/deploy_checks_debian_bullseye:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script: ./.ci/gitlab/install_checks/debian_bullseye/check.bash
......@@ -861,9 +861,9 @@ docs build:
when: never
- when: on_success
services:
- name: pymor/pypi-mirror_stable_py3.7:9e10c0ed1e4756107c9899ca617319b24753b5e8
- name: pymor/pypi-mirror_stable_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
alias: pypi_mirror
image: pymor/jupyter_py3.7:6482589aa9345c76ae77437661ecb4d67a1963d4
image: pymor/jupyter_py3.7:06d87fc5395c39231eb05b6df06266dab9a4dbf9
script:
- ${CI_PROJECT_DIR}/.ci/gitlab/test_docs.bash
stage: build
......
......@@ -2,6 +2,6 @@ DOCKER_BASE_PYTHON=3.7
PYMOR_TEST_SCRIPT=vanilla
PYPI_MIRROR=stable
PYMOR_TEST_OS=debian_buster
PYPI_MIRROR_TAG=9e10c0ed1e4756107c9899ca617319b24753b5e8
CI_IMAGE_TAG=6482589aa9345c76ae77437661ecb4d67a1963d4
PYPI_MIRROR_TAG=06d87fc5395c39231eb05b6df06266dab9a4dbf9
CI_IMAGE_TAG=06d87fc5395c39231eb05b6df06266dab9a4dbf9
PYMOR_HYPOTHESIS_PROFILE=dev
......@@ -31,6 +31,7 @@ install_requires = ['scipy>=1.1;python_version < "3.8"','scipy>=1.3.3;python_ver
install_suggests = {'ipython>=5.0': 'an enhanced interactive python shell',
'ipyparallel>=6.2.5': 'required for pymor.parallel.ipython',
'matplotlib': 'needed for error plots in demo scipts',
'gmsh': 'this downloads the proper Gmsh binary',
'meshio==4.2.0': 'needed to import Gmsh grids',
'pyopengl': 'fast solution visualization for builtin discretizations (PySide also required)',
'pyamg': 'algebraic multigrid solvers',
......
......@@ -7,6 +7,7 @@ bash_kernel
cython>=0.28
diskcache
docopt-ng
gmsh
https://pymor.github.io/wheels/pymess-1.0.0-cp36-cp36m-manylinux1_x86_64.whl ; python_version == "3.6" and "linux" in sys_platform
https://pymor.github.io/wheels/pymess-1.0.0-cp37-cp37m-manylinux1_x86_64.whl ; python_version == "3.7" and "linux" in sys_platform
ipyparallel>=6.2.5
......
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