update visr, enable visr tests, and update other deps

bear/data_file.py

@@ -1,4 +1,4 @@
-import pkg_resources
+import importlib_resources
 import os
 
 
@@ -15,12 +15,12 @@ def get_path(file_url):
         # try to find the file in a couple of different places
         for package, prefix in ("bear", "data/"), ("visr_bear_data", ""):
             try:
-                full_path = pkg_resources.resource_filename(package, prefix + path)
+                full_path = importlib_resources.files(package) / prefix / path
             except ModuleNotFoundError:
                 continue
 
-            if os.path.isfile(full_path):
-                return full_path
+            if full_path.is_file():
+                return str(full_path)
         else:
             raise Exception(f"resource '{path}' not found")
     elif file_url.startswith("file:"):

nix/bear.nix

@@ -2,7 +2,8 @@
 python.pkgs.buildPythonPackage rec {
   name = "bear";
   inherit src;
-  propagatedBuildInputs = with python.pkgs; [ numpy ear setuptools visr_python visr_bear ];
+  propagatedBuildInputs = with python.pkgs; [ numpy ear importlib-resources visr_python visr_bear ];
+  nativeBuildInputs = with python.pkgs; [ setuptools ];
   nativeCheckInputs = [ python.pkgs.pytest numpy_quaternion ];
   checkPhase = lib.optionalString (visr_bear != null) ''
     pytest visr_bear/test

nix/ear.nix

@@ -1,7 +1,10 @@
-{ stdenv, python, fetchFromGitHub, src }:
+{ stdenv, python, src }:
 python.pkgs.buildPythonPackage rec {
   name = "ear";
   inherit src;
-  propagatedBuildInputs = with python.pkgs; [ numpy scipy six attrs multipledispatch lxml pyyaml setuptools ];
+  propagatedBuildInputs = with python.pkgs; [ numpy scipy six attrs multipledispatch lxml pyyaml importlib-resources ];
+  nativeBuildInputs = with python.pkgs; [ setuptools ];
+  pyproject = true;
+
   doCheck = false;
 }

nix/visr.nix

@@ -2,7 +2,7 @@
 stdenv.mkDerivation rec {
   name = "VISR";
   inherit src;
-  nativeBuildInputs = [ cmake ninja boost ] ++ lib.optional enable_python python.buildEnv;
+  nativeBuildInputs = [ cmake ninja boost ] ++ lib.optional enable_python python;
   cmakeFlags = [
     "-DBUILD_AUDIOINTERFACES_PORTAUDIO=FALSE"
     "-DBUILD_USE_SNDFILE_LIBRARY=FALSE"
@@ -13,4 +13,17 @@ stdenv.mkDerivation rec {
     substituteInPlace CMakeLists.txt \
       --replace "\''${VISR_TOPLEVEL_INSTALL_DIRECTORY}/python" "$out/${python.sitePackages}"
   '';
+
+  preCheck = ''
+    export LD_LIBRARY_PATH=$(pwd)/lib
+    export DYLD_LIBRARY_PATH=$(pwd)/lib
+  '';
+
+  nativeCheckInputs = lib.optionals enable_python [
+    python.pkgs.numpy
+    python.pkgs.scipy
+    python.pkgs.pytest
+  ];
+
+  doCheck = true;
 }

nix/visr_bear.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     eigen
     libear
     rapidjson
-  ] ++ (if enable_python then [ python.buildEnv visr_python ] else [ visr ]);
+  ] ++ (if enable_python then [ python visr_python ] else [ visr ]);
   cmakeFlags = [
     "-DBEAR_UNIT_TESTS=true"
     "-DBEAR_DATA_PATH_DEFAULT=${data_files.default.file}"

setup.py

@@ -6,6 +6,7 @@
     version="0.0.1",
     install_requires=[
         "ear~=2.1",
+        "importlib_resources",
         "numpy",
     ],
     packages=find_packages(),