Unverified Commit 72f4d796 authored by René Fritze's avatar René Fritze Committed by GitHub
Browse files

Merge pull request #1715 from pymor/ci_bump_pip

[ci] bump images for newer pip and slycot
parents 26f252fa 711c378d
Pipeline #155988 failed with stages
in 28 minutes and 31 seconds
......@@ -18,7 +18,7 @@ dependencies:
- gmsh
- ipyparallel>=6.2.5
- ipython>=5.0
- ipywidgets
- ipywidgets<8,>7
- jupyter_client>=7.0.6
- jupyter_contrib_nbextensions
- lxml
......
......@@ -5,12 +5,7 @@ MAINTAINER rene.fritze@wwu.de
COPY . /tmp/pymor
# manual numpy install is hack to workaround an otherwise happening
# File "src/pymor/discretizers/builtin/relations.pyx", line 1, in init pymor.discretizers.builtin.relations
# ValueError: numpy.ndarray size changed, may indicate binary incompatibility. Expected 88 from C header, got 80 from PyObject
# for which no explanation could be found
RUN pip install numpy==1.20 && \
pip install /tmp/pymor[docs,ci,full] && rm -rf /tmp/pymor
RUN pip install /tmp/pymor[docs,ci,full] && rm -rf /tmp/pymor
RUN python -c "from pymor.basic import *"
......
......@@ -23,8 +23,8 @@ stages:
when: never
- when: on_success
variables:
PYPI_MIRROR_TAG: 22cffba3dabcf88dd4a7ccfb1cb4be4df5ea263d
CI_IMAGE_TAG: 22cffba3dabcf88dd4a7ccfb1cb4be4df5ea263d
PYPI_MIRROR_TAG: 0fdb4dd6c96a5f3861a43bc793462c1c49727114
CI_IMAGE_TAG: 0fdb4dd6c96a5f3861a43bc793462c1c49727114
PYMOR_HYPOTHESIS_PROFILE: ci
PYMOR_PYTEST_EXTRA: ""
BINDERIMAGE: ${CI_REGISTRY_IMAGE}/binder:${CI_COMMIT_REF_SLUG}
......
......@@ -2,8 +2,8 @@ DOCKER_BASE_PYTHON=3.9
PYMOR_TEST_SCRIPT=vanilla
PYPI_MIRROR=stable
PYMOR_TEST_OS=debian-buster
PYPI_MIRROR_TAG=22cffba3dabcf88dd4a7ccfb1cb4be4df5ea263d
CI_IMAGE_TAG=22cffba3dabcf88dd4a7ccfb1cb4be4df5ea263d
PYPI_MIRROR_TAG=0fdb4dd6c96a5f3861a43bc793462c1c49727114
CI_IMAGE_TAG=0fdb4dd6c96a5f3861a43bc793462c1c49727114
PYMOR_HYPOTHESIS_PROFILE=dev
PYMOR_PYTEST_EXTRA=--lf
......@@ -6,6 +6,7 @@ on:
branches:
- main
- 20*.*.x
- create-pull-request/*
pull_request:
branches:
- main
......
......@@ -24,16 +24,17 @@ jobs:
run: python ./dependencies.py
- name: Update env
run: python .ci/create_conda_env.py requirements*.txt
- uses: stefanzweifel/git-auto-commit-action@v4
- uses: peter-evans/create-pull-request@v4.1.1
name: Create a PR for changed env
with:
commit_message: "[Bot] Update requirements and environments"
commit_user_name: pyMOR Bot
commit_user_email: ci@pymor.org
commit_author: pyMOR Bot <ci@pymor.org>
file_pattern: requirements*.txt .ci/conda-env.yml pyproject.toml
commit-message: "[Bot] Update requirements and environments"
title: "[Bot] Update requirements and environments"
author: pyMOR Bot <ci@pymor.org>
labels: pr:change
delete-branch: true
- name: Upload Logfile
if: always()
uses: actions/upload-artifact@v3
with:
name: create_conda_env.log.txt
path: .ci/create_conda_env.log
\ No newline at end of file
path: .ci/create_conda_env.log
......@@ -39,6 +39,7 @@ def setup_requires():
# recheck if jupyter_client pin still necessary
# https://github.com/jupyter-widgets/pythreejs/issues/366
# Qt bindings selectors are a woraround for https://bugreports.qt.io/browse/QTBUG-88688
# ipywidget pin is due to https://github.com/pymor/pymor/issues/1717
install_requires = ['qtpy>2.0', 'packaging', 'diskcache', 'typer', 'click'] + _numpy_scipy()
install_suggests = {
'ipython>=5.0': 'an enhanced interactive python shell',
......@@ -51,7 +52,7 @@ install_suggests = {
'jupyter_client>=7.0.6': 'necessary to explicitly state here to fix 3js',
_PYTEST: 'testing framework required to execute unit tests',
_PYSIDE: 'solution visualization for builtin discretizations',
'ipywidgets': 'notebook GUI elements',
'ipywidgets<8,>7': 'notebook GUI elements',
'nbresuse': 'resource usage indicator for notebooks',
'torch': 'PyTorch open source machine learning framework',
'jupyter_contrib_nbextensions': 'modular collection of jupyter extensions',
......@@ -62,7 +63,7 @@ install_suggests = {
io_requires = ['pyevtk', 'xmljson', 'meshio>=4.4', 'lxml', 'gmsh']
install_suggests.update({p: 'optional File I/O support libraries' for p in io_requires})
doc_requires = ['sphinx>=5.0', 'matplotlib', _PYSIDE, 'ipyparallel>=6.2.5', 'python-slugify',
'ipywidgets', 'sphinx-qt-documentation', 'bash_kernel', 'sphinx-material',
'ipywidgets<8,>7', 'sphinx-qt-documentation', 'bash_kernel', 'sphinx-material',
'sphinxcontrib-bibtex', 'sphinx-autoapi>=1.8', 'myst-nb>=0.16'] + install_requires
ci_requires = ['check-manifest==0.48',
'check_reqs==0.2.0',
......
......@@ -10,7 +10,7 @@ dune-xt>=2021.1.3; platform_system=="Linux" and platform_machine=="x86_64"
gmsh
ipyparallel>=6.2.5
ipython>=5.0
ipywidgets
ipywidgets<8,>7
jupyter_client>=7.0.6
jupyter_contrib_nbextensions
lxml
......
Supports Markdown
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