Update support to newer python versions

Author: smoia

phys2bids/__init__.py

@@ -8,3 +8,7 @@
 from . import _version
 
 __version__ = _version.get_versions()["version"]
+
+from . import _version
+
+__version__ = _version.get_versions()["version"]

phys2bids/tests/test_bids.py

@@ -1,9 +1,9 @@
 import os
 from csv import reader
+from importlib import resources
 
 import pytest
 import yaml
-from pkg_resources import resource_filename
 
 from phys2bids import bids
 from phys2bids.bids import UNIT_ALIASES
@@ -34,12 +34,14 @@ def test_bidsify_units():
 @pytest.mark.parametrize("test_sub", ["SBJ01", "sub-006", "006"])
 @pytest.mark.parametrize("test_ses", ["", "S05", "ses-42", "42"])
 def test_use_heuristic(tmpdir, test_sub, test_ses):
-    test_heur_path = resource_filename("phys2bids", "heuristics")
-    test_heur_file = "heur_test_acq.py"
-    test_full_heur_path = os.path.join(test_heur_path, test_heur_file)
-    test_input_path = resource_filename("phys2bids", "tests/data")
-    test_input_file = "Test_belt_pulse_samefreq.acq"
-    test_full_input_path = os.path.join(test_input_path, test_input_file)
+    ref = resources.files("phys2bids") / "heuristics"
+    with resources.as_file(ref) as test_heur_path:
+        test_heur_file = "heur_test_acq.py"
+        test_full_heur_path = os.path.join(test_heur_path, test_heur_file)
+    ref = resources.files("phys2bids") / "tests/data"
+    with resources.as_file(ref) as test_input_path:
+        test_input_file = "Test_belt_pulse_samefreq.acq"
+        test_full_input_path = os.path.join(test_input_path, test_input_file)
     test_outdir = tmpdir
     test_record_label = "test"
 

phys2bids/tests/test_integration.py

@@ -4,11 +4,11 @@
 import re
 import shutil
 import subprocess
+from importlib import resources
 from os import remove
 from os.path import isfile, join, split
 
 import pytest
-from pkg_resources import resource_filename
 
 from phys2bids._version import get_versions
 from phys2bids.phys2bids import phys2bids
@@ -109,8 +109,9 @@ def test_integration_heuristic(skip_integration, multifreq_lab_file):
     test_ntp = 30
     test_tr = 1.2
     test_thr = 0.735
-    heur_path = resource_filename("phys2bids", "heuristics")
-    test_heur = join(heur_path, "heur_test_multifreq.py")
+    ref = resources.files("phys2bids") / "heuristics"
+    with resources.as_file(ref) as heur_path:
+        test_heur = join(heur_path, "heur_test_multifreq.py")
 
     # Move into folder
     subprocess.run(f"cd {test_path}", shell=True, check=True)

setup.cfg

@@ -25,7 +25,7 @@ provides =
 [options]
 python_requires = >=3.6.1
 install_requires =
-    numpy >=1.10, <1.24
+    numpy >=1.10
     matplotlib >=3.1.1, !=3.3.0rc1
     PyYAML >=5.1
 tests_require =