Merge pull request marl#221 from stefansjs/python3.12

add support for Python3.12, modernize testing for pytest 8

jams/__init__.py

@@ -2,7 +2,8 @@
 """Top-level module for JAMS"""
 
 import os
-from pkg_resources import resource_filename
+from importlib import resources
+from itertools import chain
 
 # Import the necessary modules
 from .exceptions import *
@@ -18,14 +19,11 @@
 
 
 # Populate the namespace mapping
-for _ in util.find_with_extension(resource_filename(__name__, schema.NS_SCHEMA_DIR),
-                                  'json'):
-    schema.add_namespace(_)
+for ns in chain(*map(lambda p: p.rglob('*.json'), resources.files('jams.schemata.namespaces').iterdir())):
+    schema.add_namespace(ns)
 
 # Populate local namespaces
 
-try:
-    for _ in util.find_with_extension(os.environ['JAMS_SCHEMA_DIR'], 'json'):
-        schema.add_namespace(_)
-except KeyError:
-    pass
+if 'JAMS_SCHEMA_DIR' in os.environ:
+    for ns in util.find_with_extension(os.environ['JAMS_SCHEMA_DIR'], 'json'):
+        schema.add_namespace(ns)

jams/schema.py

@@ -21,7 +21,6 @@
 import json
 import os
 import copy
-from pkg_resources import resource_filename
 
 import numpy as np
 import jsonschema
@@ -231,11 +230,9 @@ def __get_dtype(typespec):
 
 def __load_jams_schema():
     '''Load the schema file from the package.'''
-
-    schema_file = os.path.join(SCHEMA_DIR, 'jams_schema.json')
-
-    jams_schema = None
-    with open(resource_filename(__name__, schema_file), mode='r') as fdesc:
+    abs_schema_dir = os.path.join(os.path.dirname(__file__), SCHEMA_DIR)
+    schema_file = os.path.join(abs_schema_dir, 'jams_schema.json')
+    with open(schema_file, mode='r') as fdesc:
         jams_schema = json.load(fdesc)
 
     if jams_schema is None:

jams/version.py

@@ -3,4 +3,4 @@
 """Version info"""
 
 short_version = '0.3'
-version = '0.3.4'
+version = '0.3.5a'

pyproject.toml

@@ -0,0 +1,13 @@
+[build-system]
+requires = ["setuptools >= 61.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.pytest.ini_options]
+addopts = [
+    "-v",
+    "--cov-report=term-missing",
+    "--cov=jams",
+]
+testpaths = [
+    "tests"
+]

setup.py

@@ -32,30 +32,28 @@ def load_source(modname, filename):
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Topic :: Multimedia :: Sound/Audio :: Analysis",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8"
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
+    python_requires=">=3.9",
     keywords='audio music json',
     license='ISC',
     install_requires=[
         'pandas',
         'sortedcontainers>=2.0.0',
-        'pyrsistent<0.15; python_version=="3.4"',
         'jsonschema>=3.0.0',
         'numpy>=1.8.0',
         'six',
         'decorator',
-        'mir_eval>=0.5',
+        'mir_eval>0.7',
     ],
     extras_require={
         'display': ['matplotlib>=1.5.0'],
-        'tests': ['pytest < 4', 'pytest-cov'],
+        'tests': ['pytest ~= 8.0', 'pytest-cov', 'matplotlib>=3'],
     },
     scripts=['scripts/jams_to_lab.py']
 )

tests/test_convert.py

@@ -9,23 +9,23 @@
 from jams import NamespaceError
 
 
-@pytest.mark.xfail(raises=NamespaceError)
 def test_bad_target():
 
     ann = jams.Annotation(namespace='tag_open')
     ann.append(time=0, duration=1, value='foo', confidence=1)
 
-    jams.convert(ann, 'bad namespace')
+    with pytest.raises(NamespaceError):
+        jams.convert(ann, 'bad namespace')
 
 
 @pytest.mark.parametrize('target',
                          ['pitch_hz', 'pitch_midi', 'segment_open',
                           'tag_open', 'beat', 'chord'])
-@pytest.mark.xfail(raises=NamespaceError)
 def test_bad_sources(target):
 
     ann = jams.Annotation(namespace='vector')
-    jams.convert(ann, target)
+    with pytest.raises(NamespaceError):
+        jams.convert(ann, target)
 
 
 @pytest.mark.parametrize('namespace', list(jams.schema.__NAMESPACE__.keys()))

tests/test_display.py

@@ -18,14 +18,20 @@
 @pytest.mark.parametrize('namespace',
                          ['segment_open', 'chord', 'multi_segment',
                           'pitch_contour', 'beat_position', 'beat',
-                          'onset', 'note_midi', 'tag_open',
-                          pytest.mark.xfail('tempo', raises=NamespaceError)])
+                          'onset', 'note_midi', 'tag_open'])
 @pytest.mark.parametrize('meta', [False, True])
 def test_display(namespace, meta):
 
     ann = jams.Annotation(namespace=namespace)
     jams.display.display(ann, meta=meta)
 
+@pytest.mark.parametrize('namespace', ['tempo'])
+@pytest.mark.parametrize('meta', [False, True])
+def test_display_exception(namespace, meta):
+    with pytest.raises(NamespaceError):
+        ann = jams.Annotation(namespace=namespace)
+        jams.display.display(ann, meta=meta)
+
 
 def test_display_multi():
 
@@ -69,8 +75,8 @@ def test_display_labeled_events():
     jams.display.display(ann)
 
 
-@pytest.mark.xfail(raises=jams.ParameterError)
 def test_display_multi_fail():
-
     anns = jams.AnnotationArray()
-    jams.display.display_multi(anns)
+
+    with pytest.raises(jams.ParameterError):
+        jams.display.display_multi(anns)