Merge pull request #1448 from Unidata/plugin_fix1

fix inverted conditions for plugin detection

Author: jswhit

.github/workflows/miniconda.yml

@@ -45,6 +45,8 @@ jobs:
 
     - name: Tests
       run: |
+        #export NO_PLUGINS=YES
+        export HDF5_PLUGIN_PATH="${CONDA_PREFIX}/hdf5/lib/plugin/"
         pytest -s -rxs -v test
 
   run-mpi:

pyproject.toml

@@ -122,7 +122,7 @@ test-command = [
 ]
 manylinux-x86_64-image = "ghcr.io/ocefpaf/manylinux_2_28_x86_64-netcdf"
 manylinux-aarch64-image = "ghcr.io/ocefpaf/manylinux_2_28_aarch64-netcdf"
-environment = {NETCDF4_LIMITED_API="1"}
+environment = {NETCDF4_LIMITED_API="1", NETCDF_PLUGIN_DIR="/usr/local/hdf5/lib/plugin/"}
 
 [tool.cibuildwheel.macos]
 before-build = "brew install hdf5 netcdf"

src/netCDF4/__init__.py

@@ -1,4 +1,12 @@
 # init for netCDF4. package
+# if HDF5_PLUGIN_PATH not set, point to package path if plugins live there
+import os
+pluginpath = os.path.join(__path__[0],'plugins')
+if 'HDF5_PLUGIN_PATH' not in os.environ and\
+    (os.path.exists(os.path.join(pluginpath,'lib__nczhdf5filters.so')) or\
+     os.path.exists(os.path.join(pluginpath,'__nczhdf5filters.dll')) or\
+     os.path.exists(os.path.join(pluginpath,'lib__nczhdf5filters.dylib'))):
+    os.environ['HDF5_PLUGIN_PATH']=pluginpath
 # Docstring comes from extension module _netCDF4.
 from ._netCDF4 import *
 # Need explicit imports for names beginning with underscores
@@ -11,17 +19,10 @@
                        __has_quantization_support__, __has_zstandard_support__,
                        __has_bzip2_support__, __has_blosc_support__, __has_szip_support__,
                        __has_set_alignment__, __has_parallel_support__, __has_ncfilter__, __has_nc_rc_set__)
-import os
 __all__ = [
     'Dataset', 'Variable', 'Dimension', 'Group', 'MFDataset', 'MFTime', 'CompoundType',
     'VLType', 'date2num', 'num2date', 'date2index', 'stringtochar', 'chartostring',
     'stringtoarr', 'getlibversion', 'EnumType', 'get_chunk_cache', 'set_chunk_cache',
     'set_alignment', 'get_alignment', 'rc_get', 'rc_set',
 ]
 __pdoc__ = {'utils': False}
-# if HDF5_PLUGIN_PATH not set, point to package path if plugins live there
-pluginpath = os.path.join(__path__[0],'plugins')
-if 'HDF5_PLUGIN_PATH' not in os.environ and\
-    (os.path.exists(os.path.join(pluginpath,'lib__nczhdf5filters.so')) or\
-     os.path.exists(os.path.join(pluginpath,'lib__nczhdf5filters.dylib'))):
-    os.environ['HDF5_PLUGIN_PATH']=pluginpath

src/netCDF4/_netCDF4.pyx

@@ -3558,8 +3558,11 @@ to be installed and in `$PATH`.
         """**`has_blosc_filter(self)`**
         returns True if blosc compression filter is available
         """
-        if __has_blosc_support__:
-            return False
+
+        #if __has_blosc_support__:
+        #    return True
+        #else:
+        #    return False
 
         cdef int ierr
         with nogil:
@@ -3571,8 +3574,10 @@ to be installed and in `$PATH`.
         returns True if zstd compression filter is available
         """
 
-        if __has_zstandard_support__:
-            return False
+        #if __has_zstandard_support__:
+        #    return True
+        #else:
+        #    return False
 
         cdef int ierr
         with nogil:
@@ -3584,8 +3589,10 @@ to be installed and in `$PATH`.
         returns True if bzip2 compression filter is available
         """
 
-        if __has_bzip2_support__:
-            return False
+        #if __has_bzip2_support__:
+        #    return True
+        #else:
+        #    return False
 
         cdef int ierr
         with nogil:
@@ -3597,11 +3604,13 @@ to be installed and in `$PATH`.
         returns True if szip compression filter is available
         """
 
-        if not __has_ncfilter__:
-            return __has_szip_support__
+        #if not __has_ncfilter__:
+        #    return __has_szip_support__
 
-        if not __has_szip_support__:
-            return False
+        #if  __has_szip_support__:
+        #    return True
+        #else:
+        #    return False
 
         cdef int ierr
         with nogil:

test/run_all.py

@@ -15,7 +15,6 @@
     m = __import__(os.path.splitext(f)[0])
     testsuite.addTests(unittest.TestLoader().loadTestsFromModule(m))
 
-
 if __name__ == '__main__':
     import numpy, cython
     sys.stdout.write('\n')