Merge pull request #1833 from cuthbertLab/random-2025-10

Random small changes in October

Author: mscuthbert

dist/dist.py

@@ -66,13 +66,13 @@
     then don't change anything until the next step is done.  Merge to main/master
     (.gitignore will avoid uploading the large files created here.)
 
-15. Switch back to master/main branch
+15. Switch back to master/main branch (or whatever main version we are releasing)
 
 16. Tag the commit: git tag -a vX.Y.Z -m "music21 vX.Y.Z"
     Don't forget the "v" in the release tag.
     Sanity check that the correct commit was tagged: git log
 
-17. Push tags: git push --tags  (or git push upstream --tags if not on main branch)
+17. Push tags: git push --tags
 
 18. Create a new release on GitHub (using the tag just created) and upload the
     non-wheel files created here and docs.

music21/test/testRunner.py

@@ -242,6 +242,8 @@ def testHello(self):
             if ('importPlusRelative' in testClasses
                     or 'importPlusRelative' in sys.argv
                     or bool(keywords.get('importPlusRelative', False))):
+                # allow things like volpiano.py's function "fromStream"
+                # to be called in doctests as "fromStream" and not just "volpiano.fromStream"
                 globs.update(inspect.stack()[1][0].f_globals)
 
         try:

music21/volpiano.py

@@ -20,7 +20,6 @@
 from __future__ import annotations
 
 import enum
-import unittest
 
 from music21 import bar
 from music21 import base
@@ -460,14 +459,8 @@ def setAccFromPitch(dist, setNatural=False):
     return ''.join(volpianoTokens)
 
 
-
-class Test(unittest.TestCase):
-    pass
-
-    def testNoteNames(self):
-        pass
-
-
 if __name__ == '__main__':
     import music21
-    music21.mainTest(Test, 'importPlusRelative')
+    # allow things like "fromStream" to be called in doctests as "fromStream"
+    # and not just "volpiano.fromStream"
+    music21.mainTest('importPlusRelative')