Merge pull request #1 from cuthbertLab/master

update changes from master

.coveragerc

@@ -7,10 +7,15 @@ omit =
 
 [report]
 exclude_lines =
+    if TYPE_CHECKING:
+    if t.TYPE_CHECKING:
     if __name__ == .__main__.:
     if debug:
     if self.debug:
     if self.show:
     def x_test
     def xtest
     pragma: no cover
+    class TestExternal(unittest.TestCase):
+    class TestSlow(unittest.TestCase):
+

.flake8

@@ -1,19 +1,33 @@
 [flake8]
 ignore=
-  E127,  # over indented
-  E128,  # under indented
-  E301,  # 0 blank lines -- good test but something going wrong in new algorithm
-  E302,  # blank lines
-  E303,  # blank lines
-  E501,  # let pylint check line length
-  E722,  # let pylint check bare except
-  E731,  # do not assign a lambda
-  F401,  # let pylint check for imported but unused (wildcards and exports trigger)
-  F405,  # __all__ is okay to get from wildcard.
-  F821,  # let pylint check for undefined (del at end of module makes undefined)
-  F841,  # let pylint check for unused
-  W391,  # extra blank lines at end of file
-  W503,  # line break BEFORE binary operator
+  # over indented
+  E127,
+  # under indented
+  E128,
+  # 0 blank lines -- good test but something going wrong in new algorithm
+  E301,
+  # blank lines
+  E302,
+  # blank lines
+  E303,
+  # let pylint check line length
+  E501,
+  # let pylint check bare except
+  E722,
+  # do not assign a lambda
+  E731,
+  # let pylint check for imported but unused (wildcards and exports trigger)
+  F401,
+  # __all__ is okay to get from wildcard.
+  F405,
+  # let pylint check for undefined (del at end of module makes undefined)
+  F821,
+  # let pylint check for unused
+  F841,
+  # extra blank lines at end of file
+  W391,
+  # line break BEFORE binary operator
+  W503,
 
 exclude=
   .git,
@@ -30,3 +44,7 @@ per-file-ignores =
   music21/search/__init__.py:F403
 
 max-line-length=100
+
+inline-quotes = single
+multiline-quotes = '''
+docstring-quotes = '''

.github/scripts/install_ubuntu_deps.sh

@@ -9,10 +9,6 @@ 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 -r requirements.txt
-pip3 install coveralls
-pip3 install scipy
-pip3 install python-Levenshtein
-pip3 install setuptools
-pip3 install coverage
+pip3 install wheel
+pip3 install -r requirements_dev.txt
 python3 -m compileall music21

.github/workflows/maincheck.yml

@@ -14,9 +14,9 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: [3.7, 3.8, 3.9, "3.10"]
+                python-version: ["3.10.6", "3.10", "3.11"]  # "3.10" must be in quotes to not have it eval to 3.1
         steps:
-        - uses: actions/setup-python@v2
+        - uses: actions/setup-python@v4
           with:
               python-version: ${{ matrix.python-version }}
         - uses: actions/checkout@v2
@@ -27,8 +27,69 @@ jobs:
         - name: Run Main Test script
           run: python -c 'from music21.test.testSingleCoreAll import ciMain as ci; ci()'
         - name: Coveralls
-          if: ${{ matrix.python-version == '3.7' }}
+          if: ${{ matrix.python-version == '3.10.6' }}
           env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               COVERALLS_SERVICE_NAME: github
           run: coveralls
+
+    lint:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v1
+            - name: Set up Python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: '3.10'
+                  cache: 'pip'
+            - 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: Install music21 in editable mode
+              run: |
+                  python -m pip install -e .
+            - name: Lint with pylint
+              run: |
+                  pylint -j0 music21
+                  pylint -j0 documentation
+
+    flake:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v1
+            - name: Set up Python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: '3.10'
+                  cache: 'pip'
+            - 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
+              run: |
+                  flake8 music21
+                  flake8 documentation
+
+    mypy:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v1
+            - name: Set up Python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: '3.10'
+                  cache: 'pip'
+            - name: Install dependencies
+              run: |
+                  pip install wheel
+                  python -m pip install -r requirements.txt
+                  python -m pip install -r requirements_dev.txt
+            - name: Type-check all modules with mypy
+              run: |
+                  mypy music21

.gitignore

@@ -21,6 +21,7 @@ __pycache__/
 
 # OSX
 .DS_Store
+**/.DS_Store
 
 # C extensions
 *.so
@@ -40,6 +41,8 @@ develop-eggs
 lib
 lib64
 __pycache__
+**/__pycache__
+venv
 
 # Installer logs
 pip-log.txt
@@ -93,3 +96,5 @@ music21/monkeytype.sqlite3
 .pytest_cache/v/cache/nodeids
 .pytest_cache/v/cache/lastfailed
 .pytest_cache/v/cache/nodeids
+.dmypy.json
+*.txt~