From c77f42e222ef91bd8cd4551cf9bb6b07b0adc28a Mon Sep 17 00:00:00 2001 From: Constantin Pape Date: Sat, 15 Jun 2024 18:38:48 +0200 Subject: [PATCH] Try to fix CI (#229) Fix CI, loosen version pinning for n5 and bump version --- .github/workflows/build.yml | 15 ++++----------- include/z5/z5.hxx | 2 +- src/python/module/z5py/__init__.py | 2 +- src/python/module/z5py/file.py | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7c498f..626c12a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: os: [macos-latest, windows-latest, ubuntu-latest] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11'] steps: - name: Checkout @@ -27,18 +27,11 @@ jobs: - name: Set windows env if: matrix.os == 'windows-latest' uses: ilammy/msvc-dev-cmd@v1 - - - name: Setup miniconda - uses: conda-incubator/setup-miniconda@v2 + + - name: Setup micromamba + uses: mamba-org/setup-micromamba@v1 with: - activate-environment: z5-build-env - auto-update-conda: true - channels: conda-forge environment-file: .github/workflows/environment.yaml - python-version: ${{ matrix.python-version }} - auto-activate-base: false - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Build unix if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' diff --git a/include/z5/z5.hxx b/include/z5/z5.hxx index 32b57b6..185a062 100644 --- a/include/z5/z5.hxx +++ b/include/z5/z5.hxx @@ -2,4 +2,4 @@ #define Z5_VERSION_MAJOR 2 #define Z5_VERSION_MINOR 0 -#define Z5_VERSION_PATCH 17 +#define Z5_VERSION_PATCH 18 diff --git a/src/python/module/z5py/__init__.py b/src/python/module/z5py/__init__.py index 4ba9267..d281c75 100644 --- a/src/python/module/z5py/__init__.py +++ b/src/python/module/z5py/__init__.py @@ -3,5 +3,5 @@ from .group import Group from .attribute_manager import set_json_encoder, set_json_decoder -__version__ = "2.0.17" +__version__ = "2.0.18" __version_info__ = tuple(int(i) for i in __version__.split(".")) diff --git a/src/python/module/z5py/file.py b/src/python/module/z5py/file.py index a8343a8..2b286d5 100644 --- a/src/python/module/z5py/file.py +++ b/src/python/module/z5py/file.py @@ -96,8 +96,8 @@ def _check_version(self): version = metadata.get('n5', None) if version is not None: major_version = int(version[0]) - if major_version > 2: - raise RuntimeError("Can't open n5 file with major version bigger than 2") + if major_version > 4: + raise RuntimeError("Can't open n5 file with major version bigger than 4") def close(self): # This function exists just for conformity with the standard file-handling procedure.