diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45304662..76df6056 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,6 +58,9 @@ jobs: runs-on: ${{ matrix.os }} + env: + MPLBACKEND: Agg + steps: - name: Cache dependencies id: pip-cache @@ -75,10 +78,16 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install package + # NOTE(stes): https://github.com/twmr/pytest-sphinx/issues/69 + # To run all tests, currently a manual install from github is required: + # https://github.com/twmr/pytest-sphinx/archive/refs/tags/v0.7.0.tar.gz + # Remove the respective line and the comment in setup.cfg once 0.7.0 is + # available on PyPI. run: | python -m pip install --upgrade pip setuptools wheel python -m pip install torch==${{ matrix.torch-version }} --extra-index-url https://download.pytorch.org/whl/cpu pip install '.[dev,datasets,integrations]' + pip install https://github.com/twmr/pytest-sphinx/archive/refs/tags/v0.7.0.tar.gz - name: Check sklearn legacy version if: matrix.sklearn-version == 'legacy' diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index ac078fd9..55124c9a 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -47,7 +47,7 @@ jobs: make dist ls dist/ tar tvf dist/cebra-*.tar.gz - python3 -m twine upload --repository testpypi dist/* + python3 -m twine upload --verbose --repository testpypi dist/* - name: Build and publish to PyPI if: ${{ github.event_name == 'push' }} @@ -58,4 +58,4 @@ jobs: make dist ls dist/ tar tvf dist/cebra-*.tar.gz - python3 -m twine upload dist/* + python3 -m twine upload --verbose dist/* diff --git a/Dockerfile b/Dockerfile index c77f8c95..5f092805 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN make dist FROM cebra-base # install the cebra wheel -ENV WHEEL=cebra-0.6.0a2-py3-none-any.whl +ENV WHEEL=cebra-0.6.0-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 44270e68..9989d2dd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CEBRA_VERSION := 0.6.0a2 +CEBRA_VERSION := 0.6.0 dist: python3 -m pip install virtualenv diff --git a/PKGBUILD b/PKGBUILD index 3fc70b19..401569ba 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Steffen Schneider pkgname=python-cebra _pkgname=cebra -pkgver=0.6.0a2 +pkgver=0.6.0 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 a8631b51..ff36d354 100644 --- a/cebra/__init__.py +++ b/cebra/__init__.py @@ -66,7 +66,7 @@ import cebra.integrations.sklearn as sklearn -__version__ = "0.6.0a2" +__version__ = "0.6.0" __all__ = ["CEBRA"] __allow_lazy_imports = False __lazy_imports = {} diff --git a/reinstall.sh b/reinstall.sh index 067985a1..d191b8f7 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.6.0a2 +VERSION=0.6.0 echo "Upgrading to CEBRA v${VERSION}" # Upgrade the build system (PEP517/518 compatible) diff --git a/setup.cfg b/setup.cfg index dad9ac26..87fcef03 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ author_email = stes@hey.com, mackenzie@post.harvard.edu description = Consistent Embeddings of high-dimensional Recordings using Auxiliary variables long_description = file: README.md long_description_content_type = text/markdown +license = Apache-2.0 license_files = LICENSE.md license_file_type = text/markdown url = https://github.com/AdaptiveMotorControlLab/CEBRA @@ -18,9 +19,6 @@ classifiers = Operating System :: OS Independent Programming Language :: Python :: 3 Topic :: Scientific/Engineering :: Artificial Intelligence - # 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] @@ -105,7 +103,10 @@ dev = pytest-xdist pytest-timeout # NOTE(stes): https://github.com/twmr/pytest-sphinx/issues/69 - pytest-sphinx @ https://github.com/twmr/pytest-sphinx/archive/refs/tags/v0.7.0.tar.gz + # To run all tests, currently a manual install from github is required: + # https://github.com/twmr/pytest-sphinx/archive/refs/tags/v0.7.0.tar.gz + # See .github/workflows/build.yml for more details. + pytest-sphinx licenseheaders interrogate # TODO(stes) Add back once upstream issue