Skip to content

Commit

Permalink
Merge pull request #93 from i-VRESSE/fix-dirac-tests
Browse files Browse the repository at this point in the history
Fix dirac tests
  • Loading branch information
sverhoeven authored Mar 13, 2024
2 parents 0657cca + 2f7b1a3 commit ca74e74
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dirac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
dirac_tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Pull images
run: docker compose -f tests_dirac/docker-compose.yml pull
- name: Build images
Expand Down
2 changes: 1 addition & 1 deletion deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM python:3.10-slim-buster
# Install healthcheck dependency
RUN apt update && apt install -y curl unzip

RUN pip install poetry==1.4.2
RUN pip install poetry==1.7.0

# Configuring poetry
RUN poetry config virtualenvs.create false
Expand Down
11 changes: 7 additions & 4 deletions tests_dirac/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/xenon-middleware/diracclient:8.0.18
FROM ghcr.io/xenon-middleware/diracclient:8.0.39

RUN pip install poetry==1.8.2 && \
pip install --upgrade pip wheel setuptools
RUN pip install --upgrade pip wheel setuptools && \
pip install poetry==1.7.0

# Configuring poetry
RUN poetry config virtualenvs.create false
Expand All @@ -12,4 +12,7 @@ WORKDIR /workspace
COPY pyproject.toml poetry.lock ./

# Installing requirements
RUN poetry install --no-root --no-interaction --no-ansi && pip3 install pyOpenSSL --upgrade
RUN poetry install --no-root --no-interaction --no-ansi --with dev

# Workaround `ImportWarning: _SixMetaPathImporter.find_spec() not found; falling back to find_module()` error
RUN /home/diracuser/diracos/bin/micromamba install m2crypto==0.041.0
2 changes: 1 addition & 1 deletion tests_dirac/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.9'

services:
dirac-tuto:
image: ghcr.io/xenon-middleware/dirac:8.0.18
image: ghcr.io/xenon-middleware/dirac:8.0.39
privileged: true
hostname: dirac-tuto
test:
Expand Down

0 comments on commit ca74e74

Please sign in to comment.