wavpack-numcodecs 0.2.0__tar.gz → 0.2.2__tar.gz

{wavpack-numcodecs-0.2.0/src/wavpack_numcodecs.egg-info → wavpack-numcodecs-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavpack-numcodecs
-Version: 0.2.0
+Version: 0.2.2
 Summary: Numcodecs implementation of WavPack audio codec.
 Author-email: Alessio Buccino <alessiop.buccino@gmail.com>, David Bryant <david@wavpack.com>
 License: MIT
@@ -10,6 +10,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+Provides-Extra: test
+Provides-Extra: test_no_cython
 License-File: LICENSE
 
 [![PyPI version](https://badge.fury.io/py/wavpack-numcodecs.svg)](https://badge.fury.io/py/wavpack-numcodecs) ![tests](https://github.com/AllenNeuralDynamics/wavpack-numcodecs/actions/workflows/python-package-cython.yml/badge.svg)
@@ -37,6 +39,8 @@ For Linux and Windows, the package comes with pre-built binaries of the most
 
 On Linux, if an existing `wavpack` installation is found, the package will use it. Otherwise, it will use the pre-built binaries available in the `wavpack_numcodecs/libraries` folder.
 
+On Windows, you need to have the "Microsoft C++ Build Tools" installed. You can download it and install it from [here](https://visualstudio.microsoft.com/visual-cpp-build-tools/).
+
 ## Installation
 
 Install via `pip`:
@@ -77,7 +81,7 @@ installed.
 
 # Developmers guide
 
-## How to upgrade WavPack installation
+## How to upgrade WavPack installation and make a new release
 
 To upgrade the WavPack installation, you need to:
 
@@ -85,6 +89,8 @@ To upgrade the WavPack installation, you need to:
 2. Extract the content of the downloaded file.
 3. Create a new folder in the `src/wavpack_numcodecs/libraries` folder with the name of the version of the WavPack you are installing.
 4. Add the Windows .dll and .lib files to the `windows-x86_32` and `windows-x86_64` folders, respectievely.
-5. Build the Linux shared library and copy the `.so` file to the `linux-x86_64` folder.
-6. Set the `LATET_WAVPACK_VERSION` variable in the `setup.py` to match the version of the WavPack you are installing.
-7. Update the version of the CI workflows in the `.github/workflows/` folder.
+5. Update the version of the CI workflows in the `.github/wavpack_latest_version.txt` file and set the `LATEST_WAVPACK_VERSION` variable in the `setup.py` to match the version of the WavPack you are installing.
+6. Make a PR with the changes and merge it.
+7. Manually trigger the `Build wavpack binaries` workflow in the Actions tab of the repository. This will automatically build the binaries for different Linux versions and make PRs with the changes to the `main` branch.
+8. Merge the automated PRs to update the Linux binaries.
+9. Update the version of the package in the `pyproject.toml` file and tag the repo to automatically make a new release.

{wavpack-numcodecs-0.2.0 → wavpack-numcodecs-0.2.2}/README.md

@@ -23,6 +23,8 @@ For Linux and Windows, the package comes with pre-built binaries of the most
 
 On Linux, if an existing `wavpack` installation is found, the package will use it. Otherwise, it will use the pre-built binaries available in the `wavpack_numcodecs/libraries` folder.
 
+On Windows, you need to have the "Microsoft C++ Build Tools" installed. You can download it and install it from [here](https://visualstudio.microsoft.com/visual-cpp-build-tools/).
+
 ## Installation
 
 Install via `pip`:
@@ -63,7 +65,7 @@ installed.
 
 # Developmers guide
 
-## How to upgrade WavPack installation
+## How to upgrade WavPack installation and make a new release
 
 To upgrade the WavPack installation, you need to:
 
@@ -71,6 +73,8 @@ To upgrade the WavPack installation, you need to:
 2. Extract the content of the downloaded file.
 3. Create a new folder in the `src/wavpack_numcodecs/libraries` folder with the name of the version of the WavPack you are installing.
 4. Add the Windows .dll and .lib files to the `windows-x86_32` and `windows-x86_64` folders, respectievely.
-5. Build the Linux shared library and copy the `.so` file to the `linux-x86_64` folder.
-6. Set the `LATET_WAVPACK_VERSION` variable in the `setup.py` to match the version of the WavPack you are installing.
-7. Update the version of the CI workflows in the `.github/workflows/` folder.
+5. Update the version of the CI workflows in the `.github/wavpack_latest_version.txt` file and set the `LATEST_WAVPACK_VERSION` variable in the `setup.py` to match the version of the WavPack you are installing.
+6. Make a PR with the changes and merge it.
+7. Manually trigger the `Build wavpack binaries` workflow in the Actions tab of the repository. This will automatically build the binaries for different Linux versions and make PRs with the changes to the `main` branch.
+8. Merge the automated PRs to update the Linux binaries.
+9. Update the version of the package in the `pyproject.toml` file and tag the repo to automatically make a new release.

{wavpack-numcodecs-0.2.0 → wavpack-numcodecs-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wavpack-numcodecs"
-version = "0.2.0"
+version = "0.2.2"
 description = "Numcodecs implementation of WavPack audio codec."
 authors = [
     {name = "Alessio Buccino", email = "alessiop.buccino@gmail.com"},
@@ -20,18 +20,30 @@ dependencies = [
     "packaging"
 ]
 
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "zarr",
+    "Cython"
+]
+
+test_no_cython = [
+    "pytest",
+    "zarr"
+]
+
+
 [project.urls]
 "Homepage" = "https://github.com/AllenNeuralDynamics/wavpack-numcodecs"
 
 
-
 [build-system]
 requires = ["setuptools>=62.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
 include-package-data = true
-package-data = {"wavpack_numcodecs" = ["**/*.pyx", "**/*.pxd", "**/*.c", "**/*.h", "**/*.so", "**/*.so.*", "**/*.dll"]}
+package-data = {"wavpack_numcodecs" = ["**/*.pyx", "**/*.pxd", "**/*.c", "**/*.h", "**/*.so", "**/*.so.*", "**/*.dll", "**/*.lib"]}
 
 [tool.setuptools.exclude-package-data]
 wavpack_numcodecs = ["**/tests/test_*"]
@@ -44,3 +56,9 @@ exclude = ["wavpack_numcodecs.*.tests"]
 
 [tool.black]
 line-length = 120
+
+[tool.pytest.ini_options]
+markers = [
+    "numcodecs",
+    "zarr"
+]

{wavpack-numcodecs-0.2.0 → wavpack-numcodecs-0.2.2}/setup.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import platform
 import shutil
-import os
 from pathlib import Path
 from subprocess import check_output
 
@@ -33,15 +32,30 @@ def get_build_extensions():
             runtime_library_dirs = ["/usr/local/lib/", "/usr/bin/"]
         else:
             print("Using shipped libraries")
-            extra_link_args = [f"-L{SRC_FOLDER}/libraries/{LATEST_WAVPACK_VERSION}/linux-x86_64"]
+            wavpack_libraries_folder = Path(f"{SRC_FOLDER}/libraries/{LATEST_WAVPACK_VERSION}")
+            available_glibc_builds = [
+                p.name for p in wavpack_libraries_folder.iterdir() if p.is_dir() and "linux" in p.name
+            ]
+            available_glibc_versions = [
+                p[p.find("glibc") + len("glibc") :] for p in available_glibc_builds
+            ]
+
+            glibc_version = platform.libc_ver()[1]
+            if glibc_version not in available_glibc_versions:
+                raise RuntimeError(
+                    f"Could not find a matching glibc version for the shipped libraries. "
+                    f"Available builds: {available_glibc_versions}"
+                )
+            distr_folder = f"linux-x86_64-glibc{glibc_version}"
+
+            extra_link_args = [f"-L{wavpack_libraries_folder}/{distr_folder}"]
             runtime_library_dirs = [
-                "$ORIGIN/libraries/{LATEST_WAVPACK_VERSION}/linux-x86_64",
-                f"{SRC_FOLDER}/libraries/{LATEST_WAVPACK_VERSION}/linux-x86_64"
+                f"$ORIGIN/libraries/{LATEST_WAVPACK_VERSION}/{distr_folder}",
             ]
             # hack
             shutil.copy(
-                f"{SRC_FOLDER}/libraries/{LATEST_WAVPACK_VERSION}/linux-x86_64/libwavpack.so",
-                f"{SRC_FOLDER}/libraries/{LATEST_WAVPACK_VERSION}/linux-x86_64/libwavpack.so.1",
+                f"{wavpack_libraries_folder}/{distr_folder}/libwavpack.so",
+                f"{wavpack_libraries_folder}/{distr_folder}/libwavpack.so.1",
             )
     elif platform.system() == "Darwin":
         libraries = ["wavpack"]

{wavpack-numcodecs-0.2.0 → wavpack-numcodecs-0.2.2/src/wavpack_numcodecs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavpack-numcodecs
-Version: 0.2.0
+Version: 0.2.2
 Summary: Numcodecs implementation of WavPack audio codec.
 Author-email: Alessio Buccino <alessiop.buccino@gmail.com>, David Bryant <david@wavpack.com>
 License: MIT
@@ -10,6 +10,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+Provides-Extra: test
+Provides-Extra: test_no_cython
 License-File: LICENSE
 
 [![PyPI version](https://badge.fury.io/py/wavpack-numcodecs.svg)](https://badge.fury.io/py/wavpack-numcodecs) ![tests](https://github.com/AllenNeuralDynamics/wavpack-numcodecs/actions/workflows/python-package-cython.yml/badge.svg)
@@ -37,6 +39,8 @@ For Linux and Windows, the package comes with pre-built binaries of the most
 
 On Linux, if an existing `wavpack` installation is found, the package will use it. Otherwise, it will use the pre-built binaries available in the `wavpack_numcodecs/libraries` folder.
 
+On Windows, you need to have the "Microsoft C++ Build Tools" installed. You can download it and install it from [here](https://visualstudio.microsoft.com/visual-cpp-build-tools/).
+
 ## Installation
 
 Install via `pip`:
@@ -77,7 +81,7 @@ installed.
 
 # Developmers guide
 
-## How to upgrade WavPack installation
+## How to upgrade WavPack installation and make a new release
 
 To upgrade the WavPack installation, you need to:
 
@@ -85,6 +89,8 @@ To upgrade the WavPack installation, you need to:
 2. Extract the content of the downloaded file.
 3. Create a new folder in the `src/wavpack_numcodecs/libraries` folder with the name of the version of the WavPack you are installing.
 4. Add the Windows .dll and .lib files to the `windows-x86_32` and `windows-x86_64` folders, respectievely.
-5. Build the Linux shared library and copy the `.so` file to the `linux-x86_64` folder.
-6. Set the `LATET_WAVPACK_VERSION` variable in the `setup.py` to match the version of the WavPack you are installing.
-7. Update the version of the CI workflows in the `.github/workflows/` folder.
+5. Update the version of the CI workflows in the `.github/wavpack_latest_version.txt` file and set the `LATEST_WAVPACK_VERSION` variable in the `setup.py` to match the version of the WavPack you are installing.
+6. Make a PR with the changes and merge it.
+7. Manually trigger the `Build wavpack binaries` workflow in the Actions tab of the repository. This will automatically build the binaries for different Linux versions and make PRs with the changes to the `main` branch.
+8. Merge the automated PRs to update the Linux binaries.
+9. Update the version of the package in the `pyproject.toml` file and tag the repo to automatically make a new release.

{wavpack-numcodecs-0.2.0 → wavpack-numcodecs-0.2.2}/src/wavpack_numcodecs.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
 LICENSE
-MANIFEST.in
 README.md
 pyproject.toml
-requirements.txt
 setup.py
 src/wavpack_numcodecs/__init__.py
 src/wavpack_numcodecs/compat_ext.c
@@ -19,13 +17,19 @@ src/wavpack_numcodecs.egg-info/entry_points.txt
 src/wavpack_numcodecs.egg-info/requires.txt
 src/wavpack_numcodecs.egg-info/top_level.txt
 src/wavpack_numcodecs/include/wavpack/wavpack.h
-src/wavpack_numcodecs/libraries/5.6.0/linux-x86_64/libwavpack.so
+src/wavpack_numcodecs/libraries/5.6.0/linux-x86_64-glibc2.35/libwavpack.so
 src/wavpack_numcodecs/libraries/5.6.0/windows-x86_32/wavpackdll.dll
+src/wavpack_numcodecs/libraries/5.6.0/windows-x86_32/wavpackdll.lib
 src/wavpack_numcodecs/libraries/5.6.0/windows-x86_64/wavpackdll.dll
-src/wavpack_numcodecs/libraries/5.7.0/linux-x86_64/libwavpack.so
-src/wavpack_numcodecs/libraries/5.7.0/linux-x86_64/libwavpack.so.1
+src/wavpack_numcodecs/libraries/5.6.0/windows-x86_64/wavpackdll.lib
+src/wavpack_numcodecs/libraries/5.7.0/linux-x86_64-glibc2.31/libwavpack.so
+src/wavpack_numcodecs/libraries/5.7.0/linux-x86_64-glibc2.35/libwavpack.so
+src/wavpack_numcodecs/libraries/5.7.0/linux-x86_64-glibc2.35/libwavpack.so.1
+src/wavpack_numcodecs/libraries/5.7.0/linux-x86_64-glibc2.39/libwavpack.so
 src/wavpack_numcodecs/libraries/5.7.0/windows-x86_32/wavpackdll.dll
+src/wavpack_numcodecs/libraries/5.7.0/windows-x86_32/wavpackdll.lib
 src/wavpack_numcodecs/libraries/5.7.0/windows-x86_64/wavpackdll.dll
+src/wavpack_numcodecs/libraries/5.7.0/windows-x86_64/wavpackdll.lib
 src/wavpack_numcodecs/src/decoder.c
 src/wavpack_numcodecs/src/encoder.c
 tests/test_imports.py

wavpack-numcodecs-0.2.2/src/wavpack_numcodecs.egg-info/requires.txt

@@ -0,0 +1,12 @@
+numpy
+numcodecs
+packaging
+
+[test]
+pytest
+zarr
+Cython
+
+[test_no_cython]
+pytest
+zarr

wavpack-numcodecs-0.2.0/MANIFEST.in

@@ -1,8 +0,0 @@
-include requirements.txt
-recursive-include wavpack_numcodecs *.c
-recursive-include wavpack_numcodecs *.pyx
-recursive-include wavpack_numcodecs *.pxd
-recursive-include wavpack_numcodecs *.lib
-recursive-include wavpack_numcodecs *.dll
-recursive-include wavpack_numcodecs/include *.h
-recursive-include wavpack_numcodecs/libraries *

wavpack-numcodecs-0.2.0/requirements.txt

@@ -1,3 +0,0 @@
-numpy
-numcodecs
-packaging

wavpack-numcodecs-0.2.0/src/wavpack_numcodecs.egg-info/requires.txt

@@ -1,3 +0,0 @@
-numpy
-numcodecs
-packaging