diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28181d52ce55edf2a575fea3a6a2e9a03d6a8c77..a3dc0a4650b9691ae004eee0b1f1d5b22d48ba33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ before_script: - git config pull.rebase false - git pull origin HEAD:master - if [ ${var+TRIGGER_PYPI_NAME} ]; then echo "Pipeline triggered by ${TRIGGER_PYPI_NAME}"; poetry update ${TRIGGER_PYPI_NAME}; fi - # - rm -f poetry.lock + - rm -f poetry.lock - poetry install -vv # - poetry export -f requirements.txt --output requirements.txt # - sed '/^zeroc-ice/,/^[z.*]/{/z.*/!d}' requirements.txt | grep -v zeroc-ice > nozice.txt @@ -65,9 +65,6 @@ Bump_release: dotenv: build.env only: - master - except: - changes: - - tests/* needs: job: Unit test diff --git a/aliby/baby_client.py b/aliby/baby_client.py index b3a6ca3d86612f68a18b0be935b3e1c6c2911601..1b36a5dfab549c8e31783adbb69ff4e069d302cb 100644 --- a/aliby/baby_client.py +++ b/aliby/baby_client.py @@ -21,7 +21,7 @@ from baby.crawler import BabyCrawler from requests.exceptions import Timeout, HTTPError from requests_toolbelt.multipart.encoder import MultipartEncoder -from aliby.utils import Cache, accumulate, get_store_path +from agora.io.utils import Cache, accumulate, get_store_path ################### Dask Methods ################################ diff --git a/aliby/experiment.py b/aliby/experiment.py index 4a875cbf7d7b6a7d484e4d9448ddf197c0404bc9..787b2ca51a6c02b93a2f6d49b743532ac4695a6c 100644 --- a/aliby/experiment.py +++ b/aliby/experiment.py @@ -20,8 +20,8 @@ import omero from omero.gateway import BlitzGateway from logfile_parser import Parser +from agora.io.utils import accumulate from aliby.timelapse import TimelapseOMERO, TimelapseLocal -from aliby.utils import accumulate from agora.io.writer import Writer diff --git a/aliby/timelapse.py b/aliby/timelapse.py index b2d2233ffdb1e17988ae2512db201e00db8c2fda..5f69f319872b5a9275b5bfe9c21b275a8843c6e6 100644 --- a/aliby/timelapse.py +++ b/aliby/timelapse.py @@ -9,7 +9,7 @@ from tqdm import tqdm import cv2 from aliby.io.matlab import matObject -from aliby.utils import Cache, imread, get_store_path +from agora.io.utils import Cache, imread, get_store_path logger = logging.getLogger(__name__)