Skip to content

Commit 12cc9c0

Browse files
committed
[ci] also try to install directly
1 parent 520b36b commit 12cc9c0

File tree

5 files changed

+27
-15
lines changed

5 files changed

+27
-15
lines changed

.binder/Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# the container, local dev needs it in path from mounted src
66
# we trick docker into fulfilling both roles via a conditional ONBUILD
77
# if you want to use the local dev setup, see docker/docker-compose.yml
8-
ARG BASE=pymor/testing_py3.9:133249e1ace233311c1dbcfc2e70b3f8624058a8
8+
ARG BASE=pymor/testing_py3.9:41fca6eecc2a539f73a04be0255f4dc44edc9f43
99
ARG BUILD_ENV=binder
1010

1111
FROM $BASE as image_binder
@@ -26,13 +26,11 @@ ARG NB_UID
2626
ARG PYMOR_JUPYTER_TOKEN
2727

2828
USER root
29-
RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
30-
chown -R ${NB_USER} /home/pymor /src/ && \
31-
apt update && \
32-
apt install -y libtbb-dev
29+
# RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
30+
# chown -R ${NB_USER} /home/pymor /src/
3331

34-
RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
35-
USER ${NB_USER}
32+
# # RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
33+
# USER ${NB_USER}
3634

3735
ENV JUPYTER_TOKEN=${PYMOR_JUPYTER_TOKEN} \
3836
USER=${NB_USER} \

.binder/Dockerfile.in

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ ARG NB_UID
2626
ARG PYMOR_JUPYTER_TOKEN
2727

2828
USER root
29-
RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
30-
chown -R ${NB_USER} /home/pymor /src/ && \
31-
apt update && \
32-
apt install -y libtbb-dev
29+
# RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
30+
# chown -R ${NB_USER} /home/pymor /src/
3331

34-
RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
35-
USER ${NB_USER}
32+
# # RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
33+
# USER ${NB_USER}
3634

3735
ENV JUPYTER_TOKEN=${PYMOR_JUPYTER_TOKEN} \
3836
USER=${NB_USER} \

.ci/azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ container: $[ variables['containerImage'] ]
2121
steps:
2222
- script: ./.ci/pytest.bash
2323
- script: ./.ci/wheel.bash
24+
- script: ./.ci/install.bash

.ci/install.bash

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
set -e
4+
set -x
5+
6+
BASE_DIR="$(cd "$(dirname ${BASH_SOURCE[0]})" ; cd ../ ; pwd -P )"
7+
8+
source ${BASE_DIR}/.ci/common_setup.bash
9+
10+
python -m pip install .
11+
12+
python -m pip uninstall -y pymor_dealii
13+
14+
python -m pip install -e .
15+

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
DOCKER_BASE_PYTHON=3.9
2-
PYPI_MIRROR_TAG=133249e1ace233311c1dbcfc2e70b3f8624058a8
3-
CI_IMAGE_TAG=133249e1ace233311c1dbcfc2e70b3f8624058a8
2+
PYPI_MIRROR_TAG=41fca6eecc2a539f73a04be0255f4dc44edc9f43
3+
CI_IMAGE_TAG=41fca6eecc2a539f73a04be0255f4dc44edc9f43
44
PYMOR_TEST_OS=debian_buster

0 commit comments

Comments
 (0)