From ad10fb93f512c5bf36179caa38d5b3605943a64a Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Thu, 7 Dec 2023 14:52:41 +0100 Subject: [PATCH] ci: default to python39 --- .gitlab-ci.yml | 4 ++-- bec_client/tests/Dockerfile | 2 +- bin/install_bec_dev.sh | 6 +----- ci/config_init_dockerfile | 2 +- device_server/Dockerfile | 2 +- docs/source/developer/install_developer_env.md | 2 +- docs/source/user/installation.md | 4 ++-- file_writer/Dockerfile | 2 +- scan_bundler/Dockerfile | 2 +- scan_server/Dockerfile | 2 +- scihub/Dockerfile | 2 +- 11 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5384013..314bbe5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # This file is a template, and might need editing before it works on your project. # Official language image. Look for the different tagged releases at: # https://hub.docker.com/r/library/python/tags/ -image: $CI_DOCKER_REGISTRY/python:3.8 +image: $CI_DOCKER_REGISTRY/python:3.9 #commands to run in the Docker container before starting each job. variables: DOCKER_TLS_CERTDIR: "" @@ -76,7 +76,7 @@ pylint: paths: - ./pylint/ expire_in: 1 week - + pylint-check: stage: Formatter needs: [] diff --git a/bec_client/tests/Dockerfile b/bec_client/tests/Dockerfile index 7039d28a..4b8f0d59 100644 --- a/bec_client/tests/Dockerfile +++ b/bec_client/tests/Dockerfile @@ -1,5 +1,5 @@ # set base image (host OS) -FROM morgana-harbor.psi.ch/bec/python:3.8 +FROM morgana-harbor.psi.ch/bec/python:3.9 # set the working directory in the container WORKDIR /code diff --git a/bin/install_bec_dev.sh b/bin/install_bec_dev.sh index b94eafec..67e547d0 100755 --- a/bin/install_bec_dev.sh +++ b/bin/install_bec_dev.sh @@ -48,7 +48,7 @@ while getopts "hsc:rt" o; do esac done -conda_deps=(python=3.8) +conda_deps=(python=3.9) # check if tmux should be installed if [ "$skip_tmux" = false ]; then @@ -126,7 +126,3 @@ else # install all packages in one virtual environment cd ../ echo "Created virtual environment for all packages" fi - - - - diff --git a/ci/config_init_dockerfile b/ci/config_init_dockerfile index c27640ca..6659e030 100644 --- a/ci/config_init_dockerfile +++ b/ci/config_init_dockerfile @@ -1,5 +1,5 @@ # set base image (host OS) -FROM morgana-harbor.psi.ch/bec/python:3.8 +FROM morgana-harbor.psi.ch/bec/python:3.9 # set the working directory in the container WORKDIR /code diff --git a/device_server/Dockerfile b/device_server/Dockerfile index a103c7b7..69befc85 100644 --- a/device_server/Dockerfile +++ b/device_server/Dockerfile @@ -1,5 +1,5 @@ # set base image (host OS) -FROM morgana-harbor.psi.ch/bec/python:3.8 +FROM morgana-harbor.psi.ch/bec/python:3.9 # set the working directory in the container WORKDIR /code diff --git a/docs/source/developer/install_developer_env.md b/docs/source/developer/install_developer_env.md index 9000828d..9e47006c 100644 --- a/docs/source/developer/install_developer_env.md +++ b/docs/source/developer/install_developer_env.md @@ -12,7 +12,7 @@ In that sense, installing BEC in _[dev]_ mode, is the right choice in case you l **Requirements:** --- -- python (>=3.8) +- python (>=3.9) - [redis](https://redis.io) - tmux (=3.2) --- diff --git a/docs/source/user/installation.md b/docs/source/user/installation.md index 7aaba765..b9e613d5 100644 --- a/docs/source/user/installation.md +++ b/docs/source/user/installation.md @@ -8,7 +8,7 @@ If you need to install BEC yourself, the following section will guide you throug **Requirements:** --- -- python (>=3.8) +- python (>=3.9) - redis - tmux (=3.2) --- @@ -60,4 +60,4 @@ More detailed information about Redis and the BEC server can be found in [archit bec ``` BEC is running now and you would be ready to load your first device configuration. -To this end, please follow the instructions given in the section [devices](#user.devices). \ No newline at end of file +To this end, please follow the instructions given in the section [devices](#user.devices). diff --git a/file_writer/Dockerfile b/file_writer/Dockerfile index c60b237c..b0374880 100644 --- a/file_writer/Dockerfile +++ b/file_writer/Dockerfile @@ -1,5 +1,5 @@ # set base image (host OS) -FROM morgana-harbor.psi.ch/bec/python:3.8 +FROM morgana-harbor.psi.ch/bec/python:3.9 # set the working directory in the container WORKDIR /code diff --git a/scan_bundler/Dockerfile b/scan_bundler/Dockerfile index 014c8e86..5131ddc9 100644 --- a/scan_bundler/Dockerfile +++ b/scan_bundler/Dockerfile @@ -1,5 +1,5 @@ # set base image (host OS) -FROM morgana-harbor.psi.ch/bec/python:3.8 +FROM morgana-harbor.psi.ch/bec/python:3.9 # set the working directory in the container WORKDIR /code diff --git a/scan_server/Dockerfile b/scan_server/Dockerfile index a506f2be..eca77097 100644 --- a/scan_server/Dockerfile +++ b/scan_server/Dockerfile @@ -1,5 +1,5 @@ # set base image (host OS) -FROM morgana-harbor.psi.ch/bec/python:3.8 +FROM morgana-harbor.psi.ch/bec/python:3.9 # set the working directory in the container WORKDIR /code diff --git a/scihub/Dockerfile b/scihub/Dockerfile index eec62ac1..67edff0b 100644 --- a/scihub/Dockerfile +++ b/scihub/Dockerfile @@ -1,5 +1,5 @@ # set base image (host OS) -FROM morgana-harbor.psi.ch/bec/python:3.8 +FROM morgana-harbor.psi.ch/bec/python:3.9 # set the working directory in the container WORKDIR /code