diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19a59bd2460c733c2d40815f3e05175fc70554c6..f16af3cbf09a0942f2ee74360bf875e25d285a14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ Bump_release: script: - git config --global user.email ${GITLAB_USER_EMAIL} - git config --global user.name ${GITLAB_USER_NAME} - # - git pull origin HEAD:MASTER && poetry version ${BUMP_RULE} && git add pypoetry add pyproject.toml poetry.lock && git commit -m "Bump version" && git push -o ci.skip origin HEAD:master && poetry publish --build --username ${PYPI_USER} --password ${PYPI_PASSWORD} + - git pull origin HEAD:MASTER && poetry version ${BUMP_RULE} && git add pypoetry add pyproject.toml poetry.lock && git commit -m "Bump version" && git push -o ci.skip origin HEAD:master && poetry publish --build --username ${PYPI_USER} --password ${PYPI_PASSWORD} - echo "TRIGGER_PYPI_NAME=$(cat pyproject.toml | grep '^name =' | head -n 1 | cut -f3 -d' ' | tr -d \")" >> build.env - echo "Exporting TRIGGER_PYPI_NAME as ${TRIGGER_PYPI_NAME}" diff --git a/extraction/core/functions/defaults.py b/extraction/core/functions/defaults.py index 7bd673a0737f0dc98a98565e5514615df1bb0c6b..87622e9293f29207015f7bc0acd78c1ad4b44646 100644 --- a/extraction/core/functions/defaults.py +++ b/extraction/core/functions/defaults.py @@ -10,7 +10,7 @@ def exparams_from_meta(meta: Union[dict, PosixPath, str], extras=["ph"]): """ meta = meta if isinstance(meta, dict) else load_attributes(meta) base = { - "tree": {"general": {"None": ["area", "volume"]}}, + "tree": {"general": {"None": ["area", "volume", "eccentricity"]}}, "multichannel_ops": {}, }