From 8f8abfdf8770c9081a2b581a3325889da42a579a Mon Sep 17 00:00:00 2001 From: Steffen Schneider Date: Sun, 27 Oct 2024 15:18:36 +0100 Subject: [PATCH 1/2] Make bump_version script runnable on MacOS --- tools/bump_version.sh | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/tools/bump_version.sh b/tools/bump_version.sh index fbc161b1..fb89f413 100755 --- a/tools/bump_version.sh +++ b/tools/bump_version.sh @@ -1,7 +1,7 @@ #!/bin/bash # Bump the CEBRA version to the specified value. # Edits all relevant files at once. -# +# # Usage: # tools/bump_version.sh 0.3.1rc1 @@ -10,24 +10,36 @@ if [ -z ${version} ]; then >&1 echo "Specify a version number." >&1 echo "Usage:" >&1 echo "tools/bump_version.sh " + exit 1 +fi + +# Determine the correct sed command based on the OS +# On macOS, the `sed` command requires an empty string argument after `-i` for in-place editing. +# On Linux and other Unix-like systems, the `sed` command only requires `-i` for in-place editing. +if [[ "$OSTYPE" == "darwin"* ]]; then + # macOS + SED_CMD="sed -i .bkp -e" +else + # Linux and other Unix-like systems + SED_CMD="sed -i -e" fi # python cebra version -sed -i "s/__version__ = .*/__version__ = \"${version}\"/" \ - cebra/__init__.py +$SED_CMD "s/__version__ = .*/__version__ = \"${version}\"/" cebra/__init__.py # reinstall script in root -sed -i "s/VERSION=.*/VERSION=${version}/" \ - reinstall.sh +$SED_CMD "s/VERSION=.*/VERSION=${version}/" reinstall.sh # Makefile -sed -i "s/CEBRA_VERSION := .*/CEBRA_VERSION := ${version}/" \ - Makefile +$SED_CMD "s/CEBRA_VERSION := .*/CEBRA_VERSION := ${version}/" Makefile -# Arch linux PKGBUILD -sed -i "s/pkgver=.*/pkgver=${version}/" \ - PKGBUILD +# Arch linux PKGBUILD +$SED_CMD "s/pkgver=.*/pkgver=${version}/" PKGBUILD # Dockerfile -sed -i "s/ENV WHEEL=cebra-.*\.whl/ENV WHEEL=cebra-${version}-py2.py3-none-any.whl/" \ - Dockerfile +$SED_CMD "s/ENV WHEEL=cebra-.*\.whl/ENV WHEEL=cebra-${version}-py2.py3-none-any.whl/" Dockerfile + +# Remove backup files +if [[ "$OSTYPE" == "darwin"* ]]; then + rm cebra/__init__.py.bkp reinstall.sh.bkp Makefile.bkp PKGBUILD.bkp Dockerfile.bkp +fi From 319ee3c08da0b4c83d012a515e1f98cce67ad3c6 Mon Sep 17 00:00:00 2001 From: Steffen Schneider Date: Sun, 27 Oct 2024 15:19:12 +0100 Subject: [PATCH 2/2] Bump version to 0.5.0rc1 --- Dockerfile | 2 +- Makefile | 2 +- PKGBUILD | 2 +- cebra/__init__.py | 2 +- reinstall.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d734ee6f..e8ac14a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN make dist FROM cebra-base # install the cebra wheel -ENV WHEEL=cebra-0.4.0-py2.py3-none-any.whl +ENV WHEEL=cebra-0.5.0rc1-py2.py3-none-any.whl WORKDIR /build COPY --from=wheel /build/dist/${WHEEL} . RUN pip install --no-cache-dir ${WHEEL}'[dev,integrations,datasets]' diff --git a/Makefile b/Makefile index ca8c5480..a1e8d3b2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CEBRA_VERSION := 0.4.0 +CEBRA_VERSION := 0.5.0rc1 dist: python3 -m pip install virtualenv diff --git a/PKGBUILD b/PKGBUILD index 07fa3a1d..91ba4a4e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Steffen Schneider pkgname=python-cebra _pkgname=cebra -pkgver=0.4.0 +pkgver=0.5.0rc1 pkgrel=1 pkgdesc="Consistent Embeddings of high-dimensional Recordings using Auxiliary variables" url="https://cebra.ai" diff --git a/cebra/__init__.py b/cebra/__init__.py index 204cd2a2..edf1b5ee 100644 --- a/cebra/__init__.py +++ b/cebra/__init__.py @@ -66,7 +66,7 @@ import cebra.integrations.sklearn as sklearn -__version__ = "0.4.0" +__version__ = "0.5.0rc1" __all__ = ["CEBRA"] __allow_lazy_imports = False __lazy_imports = {} diff --git a/reinstall.sh b/reinstall.sh index 778f98eb..549982a1 100755 --- a/reinstall.sh +++ b/reinstall.sh @@ -15,7 +15,7 @@ pip uninstall -y cebra # Get version info after uninstalling --- this will automatically get the # most recent version based on the source code in the current directory. # $(tools/get_cebra_version.sh) -VERSION=0.4.0 +VERSION=0.5.0rc1 echo "Upgrading to CEBRA v${VERSION}" # Upgrade the build system (PEP517/518 compatible)