Merge pull request #222 from giovana-morais/migrate_ci

Migrate CI to GitHub Actions (v2)

Author: bmcfee

.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: JSON Annotated Music Specification for Reproducible MIR Research
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+        - "3.9"
+        - "3.10"
+        - "3.11"
+        - "3.12"
+    timeout-minutes: 5
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install jams
+      run: pip install -e .[display,tests]
+    - name: Run tests
+      run: |
+        pytest -v --cov-report term-missing --cov jams

.gitignore

@@ -12,6 +12,10 @@ var
 sdist
 develop-eggs
 .installed.cfg
+lib
+share
+pyvenv.cfg
+
 
 # Installer logs
 pip-log.txt

.travis.yml

@@ -2,6 +2,7 @@
 """Top-level module for JAMS"""
 
 import os
+import sys
 from importlib import resources
 from itertools import chain
 
@@ -19,11 +20,17 @@
 
 
 # Populate the namespace mapping
-for ns in chain(*map(lambda p: p.rglob('*.json'), resources.files('jams.schemata.namespaces').iterdir())):
-    schema.add_namespace(ns)
+if sys.version_info < (3, 10):
+    from pkg_resources import resource_filename
 
-# Populate local namespaces
+    for _ in util.find_with_extension(resource_filename(__name__, schema.NS_SCHEMA_DIR), 'json'):
+        schema.add_namespace(_)
+
+else:
+    for ns in chain(*map(lambda p: p.rglob('*.json'), resources.files('jams.schemata.namespaces').iterdir())):
+        schema.add_namespace(ns)
 
+# Populate local namespaces
 if 'JAMS_SCHEMA_DIR' in os.environ:
     for ns in util.find_with_extension(os.environ['JAMS_SCHEMA_DIR'], 'json'):
         schema.add_namespace(ns)

.travis_dependencies.sh

@@ -169,7 +169,7 @@ def piano_roll(annotation, sr=22050, length=None, **kwargs):
         gram[pitch_map[f], col] = 1
 
     return filter_kwargs(mir_eval.sonify.time_frequency,
-                         gram, pitches, intervals,
+                         gram, np.asarray(pitches), np.asarray(intervals),
                          sr, length=length, **kwargs)
 
 

jams/__init__.py

@@ -49,7 +49,7 @@ def load_source(modname, filename):
         'numpy>=1.8.0',
         'six',
         'decorator',
-        'mir_eval>0.7',
+        'mir_eval>=0.8.2'
     ],
     extras_require={
         'display': ['matplotlib>=1.5.0'],

jams/sonify.py

@@ -17,8 +17,6 @@
 import jams
 
 
-parametrize = pytest.mark.parametrize
-
 
 # Borrowed from sklearn
 def clean_warning_registry():
@@ -73,8 +71,8 @@ def test_jobject_deserialize():
     assert J == jams.JObject.loads(json_jobject)
 
 
-@parametrize('d1', [dict(key1='value 1', key2='value 2')])
-@parametrize('d2, match',
+@pytest.mark.parametrize('d1', [dict(key1='value 1', key2='value 2')])
+@pytest.mark.parametrize('d2, match',
              [(dict(key1='value 1', key2='value 2'), True),
               (dict(key1='value 1', key2='value 3'), False)])
 def test_jobject_eq(d1, d2, match):
@@ -94,7 +92,7 @@ def test_jobject_eq(d1, d2, match):
     assert not J1 == J3
 
 
-@parametrize('data, value', [({'key': True}, True), ({}, False)])
+@pytest.mark.parametrize('data, value', [({'key': True}, True), ({}, False)])
 def test_jobject_nonzero(data, value):
 
     J = jams.JObject(**data)
@@ -155,9 +153,9 @@ def ann_meta_dummy():
                 data_source='null')
 
 
-@parametrize('curator', [None, jams.Curator(name='nobody',
+@pytest.mark.parametrize('curator', [None, jams.Curator(name='nobody',
                                             email='[email protected]')])
-@parametrize('annotator', [None, jams.Sandbox(description='desc')])
+@pytest.mark.parametrize('annotator', [None, jams.Sandbox(description='desc')])
 def test_annotation_metadata(ann_meta_dummy, curator, annotator):
 
     md = jams.AnnotationMetadata(curator=curator, annotator=annotator,
@@ -192,7 +190,7 @@ def ann_metadata():
     return jams.AnnotationMetadata(corpus='test collection')
 
 
-@parametrize('namespace', ['tag_open'])
+@pytest.mark.parametrize('namespace', ['tag_open'])
 def test_annotation(namespace, tag_data, ann_metadata, ann_sandbox):
     ann = jams.Annotation(namespace, data=tag_data,
                           annotation_metadata=ann_metadata,
@@ -482,7 +480,7 @@ def test_jams_add(tag_data):
     assert jam.annotations[-1] == jam2.annotations[0]
 
 
-@parametrize('on_conflict',
+@pytest.mark.parametrize('on_conflict',
              ['overwrite', 'ignore'])
 def test_jams_add_conflict(on_conflict):
     fn = 'tests/fixtures/valid.jams'
@@ -504,7 +502,7 @@ def test_jams_add_conflict(on_conflict):
         assert jam.file_metadata == jam_orig.file_metadata
 
 
-@parametrize('on_conflict,exception', [
+@pytest.mark.parametrize('on_conflict,exception', [
     ('fail', jams.JamsError),
     ('bad_fail_mdoe', jams.ParameterError)
 ])
@@ -525,7 +523,8 @@ def test_jams_add_conflict_exceptions(on_conflict, exception):
 jam = jams.load('tests/fixtures/valid.jams', validate=False)
 jam.annotations[0].sandbox.foo = None
 
-@parametrize('query, expected',
+
+@pytest.mark.parametrize('query, expected',
              [(dict(corpus='SMC_MIREX'), jam.annotations),
               (dict(), []),
               (dict(namespace='beat'), jam.annotations[:1]),
@@ -535,8 +534,6 @@ def test_jams_add_conflict_exceptions(on_conflict, exception):
 def test_jams_search(query, expected):
     result = jam.search(**query)
 
-    assert result == expected
-
 
 def test_jams_validate_good():
 
@@ -1266,4 +1263,3 @@ def test_annotation_to_samples_fail_shape():
 
     with pytest.raises(jams.ParameterError):
         values = ann.to_samples([[0.2, 0.4, 0.75, 1.25, 1.75, 1.4]])
-

setup.py

@@ -13,15 +13,12 @@
 
 @pytest.mark.parametrize('ns_key', ['pitch_hz', 'beat'])
 def test_schema_namespace(ns_key):
-
     # Get the schema
     schema = jams.schema.namespace(ns_key)
-
     # Make sure it has the correct properties
     valid_keys = set(['time', 'duration', 'value', 'confidence'])
     for key in schema['properties']:
         assert key in valid_keys
-
     for key in ['time', 'duration']:
         assert key in schema['properties']
 
@@ -31,9 +28,8 @@ def test_schema_namespace_exception(ns_key):
         jams.schema.namespace(ns_key)
 
 
-@pytest.mark.parametrize('ns, dense',
-                         [('pitch_hz', True),
-                          ('beat', False)])
+
+@pytest.mark.parametrize('ns, dense', [('pitch_hz', True), ('beat', False)])
 def test_schema_is_dense(ns, dense):
     assert dense == jams.schema.is_dense(ns)