Merge branch 'rich_dev_24'

HCDigitalScholarship · Aug 29, 2024 · bfbb230 · bfbb230
2 parents 08ced2a + 8750a6f
commit bfbb230
Show file tree

Hide file tree

Showing 14 changed files with 650 additions and 443 deletions.
diff --git a/.github/workflows/interval_test.yml b/.github/workflows/interval_test.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ '3.10', '3.11' ]
+        python-version: [ '3.10', '3.11', '3.12']
 
     steps:
       - name: Use Node.js 20.x

diff --git a/crim_intervals/__pycache__/__init__.cpython-311.pyc b/crim_intervals/__pycache__/__init__.cpython-311.pyc
diff --git a/crim_intervals/__pycache__/main.cpython-311.pyc b/crim_intervals/__pycache__/main.cpython-311.pyc
diff --git a/crim_intervals/__pycache__/main_objs.cpython-311.pyc b/crim_intervals/__pycache__/main_objs.cpython-311.pyc
diff --git a/crim_intervals/__pycache__/test_cadences.cpython-311-pytest-7.4.0.pyc b/crim_intervals/__pycache__/test_cadences.cpython-311-pytest-7.4.0.pyc
diff --git a/crim_intervals/__pycache__/test_constants.cpython-311-pytest-7.4.0.pyc b/crim_intervals/__pycache__/test_constants.cpython-311-pytest-7.4.0.pyc
diff --git a/crim_intervals/__pycache__/test_main_objs.cpython-311-pytest-7.4.0.pyc b/crim_intervals/__pycache__/test_main_objs.cpython-311-pytest-7.4.0.pyc
diff --git a/crim_intervals/__pycache__/test_vis.cpython-311-pytest-7.4.0.pyc b/crim_intervals/__pycache__/test_vis.cpython-311-pytest-7.4.0.pyc
diff --git a/crim_intervals/__pycache__/visualizations.cpython-311.pyc b/crim_intervals/__pycache__/visualizations.cpython-311.pyc
diff --git a/crim_intervals/test_vis.py b/crim_intervals/test_vis.py
@@ -181,21 +181,21 @@ def ngrams_heatmap_test_helper(model, notes):
 #     # helper_test_generate_ngrams_and_dur(model, mel_chromatic, -1)
 
 
-def test_comparisons_heatmap():
-    # pieces
-    df_relationships = pd.DataFrame(RELATIONSHIPS_DICT_EXAMPLE)
-    relationships_chart = viz.plot_comparison_heatmap(df_relationships, 'model_observation.ema',
-                                                      main_category='relationship_type', other_category='observer.name',
-                                                      heat_map_width=800, heat_map_height=300)
-    assert isinstance(relationships_chart, alt.VConcatChart)
-    assert len(relationships_chart.vconcat) == 2
-
-    df_observations = pd.DataFrame(OBSERVATIONS_DICT_EXAMPLE)
-    observations_chart = viz.plot_comparison_heatmap(df_observations, 'ema',
-                                                     main_category='musical_type', other_category='observer.name',
-                                                     heat_map_width=800, heat_map_height=300)
-    assert isinstance(observations_chart, alt.VConcatChart)
-    assert len(observations_chart.vconcat) == 2
+# def test_comparisons_heatmap():
+#     # pieces
+#     df_relationships = pd.DataFrame(RELATIONSHIPS_DICT_EXAMPLE)
+#     relationships_chart = viz.plot_comparison_heatmap(df_relationships, 'model_observation.ema',
+#                                                       main_category='relationship_type', other_category='observer.name',
+#                                                       heat_map_width=800, heat_map_height=300)
+#     assert isinstance(relationships_chart, alt.VConcatChart)
+#     assert len(relationships_chart.vconcat) == 2
+
+#     df_observations = pd.DataFrame(OBSERVATIONS_DICT_EXAMPLE)
+#     observations_chart = viz.plot_comparison_heatmap(df_observations, 'ema',
+#                                                      main_category='musical_type', other_category='observer.name',
+#                                                      heat_map_width=800, heat_map_height=300)
+#     assert isinstance(observations_chart, alt.VConcatChart)
+#     assert len(observations_chart.vconcat) == 2
 
 
 # TODO: review if this is still wanted and used. If not, remove it and see if ipywidgets can be removed as a dependency

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,6 +10,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
+python = ">=3.9"
 altair = "5.2.0"
 certifi = "2020.12.5"
 chardet = "4.0.0"
@@ -21,13 +22,13 @@ ipython = ">=7.23.1,<8.0"
 joblib = "1.0.1"
 jsonschema = ">=3.1"
 lxml = "5.1.0"
-matplotlib = "3.5.2"
+matplotlib = "^3.9.2"
 more-itertools = "8.7.0"
 music21 = "8.3.0"
 numpy = ">=1.20.2,<2.0.0"
 pandas = ">=2.2.0"
 statsmodels = "0.14.1"
-plotly = "5.18.0"
+plotly = "5.19.0"
 plotly-express = "0.4.1"
 pyarrow = ">=15.0.0"
 pyvis = "0.1.9"

diff --git a/tutorial/15_Network_Graphs.md b/tutorial/15_Network_Graphs.md
@@ -42,8 +42,12 @@ Here are the functions needed to create the networks with CRIM Intervals melodic
 
 <Summary>Get the Code</Summary
 
+#### 
+
 ```python
+
 # import libraries
+
 import pandas as pd
 import numpy as np
 import networkx as nx

diff --git a/tutorial/18_Visualizations_Summary.md b/tutorial/18_Visualizations_Summary.md
@@ -267,8 +267,6 @@ Here is a map for just one piece:
 # import piece
 url = 'https://crimproject.org/mei/CRIM_Model_0019.mei' 
 model = importScore(url)
-url = 'https://crimproject.org/mei/CRIM_Model_0019.mei' 
-model = importScore(url)
 
 # settings:
 combineUnisons = True