From 6008db9dada370a16f0eaac0aacf7b1fef1866f0 Mon Sep 17 00:00:00 2001 From: Steffen Schneider Date: Wed, 3 Jan 2024 00:49:36 +0100 Subject: [PATCH 1/3] Change license classifier to Apache --- Dockerfile | 2 +- Makefile | 2 +- PKGBUILD | 2 +- cebra/__init__.py | 2 +- reinstall.sh | 2 +- setup.cfg | 5 ++++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e29f88e..419d0ecf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN make dist FROM cebra-base # install the cebra wheel -ENV WHEEL=cebra-0.3.1-py2.py3-none-any.whl +ENV WHEEL=cebra-v0.4.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 16abfb9f..81b5b274 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CEBRA_VERSION := 0.3.1 +CEBRA_VERSION := v0.4.0rc1 dist: python3 -m pip install virtualenv diff --git a/PKGBUILD b/PKGBUILD index e4edb49b..fb7517c5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Steffen Schneider pkgname=python-cebra _pkgname=cebra -pkgver=0.3.1 +pkgver=v0.4.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 ff9bc33e..4a2adeb2 100644 --- a/cebra/__init__.py +++ b/cebra/__init__.py @@ -66,7 +66,7 @@ import cebra.integrations.sklearn as sklearn -__version__ = "0.3.1" +__version__ = "v0.4.0rc1" __all__ = ["CEBRA"] __allow_lazy_imports = False __lazy_imports = {} diff --git a/reinstall.sh b/reinstall.sh index 9eb6d8c9..dcb2e5fe 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.3.1 +VERSION=v0.4.0rc1 echo "Upgrading to CEBRA v${VERSION}" # Upgrade the build system (PEP517/518 compatible) diff --git a/setup.cfg b/setup.cfg index fb93fd5a..a9d912d8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,10 @@ classifiers = Operating System :: OS Independent Programming Language :: Python :: 3 Topic :: Scientific/Engineering :: Artificial Intelligence - License :: Free for non-commercial use + # NOTE(stes): Upgrade according to https://github.com/pypa/trove-classifiers/issues/17#issuecomment-385027197 + # once the new classifiers are published + License :: OSI Approved :: Apache Software License + [options] packages = find: From 757b605e6a8a5843ce10258cb0cf78cc185eb7a9 Mon Sep 17 00:00:00 2001 From: Steffen Schneider Date: Wed, 3 Jan 2024 00:58:55 +0100 Subject: [PATCH 2/3] reset version --- 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 419d0ecf..3e29f88e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN make dist FROM cebra-base # install the cebra wheel -ENV WHEEL=cebra-v0.4.0rc1-py2.py3-none-any.whl +ENV WHEEL=cebra-0.3.1-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 81b5b274..16abfb9f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CEBRA_VERSION := v0.4.0rc1 +CEBRA_VERSION := 0.3.1 dist: python3 -m pip install virtualenv diff --git a/PKGBUILD b/PKGBUILD index fb7517c5..e4edb49b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Steffen Schneider pkgname=python-cebra _pkgname=cebra -pkgver=v0.4.0rc1 +pkgver=0.3.1 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 4a2adeb2..ff9bc33e 100644 --- a/cebra/__init__.py +++ b/cebra/__init__.py @@ -66,7 +66,7 @@ import cebra.integrations.sklearn as sklearn -__version__ = "v0.4.0rc1" +__version__ = "0.3.1" __all__ = ["CEBRA"] __allow_lazy_imports = False __lazy_imports = {} diff --git a/reinstall.sh b/reinstall.sh index dcb2e5fe..9eb6d8c9 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=v0.4.0rc1 +VERSION=0.3.1 echo "Upgrading to CEBRA v${VERSION}" # Upgrade the build system (PEP517/518 compatible) From 1fedf21df82ef0c6680ce6458d5b44e474369ead Mon Sep 17 00:00:00 2001 From: Mackenzie Mathis Date: Tue, 2 Jan 2024 17:32:22 -0700 Subject: [PATCH 3/3] Update setup.cfg - up to Beta --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index a9d912d8..cd508ee3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,7 +12,7 @@ url = https://github.com/AdaptiveMotorControlLab/CEBRA project_urls = Bug Tracker = https://github.com/AdaptiveMotorControlLab/CEBRA/issues classifiers = - Development Status :: 3 - Alpha + Development Status :: 4 - Beta Environment :: GPU :: NVIDIA CUDA Intended Audience :: Science/Research Operating System :: OS Independent