Merge branch 'master' into gregc/pendingSpannerAssignmentWithOffset

Author: mscuthbert

.flake8

@@ -9,6 +9,4 @@ sudo apt-get install -y libpng-dev
 wget -q https://lilypond.org/download/binaries/linux-64/lilypond-2.22.1-1.linux-64.sh
 sh lilypond-2.22.1-1.linux-64.sh --batch
 export PATH=/home/runner/bin:$PATH
-pip3 install wheel
-pip3 install -r requirements_dev.txt
 python3 -m compileall music21

.github/scripts/install_ubuntu_deps.sh

@@ -14,12 +14,21 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.10", "3.11", "3.12", "3.13"]  # "3.10" must be in quotes to not have it eval to 3.1
+                python-version: [3.11, 3.12, 3.13, 3.14]
         steps:
+        - uses: actions/checkout@v4
         - uses: actions/setup-python@v4
           with:
               python-version: ${{ matrix.python-version }}
-        - uses: actions/checkout@v2
+        - name: Install uv
+          uses: astral-sh/setup-uv@v7
+          with:
+              enable-cache: true
+              cache-dependency-glob: |
+                  pyproject.toml
+        - name: Install dependencies
+          run: |
+              uv pip install --system -e '.[dev]'
         - name: Install Ubuntu dependencies
           run: ./.github/scripts/install_ubuntu_deps.sh
         - name: Setup Lilypond
@@ -36,60 +45,70 @@ jobs:
     lint:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: '3.11'
+                  python-version: '3.14'
                   cache: 'pip'
+            - name: Install uv
+              uses: astral-sh/setup-uv@v7
+              with:
+                  enable-cache: true
+                  cache-dependency-glob: |
+                      pyproject.toml
             - name: Install dependencies
               run: |
-                  python -m pip install --upgrade pip
-                  pip install wheel
-                  pip install -r requirements.txt
-                  pip install -r requirements_dev.txt
+                  uv pip install --system -e '.[dev]'
             - name: Install music21 in editable mode
               run: |
-                  python -m pip install -e .
+                  uv pip install --system -e .
             - name: Lint with pylint
               run: |
-                  pylint -j0 music21
-                  pylint -j0 documentation
+                  uv run pylint -j0 music21
+                  uv run pylint -j0 documentation
 
-    flake:
+    ruff:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: '3.11'
+                  python-version: '3.14'
                   cache: 'pip'
+            - name: Install uv
+              uses: astral-sh/setup-uv@v7
+              with:
+                  enable-cache: true
+                  cache-dependency-glob: |
+                      pyproject.toml
             - name: Install dependencies
               run: |
-                  python -m pip install --upgrade pip
-                  pip install wheel
-                  pip install -r requirements.txt
-                  pip install -r requirements_dev.txt
-            - name: PEP8 with flake8
+                  uv pip install --system -e '.[dev]'
+            - name: Code-style etc. with Ruff
               run: |
-                  flake8 music21
-                  flake8 documentation
+                  uv run ruff check music21
+                  uv run ruff check documentation
 
     mypy:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: '3.11'
+                  python-version: '3.14'
                   cache: 'pip'
+            - name: Install uv
+              uses: astral-sh/setup-uv@v7
+              with:
+                  enable-cache: true
+                  cache-dependency-glob: |
+                      pyproject.toml
             - name: Install dependencies
               run: |
-                  pip install wheel
-                  python -m pip install -r requirements.txt
-                  python -m pip install -r requirements_dev.txt
+                  uv pip install --system -e '.[dev]'
             - name: Type-check all modules with mypy
               run: |
-                  mypy music21
+                  uv run mypy music21

.github/workflows/maincheck.yml

