Skip to content

Commit 7842de3

Browse files
authored
Merge pull request #1817 from cuthbertLab/music21-v9.9
music21 v9.9
2 parents 73fbad0 + a53efb8 commit 7842de3

File tree

9 files changed

+35
-32
lines changed

9 files changed

+35
-32
lines changed

dist/dist.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
This takes a while and runs single core, and then almost always needs code patches
2727
so allocate time (2 min on M4). Start working on the announcement while it's running.
2828
29-
3029
4. run test/warningMultiprocessTest.py for lowest and highest Py version -- fix all warnings!
3130
5. run `from music21.test import treeYield
3231
and then run `treeYield.find_all_non_hashable_m21objects()` and check that the set returned is
@@ -38,24 +37,19 @@
3837
3938
7. run documentation/make.py clean (skip on minor version changes) -- you may need to make a
4039
documentation/build directory first.
41-
8. run documentation/make.py linkcheck [*] - missing http://www.musicxml.org/dtds/partwise.dtd
42-
and code-of-conduct links are both okay to fail. The points about
43-
"more than one target found for cross-reference 'Direction'"
44-
are known bugs in Sphinx (when the same named Enum appears in different modules)
45-
and we can't fix.
46-
StackOverflow seems also to be preventing linkcheck -- check manually every once in
47-
a while, but looking good May 2025.
48-
Ignore the errors at the end if everything looks good.
40+
8. run documentation/make.py linkcheck [*]
41+
some persistent errors that actually work are in the conf.py file under linkcheck_ignore
4942
9. run documentation/make.py [*]
5043
5144
[*] you will need sphinx, Jupyter (pip or easy_install), markdown, and pandoc (.dmg) installed
5245
5346
10. move music21 documentation/build/html to music21.org/music21docs/
54-
via Amazon S3 (contact MSAC for authentication if need be)
47+
via Amazon S3 (contact MSAC for authentication if need be) (MSAC has a program:
48+
combine_sync/deploy.py that will do this automatically.
5549
5650
11. zip up documentation/build/html and get ready to upload/delete it (you can put on your
5751
desktop or wherever you like).
58-
Rename to music21.v.9.5.0-docs.zip (skip for Alpha/Beta)
52+
Rename to music21-9.5.0-docs.zip (skip for Alpha/Beta)
5953
6054
12. From the music21 main folder (not subfolder) run "hatch build" --
6155
requires hatch to be installed "pip install hatch" -- brew version of hatch
@@ -64,7 +58,8 @@
6458
This builds the dist/music21-9.3.0.tar.gz and dist/music21-9.3.0-py3-none-any.whl
6559
files. That used to be what *this* script did, but now hatch does it better!
6660
67-
13. Run this (dist.py) file: it builds the no-corpus version of music21. (need Python 3.12 or higher)
61+
13. Run this (dist.py) file: it builds the no-corpus version of music21.
62+
(need Python 3.12 or higher)
6863
DO NOT RUN THIS ON A PC or the Mac .tar.gz might have an incorrect permission if you do.
6964
7065
14. PR and Commit to GitHub at this point w/ commit comment of the new version,

documentation/source/about/about.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ working on other music and technology projects, in particular:
7979
.. _David Huron: https://music.osu.edu/people/david-huron
8080
.. _Humdrum: https://www.humdrum.org
8181
.. _Michael Good: https://www.musicxml.com
82-
.. _Center for Computer-Assisted Research in the Humanities: http://www.ccarh.org/
82+
.. _Center for Computer-Assisted Research in the Humanities: https://www.ccarh.org/
8383

8484
Contributors
8585
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -146,7 +146,7 @@ to this project. Their contributions and generosity are greatly appreciated.
146146
.. _Laura E. Conrad: http://www.serpentpublications.org/drupal7/
147147
.. _MuseScore: https://musescore.com/
148148
.. _Bryen Travis: http://www.bachcentral.com/
149-
.. _Ewa Dahlig-Turek: http://www.esac-data.org
149+
.. _Ewa Dahlig-Turek: https://www.esac-data.org
150150
.. _Seymour Shlien: https://ifdo.ca/~seymour/runabc/esac/esacdatabase.html
151151
.. _Manuel Op de Coul: https://www.huygens-fokker.org/scala
152152
.. _John Chambers: http://trillian.mit.edu/~jc/music/book

documentation/source/about/applications.rst

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,55 @@ The following papers and publications make extensive use of `music21`. Start her
1616
Cuthbert, Michael Scott Cuthbert and Christopher Ariza. 2010. "`music21`: A
1717
Toolkit for Computer-Aided Musicology and Symbolic Music Data." In
1818
*Proceedings of the International Society for Music Information Retrieval*.
19-
https://www.academia.edu/243058/music21_A_Toolkit_for_Computer_Aided_Musicology_and_Symbolic_Music_Data
19+
https://www.trecento.com/research/Cuthbert_Ariza_Music21_ISMIR_2010.pdf
2020

2121

2222
Then continue with:
2323

2424
Church, Maura and Michael Scott Cuthbert. 2014. "Improving Rhythmic
2525
Transcriptions via Probability Models Applied Post-OMR." In *Proceedings of the
2626
International Society for Music Information Retrieval*.
27-
https://www.academia.edu/7709124/Improving_Rhythmic_Transcriptions_via_Probability_Models_Applied_Post_OMR
27+
https://www.trecento.com/research/Church_Cuthbert_OMR.pdf
2828

2929
Cuthbert, Michael Scott, Beth Hadley, Lars Johnson, and Christopher Reyes. 2012.
3030
"Interoperable Digital Musicology Research via `music21` Web Applications."
3131
From *Joint CLARIN-D/DARIAH Workshop at Digital Humanities Conference Hamburg*.
32-
https://www.academia.edu/1787946/Interoperable_Digital_Musicology_Research_via_music21_Web_Applications
32+
https://www.trecento.com/research/Cuthbert_Hadley_Johnson_Reyes_Music21_SOA.pdf
3333

3434
Cuthbert, Michael Scott, Chris Ariza, Jose Cabal-Ugaz, Beth Hadley, and Neena Parikh. 2011.
3535
"Hidden Beyond MIDI’s Reach:Feature Extraction and Machine Learning with Rich Symbolic Formats
3636
in `music21`" In *Proceedings of the Neural Information Processing Systems Conference*.
37-
https://www.academia.edu/1256513/Hidden_Beyond_MIDI_s_Reach_Feature_Extraction_and_Machine_Learning_with_Rich_Symbolic_Formats_in_music21
37+
https://www.trecento.com/research/Cuthbert_Ariza_Cabal-Ugaz_Hadley_Parikh-Hidden-NIPS2011.pdf
3838

3939
Cuthbert, Michael Scott, Chris Ariza, and Lisa D. Friedland. 2011. "Feature Extraction and
4040
Machine Learning on Symbolic Music using the `music21` Toolkit" In
4141
*Proceedings of the International Symposium on Music Information Retrieval*
42-
https://www.academia.edu/1256514/Feature_Extraction_and_Machine_Learning_on_Symbolic_Music_using_the_music21_Toolkit
42+
https://www.trecento.com/research/Cuthbert_Ariza_Friedland_Feature-Extraction_ISMIR_2011.pdf
4343

4444
Jordi Barthomé Guillen and Michael Scott Cuthbert. 2011. "Score Following from
4545
Inaccurate Score and Audio Data using OMR and `music21`." In *Proceedings of the Neural
4646
Information Processing Systems Conference (Music and Machine Learning, Workshop 4*.
47-
https://www.academia.edu/1256512/Score_Following_from_Inaccurate_Score_and_Audio_Data_using_OMR_and_music21
47+
https://www.trecento.com/research/Bartolome-Guillen_Cuthbert_ScoreFollower.pdf
4848

4949
Ariza, C. and Michael Scott Cuthbert. 2011. "The `music21` Stream: A New Object
5050
Model for Representing, Filtering, and Transforming Symbolic Musical
5151
Structures." In *Proceedings of the International Computer Music Conference*.
5252
San Francisco: International Computer Music Association, pp. 61-68.
5353
Available online at https://www.flexatone.net/static/docs/music21Stream.pdf
54+
and https://www.trecento.com/research/Ariza_Cuthbert_Stream_ICMC_2011.pdf
5455

5556
Ariza, C. and Michael Scott Cuthbert. 2011. "Analytical and Compositional
5657
Applications of a Network-Based Scale Model in `music21`." In *Proceedings of the
5758
International Computer Music Conference*. San Francisco: International Computer
5859
Music Association, pp. 701-708. Available online at
5960
https://www.flexatone.net/static/docs/scaleNetwork.pdf
61+
and https://www.trecento.com/research/Ariza_Cuthbert_Scale_ICMC_2011.pdf
6062

6163
Ariza, C. and Michael Scott Cuthbert. 2010. "Modeling Beats, Accents, Beams, and
6264
Time Signatures Hierarchically with `music21` Meter Objects." In *Proceedings of the
6365
International Computer Music Conference*. San Francisco: International Computer Music
6466
Association. 216-223. Available online at
65-
https://www.academia.edu/243059/Modeling_Beats_Accents_Beams_and_Time_Signatures_Hierarchically_with_music21_Meter_Objects
66-
67+
https://www.trecento.com/research/Ariza_Cuthbert_Meter_ICMC_2010.pdf
6768

6869
Future Goals and Potential Applications
6970
---------------------------------------------------
@@ -93,7 +94,3 @@ interesting suggestions. To contact the authors, visit :ref:`about`.
9394
- Identify potential clefs for fragmentary Renaissance and Medieval pieces that are
9495
missing their clefs. (Use their staff-lines and minimizing number of melodic and
9596
harmonic tritones).
96-
97-
98-
99-

documentation/source/conf.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,18 @@
236236
# latex_domain_indices = True
237237

238238

239+
# -- Options for linkcheck -----------------------------------------------------
240+
# requires downloading whole document, but also many anchors only load after
241+
# javascript these days.
242+
linkcheck_anchors = False
243+
244+
linkcheck_ignore = [
245+
r'http://www.musicxml.org/dtds/partwise.dtd', # dtd is not a URL.
246+
r'https://easyabc.sourceforge.net', # works 2025-10
247+
# does not find anchor immediately. should wait longer
248+
r'https://github.com/cuthbertLab/music21/blob/master/README.md#community-code-of-conduct',
249+
]
250+
239251
# -- Options for manual page output --------------------------------------------
240252

241253
# One entry per manual page. List of tuples

music21/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
'''
5151
from __future__ import annotations
5252

53-
__version__ = '9.7.2a4'
53+
__version__ = '9.9.0'
5454

5555
def get_version_tuple(vv):
5656
v = vv.split('.')

music21/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<class 'music21.base.Music21Object'>
2828
2929
>>> music21.VERSION_STR
30-
'9.7.2a4'
30+
'9.9.0'
3131
3232
Alternatively, after doing a complete import, these classes are available
3333
under the module "base":
2.41 KB
Binary file not shown.

music21/corpus/essenFolksong/license.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Name: corpus/essenFolksong/license.txt
33
# Purpose: The music21 creators assume no copyright or change in licensing
44
# for content distributed in the corpus.
5-
#
65
#-------------------------------------------------------------------------------
76

87
The legal status of the Essen folksong database is unclear, as the data has been input by many people.
@@ -13,7 +12,7 @@ The project was taken over by Prof. AMU Dr. Habil. Ewa Dahlig-Turek, who has giv
1312
for non-commercial distribution and use of these files in music21.
1413

1514
Information on the original EsAC encodings can be found here:
16-
http://www.esac-data.org
15+
https://www.esac-data.org
1716

1817
The files distributed with music21 are ABC encodings, created by Seymour Schlien, and
1918
distributed with music21 by his permission.

music21/musedata/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
environLocal = environment.Environment('musedata')
4545

4646
# for implementation
47-
# see http://www.ccarh.org/publications/books/beyondmidi/online/musedata/
48-
# and http://www.ccarh.org/publications/books/beyondmidi/online/musedata/record-organization/
47+
# see https://www.ccarh.org/publications/books/beyondmidi/online/musedata/
48+
# and https://www.ccarh.org/publications/books/beyondmidi/online/musedata/record-organization/
4949

5050

5151
# ------------------------------------------------------------------------------

0 commit comments

Comments
 (0)