diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8a4cafbe..659519fa 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.0.6 +current_version = 0.0.7 commit = False tag = False allow_dirty = False diff --git a/build_scripts/release-version.sh b/build_scripts/release-version.sh index 1560dac0..96b3cfaa 100755 --- a/build_scripts/release-version.sh +++ b/build_scripts/release-version.sh @@ -33,7 +33,6 @@ Usage: Optional flags: -h, --help Show this information and exit - -d Delete release branch after merging -e Edit changelog (using default editor) -v, --verbose Print debug information -y, --yes Do not prompt for confirmation, for non-interactive use (incompatible with -e) @@ -52,7 +51,6 @@ function _parse_opts() { POSITIONAL=() DEBUG= - DELETE_BRANCH= EDIT_CHANGELOG= FORCE_YES= HELP= @@ -78,10 +76,6 @@ function _parse_opts() { FORCE_YES=1 shift ;; - -d|--delete-branch) - DELETE_BRANCH=1 - shift - ;; -r|--remote) REMOTE="$2" shift 2 @@ -105,7 +99,6 @@ function _parse_opts() { fi export DEBUG - export DELETE_BRANCH export EDIT_CHANGELOG export FORCE_YES export HELP @@ -174,9 +167,6 @@ EOF - Bump version number again to next development pre-release - Merge release branch into ${bold}develop${normal} locally and on $REMOTE EOF - if [[ -n "$DELETE_BRANCH" ]]; then - echo " - Delete release branch" - fi echo -en "🚨️ ${yellow}Do you want to proceed? [y/N] ${normal}" read -n 1 -r @@ -255,9 +245,7 @@ git checkout develop git merge --no-ff "$RELEASE_BRANCH" git push "$REMOTE" develop -if [[ -n "$DELETE_BRANCH" ]]; then - echo "🗑️ Deleting release branch" - git branch -d "$RELEASE_BRANCH" -fi +echo "🗑️ Deleting release branch" +git branch -d "$RELEASE_BRANCH" echo -e "\U2728 All done! Get yourself some coffee and watch CI/CD pipelines for errors." diff --git a/setup.py b/setup.py index 91b6c10f..c4479bdd 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ package_dir={"": "src"}, packages=find_packages(where="src"), include_package_data=True, - version='0.0.6', + version='0.0.7', description='Library for sensible AI', install_requires=[ line diff --git a/src/sensai/__init__.py b/src/sensai/__init__.py index ec394b4c..fed40829 100644 --- a/src/sensai/__init__.py +++ b/src/sensai/__init__.py @@ -14,7 +14,7 @@ from .normalisation import NormalisationMode from .vector_model import VectorModel, VectorRegressionModel, VectorClassificationModel -__version__ = "0.0.6" +__version__ = "0.0.7" # The following submodules are not imported by default to avoid necessarily requiring their dependencies: # tensorflow diff --git a/src/sensai/clustering/base/clustering.py b/src/sensai/clustering/base/clustering.py index 2b1ca19e..1d493b34 100644 --- a/src/sensai/clustering/base/clustering.py +++ b/src/sensai/clustering/base/clustering.py @@ -74,7 +74,7 @@ def summaryDict(self): return { "identifier": self.identifier, "centroid": self.centroid(), - "num_members": len(self), + "numMembers": len(self), "radius": self.radius() }