@@ -6,6 +6,9 @@ __pycache__/
 .mypy_cache/**
 **/.mypy_cache/**
 
+# we are a library, don't lock the requirements
+uv.lock
+
 # PyCharm
 # Keep some to help new users...
 .idea/codeStyles

.gitignore

@@ -290,7 +290,7 @@ init-import=no
 
 # A regular expression matching the name of dummy variables (i.e. expectedly
 # not used).
-dummy-variables-rgx=_$|dummy|unused|i$|j$|junk|counter
+dummy-variables-rgx=_|dummy|unused|i$|j$|junk|counter
 
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.

.pylintrc

@@ -3,7 +3,7 @@
 `music21` -- A Toolkit for Computer-Aided Musical Analysis and 
 Computational Musicology
 
-Copyright © 2006-2025 [Michael Scott Asato Cuthbert](http://www.trecento.com)
+Copyright © 2006-2026 [Michael Scott Asato Cuthbert](http://www.trecento.com)
 
 For more information, visit:
 https://www.music21.org/music21docs/
@@ -14,8 +14,8 @@ https://tinyurl.com/m21colab (runs music21 v7)
 And to install, see:
 https://www.music21.org/music21docs/usersGuide/usersGuide_01_installing.html
 
-`Music21` runs on Python 3.10+.  (Use version 4 on Python 2 or Py3.4, version 5
-on Py3.5, version 6 on Py3.6, version 7 on Py3.7, version 8 on Py3.8/Py3.9)
+`Music21` runs on Python 3.11+.  (Use music21 version 4 on Python 2 or Py3.4, v5
+on Py3.5, v6 on Py3.6, v7 on Py3.7, v8 on Py3.8/Py3.9, and v9 on Py3.10)
 
 Released under the BSD (3-clause) license. See LICENSE.
 Externally provided software (including the MIT-licensed Lilypond/MusicXML test Suite) and

.readthedocs.yaml

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 # Name:         dist.py
 # Purpose:      Distribution and uploading script
@@ -26,7 +25,6 @@
 This takes a while and runs single core, and then almost always needs code patches
 so allocate time (2 min on M4).  Start working on the announcement while it's running.
 
-
 4. run test/warningMultiprocessTest.py for lowest and highest Py version -- fix all warnings!
 5. run `from music21.test import treeYield
     and then run `treeYield.find_all_non_hashable_m21objects()` and check that the set returned is
@@ -38,24 +36,19 @@
 
 7. run documentation/make.py clean  (skip on minor version changes) -- you may need to make a
      documentation/build directory first.
-8. run documentation/make.py linkcheck  [*] - missing http://www.musicxml.org/dtds/partwise.dtd
-     and code-of-conduct links are both okay to fail.  The points about
-     "more than one target found for cross-reference 'Direction'"
-     are known bugs in Sphinx (when the same named Enum appears in different modules)
-     and we can't fix.
-     StackOverflow seems also to be preventing linkcheck -- check manually every once in
-     a while, but looking good May 2025.
-     Ignore the errors at the end if everything looks good.
+8. run documentation/make.py linkcheck  [*]
+     some persistent errors that actually work are in the conf.py file under linkcheck_ignore
 9. run documentation/make.py   [*]
 
 [*] you will need sphinx, Jupyter (pip or easy_install), markdown, and pandoc (.dmg) installed
 
 10. move music21 documentation/build/html to music21.org/music21docs/
-    via Amazon S3 (contact MSAC for authentication if need be)
+    via Amazon S3 (contact MSAC for authentication if need be) (MSAC has a program:
+    combine_sync/deploy.py that will do this automatically.
 
 11. zip up documentation/build/html and get ready to upload/delete it (you can put on your
     desktop or wherever you like).
-    Rename to music21.v.9.5.0-docs.zip (skip for Alpha/Beta)
+    Rename to music21-9.5.0-docs.zip (skip for Alpha/Beta)
 
 12. From the music21 main folder (not subfolder) run "hatch build" --
     requires hatch to be installed "pip install hatch" -- brew version of hatch
@@ -64,20 +57,21 @@
     This builds the dist/music21-9.3.0.tar.gz and dist/music21-9.3.0-py3-none-any.whl
     files.  That used to be what *this* script did, but now hatch does it better!
 
-13. Run this (dist.py) file: it builds the no-corpus version of music21.  (need Python 3.12 or higher)
+13. Run this (dist.py) file: it builds the no-corpus version of music21.
+    (need Python 3.12 or higher)
     DO NOT RUN THIS ON A PC or the Mac .tar.gz might have an incorrect permission if you do.
 
 14. PR and Commit to GitHub at this point w/ commit comment of the new version,
     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.

README.md

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 __all__ = ['documenters', 'iterators', 'writers']
 
 from . import documenters

dist/dist.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 # Name:         documentation/library/documenters.py
 # Purpose:      music21 documentation helper classes for proper formatting
 #
-# Authors:      Josiah Wolf Oberholtzer
+# Authors:      Joséphine Wolf Oberholtzer
 #               Christopher Ariza
 #               Michael Scott Asato Cuthbert
 #
@@ -539,8 +538,11 @@ def _formatInheritedMembersMapping(self, mapping, banner):
         for classDocumenter in self.baseClassDocumenters:
             if classDocumenter not in mapping:
                 continue
-            result.append(banner.format(
-                classDocumenter.rstCrossReferenceString))
+            result.append(
+                banner.format(
+                    classDocumenter.rstCrossReferenceString
+                )
+            )
             result.append('')
             memberDocumenters = mapping[classDocumenter]
             result.append('.. hlist::')
@@ -758,10 +760,9 @@ def inheritedReadwritePropertiesMapping(self):
         >>> mapping = documenter.inheritedReadwritePropertiesMapping
         >>> sortBy = lambda x: x.referentPackageSystemPath
         >>> for classDocumenter in sorted(mapping, key=sortBy):
-        ...     print('{0}:'.format(classDocumenter.referentPackageSystemPath))
+        ...     print(f'{classDocumenter.referentPackageSystemPath}:')
         ...     for attributeDocumenter in mapping[classDocumenter][:10]:
-        ...         print('- {0}'.format(attributeDocumenter.referentPackageSystemPath))
-        ...
+        ...         print(f'- {attributeDocumenter.referentPackageSystemPath}')
         music21.base.Music21Object:
         - music21.base.Music21Object.activeSite
         - music21.base.Music21Object.derivation
@@ -941,13 +942,10 @@ def rstInheritedDocAttrFormat(self):
                 result.append('.. hlist::')
                 result.append('   :columns: 3')
                 result.append('')
-                formatString = '   - :attr:`~{0}.{1}`'
+                basePath = baseDocumenter.referentPackageSystemPath
                 for attrName in attrNames:
                     result.append(
-                        formatString.format(
-                            baseDocumenter.referentPackageSystemPath,
-                            attrName,
-                        )
+                        f'   - :attr:`~{basePath}.{attrName}`'
                     )
                 result.append('')
         return result
@@ -1595,14 +1593,15 @@ def getRstComposerWorksFormat(self, corpusWork):
 
     # def getRstVirtualWorkFileDictFormat(self, corpusFile):
     #     result = []
-    #     result.append('- {0} *({1})*: `{2}`'.format(
-    #         str(corpusFile.title),
-    #         str(corpusFile.format),
-    #         str(corpusFile.path),
-    #         ))
+    #     result.append(
+    #         f'- {corpusFile.title} '
+    #         f'*({corpusFile.format})*: '
+    #         f'`{corpusFile.path}`'
+    #     )
     #     result.append('')
-    #     result.append('  Source: {0}'.format(
-    #         str(corpusFile.url)))
+    #     result.append(
+    #         f'  Source: {corpusFile.url}'
+    #     )
     #     result.append('')
     #     return result