From cc48e8ab0b7cd4f77c8f8b2d3718cacb6e14ed54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Fri, 7 Jan 2022 20:22:51 +0000
Subject: [PATCH] add utils
---
.gitlab-ci.yml | 5 +----
aliby/baby_client.py | 2 +-
aliby/experiment.py | 2 +-
aliby/timelapse.py | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28181d52..a3dc0a46 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 b3a6ca3d..1b36a5df 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 4a875cbf..787b2ca5 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 b2d2233f..5f69f319 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__)
--
GitLab