From ceec8ceb940019e7ef7e6bdb7036f341b32518c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Tue, 18 Jan 2022 12:13:37 +0000
Subject: [PATCH] add eccentricity to ext defaults, ci autorelease
---
.gitlab-ci.yml | 2 +-
extraction/core/functions/defaults.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19a59bd2..f16af3cb 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 7bd673a0..87622e92 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": {},
}
--
GitLab