Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
vkarak committed Jul 18, 2023
2 parents b1d4de3 + 38cc61a commit f7a013e
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test-flux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: ${{ matrix.container }}
steps:
- name: Make Space
run: |
run: |
rm -rf /usr/share/dotnet
rm -rf /opt/ghc
Expand All @@ -28,6 +28,7 @@ jobs:

- name: Install Reframe
run: |
apt-get update && apt-get install -y python3-venv
/bin/bash ./bootstrap.sh
export PATH=$PWD/bin:$PATH
which reframe
Expand All @@ -36,7 +37,7 @@ jobs:
- name: Start Flux and Run Test
run: |
export PATH=$PWD/bin:$PATH
which reframe
which reframe
flux start reframe -c tutorials/flux -C tutorials/flux/settings.py -l
flux start reframe -c tutorials/flux -C tutorials/flux/settings.py --run
flux start python3 ./test_reframe.py --rfm-user-config=tutorials/flux/settings.py -vvvv
11 changes: 11 additions & 0 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ if $python -c 'import sys; sys.exit(sys.version_info[:2] >= (3, 6))'; then
exit 1
fi

venvdir=$(mktemp -d)
CMD $python -m venv $venvdir
CMD source $venvdir/bin/activate

_shutdown_venv() {
deactivate
/bin/rm -rf $venvdir
}

trap _shutdown_venv EXIT

# Disable the user installation scheme which is the default for Debian and
# cannot be combined with `--target`
export PIP_USER=0
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/Lmod-base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN \
apt-get -y update && \
apt-get -y install ca-certificates && \
update-ca-certificates && \
apt-get -y install gcc make git python3 python3-pip
apt-get -y install gcc make git python3 python3-pip python3-venv

# Required utilities
RUN apt-get -y install wget
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/Lmod77-base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN \
apt-get -y update && \
apt-get -y install ca-certificates && \
update-ca-certificates && \
apt-get -y install gcc make git python3 python3-pip
apt-get -y install gcc make git python3 python3-pip python3-venv

# Required utilities
RUN apt-get -y install wget
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/Spack.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN \
apt-get -y install gcc && \
apt-get -y install make && \
apt-get -y install git && \
apt-get -y install python3 python3-pip
apt-get -y install python3 python3-pip python3-venv

# Install ReFrame from the current directory
COPY --chown=rfmuser . /home/rfmuser/reframe/
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/Tmod4-base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN \
apt-get -y update && \
apt-get -y install ca-certificates && \
update-ca-certificates && \
apt-get -y install gcc make git python3 python3-pip
apt-get -y install gcc make git python3 python3-pip python3-venv

# Required utilities
RUN apt-get -y install wget
Expand Down
2 changes: 1 addition & 1 deletion reframe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
import sys

VERSION = '4.4.0-dev.1'
VERSION = '4.4.0-dev.2'
INSTALL_PREFIX = os.path.normpath(
os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
)
Expand Down

0 comments on commit f7a013e

Please sign in to comment.