Merge branch 'python39' into 'master'

transition to python/3.9

See merge request bec/debye-bec!2
This commit was merged in pull request #25.
This commit is contained in:
2023-12-12 21:32:00 +01:00
4 changed files with 13 additions and 16 deletions

View File

@@ -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.
before_script:
@@ -25,23 +25,22 @@ pytest:
script:
- pytest -v --random-order ./tests
tests-3.9:
tests-3.10:
stage: AdditionalTests
image: $CI_DOCKER_REGISTRY/python:3.9
image: $CI_DOCKER_REGISTRY/python:3.10
needs: ["pytest"]
script:
- pytest -v --random-order ./tests
allow_failure: true
tests-3.10:
extends: "tests-3.9"
stage: AdditionalTests
image: $CI_DOCKER_REGISTRY/python:3.10
allow_failure: true
tests-3.11:
extends: "tests-3.9"
extends: "tests-3.10"
stage: AdditionalTests
image: $CI_DOCKER_REGISTRY/python:3.11
allow_failure: true
tests-3.12:
extends: "tests-3.10"
stage: AdditionalTests
image: $CI_DOCKER_REGISTRY/python:3.12
allow_failure: true

View File

@@ -4,7 +4,6 @@ import queue
import threading
import time
import traceback
from typing import List
import h5py
import numpy as np
@@ -147,7 +146,7 @@ class NIDAQWriterService(BECService):
else:
self.scan_is_running = False
def handle_ni_data(self, msgs: List[messages.DeviceMessage]) -> None:
def handle_ni_data(self, msgs: list[messages.DeviceMessage]) -> None:
"""
Receive NI data messages and write them to the writer queue.

View File

@@ -4,7 +4,7 @@
BEAMLINE_REPO=gitlab.psi.ch:bec/debye-bec.git
git clone git@$BEAMLINE_REPO
module add psi-python38/2020.11
module add psi-python39/2021.11
# start redis
docker run --network=host --name redis-bec -d redis
@@ -25,4 +25,3 @@ source ./bin/install_bec_dev.sh
cd ../
# start the BEC server
bec-server start --config ./debye-bec/deployment/bec-server-config.yaml

View File

@@ -15,7 +15,7 @@ classifiers =
package_dir =
= .
packages = find:
python_requires = >=3.8
python_requires = >=3.9
[options.packages.find]
where = .