From b1ec0ac26166225854c2b800a7cdab2a393ea9be Mon Sep 17 00:00:00 2001 From: mloubout Date: Tue, 26 Mar 2024 10:19:43 -0400 Subject: [PATCH] switch to new blosc major version blosc2 --- .github/workflows/pytest-linux.yml | 12 ++++++------ .github/workflows/pytest-macOS.yml | 18 +++++++++++------- setup.py | 4 ++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pytest-linux.yml b/.github/workflows/pytest-linux.yml index 2ffd5f6..cdfdc8a 100644 --- a/.github/workflows/pytest-linux.yml +++ b/.github/workflows/pytest-linux.yml @@ -21,22 +21,22 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip - python -m pip install pytest numpy - pip install -e .[compression] + python3 -m pip install --upgrade pip + python3 -m pip install --upgrade importlib_metadata pytest numpy + python3 -m pip install -e .[compression] env: PYTHONPATH: $PWD - name: Run examples run: | - python examples/use_classic.py - python examples/use_modernised.py + python3 examples/use_classic.py + python3 examples/use_modernised.py - name: Test with pytest run: py.test -vs tests diff --git a/.github/workflows/pytest-macOS.yml b/.github/workflows/pytest-macOS.yml index cc67224..f866cbd 100644 --- a/.github/workflows/pytest-macOS.yml +++ b/.github/workflows/pytest-macOS.yml @@ -14,21 +14,25 @@ jobs: python-version: [3.6-dev, 3.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Install dependencies run: | - python -m pip install --upgrade pip - python -m pip install pytest numpy - pip install -e . + python3 -m pip install --upgrade pip + python3 -m pip install pytest numpy + python3 -m pip install -e . env: PYTHONPATH: $PWD + - name: Run examples run: | - python examples/use_classic.py - python examples/use_modernised.py + python3 examples/use_classic.py + python3 examples/use_modernised.py + - name: Test with pytest run: py.test -vs tests diff --git a/setup.py b/setup.py index 1f569b8..91bde10 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def extensions(): 'packages': find_packages(exclude=['examples', 'tests']), 'setup_requires': s_required, 'install_requires': i_required, - 'extras_require': {'compression': ['blosc', 'pyzfp']}, + 'extras_require': {'compression': ['blosc2', 'pyzfp']}, 'ext_modules': lazy_cythonize(extensions), 'version': versioneer.get_version(), 'cmdclass': versioneer.get_cmdclass(), @@ -52,7 +52,7 @@ def extensions(): 'long_description_content_type': 'text/markdown', 'url': 'https://github.com/opesci/pyrevolve/', 'author': "Imperial College London", - 'author_email': 'opesci@imperial.ac.uk', + 'author_email': 'g.gorman@imperial.ac.uk', 'license': 'MIT', 'zip_safe': False }