Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update changes from master #1

Merged
merged 1,146 commits into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1146 commits
Select commit Hold shift + click to select a range
beb9a33
Merge branch 'master' into gregc/ottavaTransposeFix
gregchapman-dev Jan 20, 2023
d0c0d53
Get rid of inheritAccidentalDisplay options, and just fix the bug whe…
gregchapman-dev Jan 20, 2023
c472631
NOTE: tie.style is a string -- change!
mscuthbert Jan 21, 2023
ad52399
Clean up accidental display inheritance in Interval._diatonicTranspos…
gregchapman-dev Jan 27, 2023
5b024e8
Make displayStatus inheritance an option in Interval._diatonicTranspo…
gregchapman-dev Jan 27, 2023
c38dedd
Set treatAsKeySignature (which means it's safe to inherit accidental …
gregchapman-dev Jan 27, 2023
d64a7be
Rename fillIntermediateSpannerElements -> fill. Default behavior for…
gregchapman-dev Jan 27, 2023
6ede867
Rework Ottava handling in XmlToM21.py for speed and readability.
gregchapman-dev Jan 27, 2023
0bf2263
Allow Spanner.fill to be called with searchStream=None; use startElem…
gregchapman-dev Jan 27, 2023
9495eb1
Improve Spanner fill algorithm (spanner.py) as well as SpannerAnchor …
gregchapman-dev Jan 28, 2023
e49f71d
Add clarifying comments
jacobtylerwalls Jan 29, 2023
98357ec
Merge branch 'master' into hammer
jacobtylerwalls Jan 29, 2023
4a0d0ea
Port over unit test changes
jacobtylerwalls Jan 29, 2023
8054bb9
Add another clarifying comment
jacobtylerwalls Jan 29, 2023
7f63e7a
Move stripInnerSpaces to top of test_m21ToXml.py module.
gregchapman-dev Jan 29, 2023
49d3e56
SpannerAnchor fixes: allow duration != 0, implement _reprInternal, im…
gregchapman-dev Jan 29, 2023
e464afa
Add v9 comment (and bump version twice to get past my failed attempt …
gregchapman-dev Jan 29, 2023
6aea4d7
Make toSoundingPitch test a bit more meaningful when s.atSoundingPitc…
gregchapman-dev Jan 29, 2023
908159d
Don't import stream within Stream class. More doc/test tweaks.
gregchapman-dev Jan 29, 2023
75cf322
If necessary jump to end of measure after emitting spanners in a seco…
gregchapman-dev Jan 29, 2023
58cd39d
Add tests for moveForward and moveBackward in m21ToXml.py.
gregchapman-dev Jan 29, 2023
4e7ae9d
New subconverters register above default
mscuthbert Jan 30, 2023
2e2bee4
Tiny change to make .accidental
mscuthbert Jan 30, 2023
ef1d98e
fake the second parse
mscuthbert Jan 30, 2023
829cdf0
change in exceptions
mscuthbert Jan 30, 2023
b474fd4
Merge pull request #1520 from cuthbertLab/register_subconverters
mscuthbert Jan 30, 2023
9afb3bc
Merge pull request #1521 from cuthbertLab/faster-accidental-from-int
mscuthbert Jan 30, 2023
dcffa39
flake 1
mscuthbert Jan 30, 2023
7454e3a
fix quotes, strengthen test
mscuthbert Jan 30, 2023
c1a76d9
Merge branch 'master' into TimeSig__eq__
MarkGotham Jan 30, 2023
a87a0b1
Remove the much-discussed placeholder
MarkGotham Jan 30, 2023
fd7fb82
return one of pre-existing "Work in progress" tests to commented out
MarkGotham Jan 30, 2023
f02af54
doc tests: clarify & include complementary `ratioEqual` case
MarkGotham Jan 30, 2023
f80e684
Merge branch 'master' into gregc/spannerAnchor
gregchapman-dev Jan 30, 2023
3c75f33
Bring spannerAnchor fixes over from gregc/ottavaTransposeFix branch.
gregchapman-dev Jan 30, 2023
ffc97c3
Added a few tests for Spanner.fill (more to come) and found a bug.
gregchapman-dev Jan 30, 2023
6c95326
Spanner.fill doctest tweaks.
gregchapman-dev Jan 30, 2023
3be7d72
One little lint.
mscuthbert Jan 30, 2023
c3958a0
Remove duplicated line, update comment
mscuthbert Jan 30, 2023
05fb2d8
Merge pull request #1490 from rigaux/master
mscuthbert Jan 30, 2023
cbb0d7a
Merge pull request #1479 from gregchapman-dev/gregc/spannerAnchor
mscuthbert Jan 30, 2023
4141a06
Merge branch 'master' into pr/1486
mscuthbert Jan 30, 2023
ed21c88
Merge branch 'master' into gregc/ottavaTransposeFix
mscuthbert Jan 30, 2023
937aec9
More SpannerAnchor tests.
gregchapman-dev Jan 30, 2023
1e9f099
pylint/flake8
gregchapman-dev Jan 30, 2023
4f9d0d2
Get rid of treatAsKeyChange, and instead, in _transposeByInstrument s…
gregchapman-dev Jan 30, 2023
d072f0b
Be pickier in Interval._diatonicTransposeFix when deciding if an Inte…
gregchapman-dev Jan 31, 2023
012a728
pylint
gregchapman-dev Jan 31, 2023
cfa4987
A better fix for unison/octave detection.
gregchapman-dev Jan 31, 2023
6854ce8
Test more code paths in Spanner.fill().
gregchapman-dev Jan 31, 2023
a52bc13
Actually test that accid.displayStatus is maintained across _transpos…
gregchapman-dev Jan 31, 2023
9468436
Some testing of MusicXML import and then tranposition of <octave-shif…
gregchapman-dev Jan 31, 2023
a8ba6e4
Merge pull request #1457 from MarkGotham/TimeSig__eq__
mscuthbert Feb 1, 2023
61166b1
More review responses.
gregchapman-dev Feb 3, 2023
802fe9d
Update to pylint-2.16
mscuthbert Feb 6, 2023
a086e93
Merge pull request #1522 from cuthbertLab/pylint-2.16
mscuthbert Feb 6, 2023
bec260b
Merge pull request #1142 from louisbigo/hammer
mscuthbert Feb 6, 2023
986bdda
Don't name the check I need to do; just do the check.
gregchapman-dev Feb 7, 2023
8ce3265
Observe updatePitches=False when bass or root provided
jacobtylerwalls Feb 18, 2023
53b93e1
Update doctest result for matplotlib repr change
jacobtylerwalls Feb 18, 2023
db7e773
Merge pull request #1527 from cuthbertLab/update-pitches-false
mscuthbert Feb 18, 2023
4ff60a8
RomanText: allow Note fields with anacrusis
mscuthbert Feb 22, 2023
f04ace2
Merge pull request #1532 from cuthbertLab/fix_rt_notes
mscuthbert Feb 22, 2023
498a2a9
Merge branch 'master' into gregc/ottavaTransposeFix
gregchapman-dev Feb 24, 2023
b143a73
Add support for delayed turns (and delayed inverted turns).
gregchapman-dev Feb 24, 2023
c8653e4
Merge pull request #1486 from gregchapman-dev/gregc/ottavaTransposeFix
mscuthbert Feb 25, 2023
9412a1f
Some review feedback.
gregchapman-dev Feb 25, 2023
364cfd8
Merge branch 'master' into gregc/delayedTurns
gregchapman-dev Feb 25, 2023
1e3d65c
We do stretch "short" turns to fit the original note, by stretching t…
gregchapman-dev Feb 25, 2023
aacc7aa
Merge pull request #1533 from gregchapman-dev/gregc/delayedTurns
mscuthbert Feb 27, 2023
fe306c2
Add utility for removing duplicated objects (e.g. keys, clefs) (#1454)
MarkGotham Mar 17, 2023
dc812a4
First attempt at adding accidentals to Turns, Trills, and Mordents.
gregchapman-dev Mar 22, 2023
582a367
Add the ability to set size for Mordent/Trill, but only if the Morden…
gregchapman-dev Mar 22, 2023
90f38cf
Fix interval calculation.
gregchapman-dev Mar 22, 2023
ea8d3e8
Fix some bugs to get tests passing.
gregchapman-dev Mar 22, 2023
5114ede
Enhance Trill/Mordent/Turn name to include any accidental(s).
gregchapman-dev Mar 23, 2023
2e92bfb
Mordent/Turn/Trill.get{Upper,Lower,}Size now takes pitch instead of n…
gregchapman-dev Mar 24, 2023
98533df
Minimize gaps produced by quantization algorithm
jacobtylerwalls Mar 25, 2023
57b5f01
Write ornament accidentals as <accidental-mark> in m21ToXml.py.
gregchapman-dev Mar 25, 2023
52a3280
Get rid of accidental-mark TODOs. They're done.
gregchapman-dev Mar 25, 2023
f64ea43
fixup! Minimize
jacobtylerwalls Mar 25, 2023
6f75a9b
Be a little more accurate about what has been done with accidental-mark.
gregchapman-dev Mar 25, 2023
835910c
Fix notations32a.xml "turn+acc.(ab.+bel./rel to turn)", which had bot…
gregchapman-dev Mar 25, 2023
1c88d57
Fix some tests.
gregchapman-dev Mar 25, 2023
517f046
fixup! Minimize
jacobtylerwalls Mar 25, 2023
fe5186a
fixup! Minimize
jacobtylerwalls Mar 26, 2023
d4ebe55
Add regression test for insert(ignoreSort=True)
jacobtylerwalls Mar 26, 2023
a7135d3
fixup! Add regression test
jacobtylerwalls Mar 26, 2023
1ea8840
fixup! Minimize
jacobtylerwalls Mar 26, 2023
c634196
Remove Expander._srcNotMeasureStream
jacobtylerwalls Mar 26, 2023
f558b8e
Allow accid to be set (not just __init__ed), but only if size has not…
gregchapman-dev Mar 26, 2023
0def6e3
Make the turn accidentals in notation32a be ones that Finale can actu…
gregchapman-dev Mar 26, 2023
b83121b
Parse 'accidental-mark' (Ornament) from MusicXML.
gregchapman-dev Mar 26, 2023
88333d5
Test turn accidentals (upper and lower).
gregchapman-dev Mar 26, 2023
256d013
mypy notes that I was setting accid on ornaments that didn't have 'em.
gregchapman-dev Mar 26, 2023
a16c2d5
Redo ornament accidentals to use accidental names, and then resolveOt…
gregchapman-dev Mar 28, 2023
e76f405
Oops, missed one.
gregchapman-dev Mar 28, 2023
f519b9d
Modify makeAccidentals to deal with ornament accidentals.
gregchapman-dev Mar 28, 2023
333721f
Fix a crash in Stream.pitches when a GeneralNote has no pitches (e.g.…
gregchapman-dev Mar 28, 2023
75420e1
Merge pull request #1542 from cuthbertLab/micro-optimize-expander
mscuthbert Mar 29, 2023
81b2bd5
Implement useful `PercussionChord.pitches` property
jacobtylerwalls Mar 29, 2023
e45753d
Merge pull request #1547 from cuthbertLab/percussion-chord-pitches-prop
mscuthbert Mar 30, 2023
37763c4
Ignore Unpitched objects in key analysis (#1543)
jacobtylerwalls Mar 30, 2023
e9274e9
fix opfrac for small numbers
mscuthbert Mar 30, 2023
4ad73d0
buggy
mscuthbert Mar 30, 2023
187a2dc
deal with 1.49999999; typing
mscuthbert Mar 30, 2023
f6242a0
fix uncovered error
mscuthbert Mar 30, 2023
9011556
minor docs fixes to coreInsert
mscuthbert Mar 30, 2023
f00e741
First swath of review response.
gregchapman-dev Mar 30, 2023
f738377
Remove Trill/GeneralMordent/Turn size property. Clients now have to …
gregchapman-dev Mar 30, 2023
1d87d2d
Oops, fix that test.
gregchapman-dev Mar 30, 2023
9536d10
Merge pull request #1549 from cuthbertLab/core-insert-docs
mscuthbert Mar 30, 2023
f05ec0a
Merge pull request #1548 from cuthbertLab/small-opfrac
mscuthbert Mar 30, 2023
59e02d5
Placate flake8.
gregchapman-dev Mar 30, 2023
3283c3f
Refine headerdoc a bit. Put three-quarters-flat back as accidental b…
gregchapman-dev Mar 30, 2023
4cae3c2
Even more headerdoc/tests.
gregchapman-dev Mar 30, 2023
53263a5
A few style tweaks and a bunch of headerdoc.
gregchapman-dev Mar 31, 2023
e90ae4f
Turns out you really need an explit octave before you transpose, or y…
gregchapman-dev Mar 31, 2023
053d933
Implement InvertedTrill, simplify InvertedTurn, fix TrillRecognizer t…
gregchapman-dev Mar 31, 2023
3414cc2
Oops typo.
gregchapman-dev Mar 31, 2023
7851f48
I missed some implicit octave transposes.
gregchapman-dev Apr 1, 2023
0150cc4
Add some more tests.
gregchapman-dev Apr 1, 2023
7997ce6
Fix a couple tests.
gregchapman-dev Apr 1, 2023
44450c4
Revert changes to insert() in favor of explicit sort in test
jacobtylerwalls Apr 1, 2023
65692c8
Remove test relating to insert(ignoreSort=True)
jacobtylerwalls Apr 1, 2023
b9a1494
Implement Trill/Mordent/Turn on Unpitched. More tests/fixes.
gregchapman-dev Apr 1, 2023
cf27d2b
Test some edge conditions.
gregchapman-dev Apr 2, 2023
b0ab490
Add tests for Trill/GeneralMordent/Turn.updateAccidentalDisplay.
gregchapman-dev Apr 2, 2023
08fd681
When setting pitch.accidental to a float, do your best to put the qua…
gregchapman-dev Apr 2, 2023
edfba3b
Be consistent about _direction typing.
gregchapman-dev Apr 2, 2023
bcc3808
Test and fix ornament <accidental-mark> parse and write.
gregchapman-dev Apr 2, 2023
a9de789
Fix pitch.py test expectations to match new quarter-tone preference o…
gregchapman-dev Apr 2, 2023
8ed3beb
Do the "microtones to quarter tones" operation in Ornament et al, ins…
gregchapman-dev Apr 8, 2023
3308ee4
Remove "microtones to quarter tones" operation from pitch.accidental …
gregchapman-dev Apr 8, 2023
19c91f4
Address a few review comments.
gregchapman-dev Apr 8, 2023
b23eba0
Undo my workaround for issue #1553 (transpose can lose microtones), a…
gregchapman-dev Apr 9, 2023
c7965bf
And test that fix.
gregchapman-dev Apr 9, 2023
367e9ab
A little more testing.
gregchapman-dev Apr 10, 2023
77af85e
{Trill,GeneralMordent}.accidentName -> accidental (with displayStatus…
gregchapman-dev Apr 15, 2023
40f89f7
Improvements to the documentation.
gregchapman-dev Apr 17, 2023
4d321cf
More review response.
gregchapman-dev Apr 18, 2023
a401969
Fix a typo, make mypy happier.
gregchapman-dev Apr 18, 2023
d82183f
Fix test to not use back-tick for half-flat.
gregchapman-dev Apr 18, 2023
6c3da7c
Move two new routines from stream/base.py to stream/makeNotation.py.
gregchapman-dev Apr 18, 2023
9678517
Add documentation for makeOrnamentalAccidentals.
gregchapman-dev Apr 18, 2023
2526b68
Merge pull request #1545 from gregchapman-dev/gregc/ornamentAccidentals
mscuthbert Apr 19, 2023
3c4b95b
Update layout docs
mscuthbert Apr 21, 2023
1573e37
Merge pull request #1554 from cuthbertLab/update_layout_docs
mscuthbert Apr 21, 2023
b2af34b
Fix stripTies when accidentals are neutral & none
TimFelixBeyer Apr 30, 2023
5c232c9
Merge branch 'master' into quantization-improvements
mscuthbert May 1, 2023
0206700
No need to sort all if just getting the minimum
mscuthbert May 1, 2023
18b750f
rem unused heapq
mscuthbert May 1, 2023
df97c67
trailing whitespace (editing on github, bad idea)
mscuthbert May 1, 2023
696545a
Merge pull request #1540 from jacobtylerwalls/quantization-improvements
mscuthbert May 1, 2023
9c67043
Improve measure numbers on ClercqTemperley
mscuthbert May 7, 2023
0d3386b
lint, docs improve, formalDivision editorial
mscuthbert May 7, 2023
6973483
mypy
mscuthbert May 7, 2023
6d83988
test issue
mscuthbert May 7, 2023
83696c5
make sections more testable
mscuthbert May 7, 2023
42534a3
Merge pull request #1558 from cuthbertLab/ct_measure_numbers
mscuthbert May 8, 2023
dd4f03f
fix jupyter/colab MIDI
mscuthbert May 11, 2023
8d5cce8
Merge pull request #1565 from cuthbertLab/modernm21j
mscuthbert May 11, 2023
8dbf9ed
Avoid altering score on write
TimFelixBeyer May 9, 2023
067dc62
Skip extra deepcopy for flat Part
mscuthbert May 9, 2023
8a8c167
Add regression test
jacobtylerwalls May 11, 2023
e4a294c
Add `requests` to minimum requirements
jacobtylerwalls May 11, 2023
9f1cf26
Fix reading unknown MetaMessage
TimFelixBeyer May 14, 2023
d6303db
Fix event parsing
TimFelixBeyer May 14, 2023
851c776
Remove byte order mark from corpus.virtual
jacobtylerwalls May 14, 2023
8e29ff4
Don't set status byte on Meta Message
TimFelixBeyer May 15, 2023
e36a014
Merge branch 'cuthbertLab:master' into master
TimFelixBeyer May 15, 2023
0f9d6cc
Merge pull request #1569 from cuthbertLab/bom
mscuthbert May 15, 2023
820efd9
Prevent doubly-flatted sevenths in chord symbols
jacobtylerwalls May 15, 2023
0911ff1
Update octave in expected result
jacobtylerwalls May 15, 2023
892bd30
Fix MIDI parsing with unknown meta message
TimFelixBeyer May 15, 2023
54b2753
Merge pull request #1572 from cuthbertLab/doubly-flatted-chord-symbol
mscuthbert May 16, 2023
c20a4cd
Merge pull request #1573 from TimFelixBeyer/patch-2
mscuthbert May 16, 2023
2cc61a4
Simplify to elif
TimFelixBeyer May 16, 2023
3f1af1f
Increase default MIDI ticksPerQuarter
TimFelixBeyer May 17, 2023
9bab45f
Update tests
TimFelixBeyer May 17, 2023
05548b0
ticksAtStart = ticksPerQuarter
mscuthbert May 17, 2023
6201cf0
Merge pull request #1577 from TimFelixBeyer/patch-6
mscuthbert May 17, 2023
acf926c
Merge pull request #1575 from TimFelixBeyer/patch-4
mscuthbert May 18, 2023
1cccdf5
make matchByPitch handle None/natural accidental
TimFelixBeyer May 21, 2023
868136a
fix linting
TimFelixBeyer May 21, 2023
3b17a68
Add MusicXML sound tag tempo parsing
TimFelixBeyer May 21, 2023
e8db15d
Add and fix tests, increment version number
TimFelixBeyer May 21, 2023
c1d166f
fix pylint
TimFelixBeyer May 21, 2023
2f6833a
Merge pull request #1556 from TimFelixBeyer/master
mscuthbert May 27, 2023
013bdc3
Add typing and docs
TimFelixBeyer May 27, 2023
41bf5dd
Fix typing
TimFelixBeyer May 27, 2023
46ee5dc
Fix failing braille tests
TimFelixBeyer May 27, 2023
18fdfd6
Fix further tests and typing
TimFelixBeyer May 27, 2023
e25334b
Merge pull request #1579 from TimFelixBeyer/patch-8
mscuthbert May 27, 2023
ffacccf
Simpler pitch comparisons, typing
mscuthbert May 27, 2023
c56dd47
Merge branch 'master' into pitchEquiv
mscuthbert May 27, 2023
8ebea2e
cleanup typing on spanner
mscuthbert May 27, 2023
bddd31a
Merge pull request #1582 from cuthbertLab/pitchEquiv
mscuthbert May 27, 2023
bcb87e8
Add MusicXML security warning
mscuthbert May 31, 2023
a6b6ad4
Update info for linux/additional components
mscuthbert Jun 1, 2023
fd07402
fix doctest
mscuthbert Jun 1, 2023
2dd2fa6
Merge pull request #1586 from cuthbertLab/additional_linux_docs
mscuthbert Jun 1, 2023
2ca1f13
Merge pull request #1584 from cuthbertLab/musicxml-security-warning
mscuthbert Jun 1, 2023
878e0de
Set ABC version from %%abc-version directive
mscuthbert Jun 2, 2023
e40fa08
more tests
mscuthbert Jun 3, 2023
bb5a579
mid-fix
mscuthbert Jun 3, 2023
7558873
better typing and version fixes
mscuthbert Jun 3, 2023
80c32c9
Merge branch 'master' into file_widget
mscuthbert Jun 3, 2023
6ff290d
work
mscuthbert Jun 3, 2023
32352df
fix lint
mscuthbert Jun 3, 2023
4f8d003
Update email on Readme
mscuthbert Jun 3, 2023
8749987
simplify structure and lint
mscuthbert Jun 3, 2023
64836b9
MIDI is working again
mscuthbert Jun 3, 2023
c7769a5
import abcFormat (TODO: remove circular)
mscuthbert Jun 3, 2023
4e6f057
autodetect multiple pages
mscuthbert Jun 3, 2023
a6955a1
Fix all to work with Jupyter 7/JupyterLab
mscuthbert Jun 4, 2023
2cad009
Merge pull request #1591 from cuthbertLab/mscuthbert-patch-1
mscuthbert Jun 4, 2023
4b5155c
github autopilot introduced blank line!
mscuthbert Jun 4, 2023
69bcccb
More email things
mscuthbert Jun 4, 2023
5562943
Merge pull request #1589 from cuthbertLab/abc-directive-version
mscuthbert Jun 4, 2023
048a384
Merge pull request #1593 from cuthbertLab/new_email
mscuthbert Jun 4, 2023
55207a2
Refactor out MuseScore/Jupyter code
mscuthbert Jun 4, 2023
3b6a927
lint and flake
mscuthbert Jun 4, 2023
58f5495
Merge pull request #1592 from cuthbertLab/file_widget
mscuthbert Jun 4, 2023
ac23422
add lusitano, comment out warning
mscuthbert Jun 4, 2023
3ea66e4
Merge branch 'master' into aloha_oe
mscuthbert Jun 4, 2023
cfdc95b
Speed up quantize()
TimFelixBeyer Jun 5, 2023
fcc1bd5
Merge pull request #1594 from TimFelixBeyer/patch-8
mscuthbert Jun 5, 2023
61dcdbc
Merge branch 'master' into aloha_oe
mscuthbert Jun 5, 2023
149516f
compromise on fullRest
mscuthbert Jun 5, 2023
425ec69
fix lint / flake
mscuthbert Jun 5, 2023
405b1fc
Merge pull request #1595 from cuthbertLab/aloha_oe
mscuthbert Jun 5, 2023
c0f8c3d
Search.base with Unpitched etc
mscuthbert Jun 6, 2023
d9676fb
Merge pull request #1597 from cuthbertLab/search_with_unpitched
mscuthbert Jun 6, 2023
c8a1869
Metronome silent; Jupyter (v9)
mscuthbert Jun 7, 2023
06fd20c
temp disable extension
mscuthbert Jun 10, 2023
b04bfe4
corpusFilePath to metadata and as id
mscuthbert Jun 10, 2023
aed4ace
Fix plotting in recent matplotlib/notebook
mscuthbert Jun 10, 2023
35d2ce8
Doc tests up to Chapter 22
mscuthbert Jun 11, 2023
b3c3513
lint and use callProcess in plot; docs pass
mscuthbert Jun 11, 2023
30afe10
docfix, lint, mypy
mscuthbert Jun 11, 2023
9b13e16
Merge pull request #1601 from cuthbertLab/pre-9.0
mscuthbert Jun 11, 2023
e0c761b
Move incomplete docs to testsAndInProgress
mscuthbert Jun 13, 2023
0fdf0b4
Merge pull request #1603 from cuthbertLab/docsReorg
mscuthbert Jun 13, 2023
d836169
Add unregisterSubconverter alias back
mscuthbert Jun 14, 2023
d1263d4
Merge pull request #1605 from cuthbertLab/unregister-sub-converter
mscuthbert Jun 14, 2023
9abb557
substitute deprecation for removal: converter.py
mscuthbert Jun 14, 2023
31ff0aa
Merge pull request #1607 from cuthbertLab/unregister-sub-converter
mscuthbert Jun 14, 2023
5c93c3b
Remove duplicate Aloha-Oe
mscuthbert Jun 14, 2023
0fd80b3
Merge pull request #1608 from cuthbertLab/remove-duplicate-liliuokalani
mscuthbert Jun 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 0 additions & 8 deletions .codeclimate.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -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):

46 changes: 32 additions & 14 deletions .flake8
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -30,3 +44,7 @@ per-file-ignores =
music21/search/__init__.py:F403

max-line-length=100

inline-quotes = single
multiline-quotes = '''
docstring-quotes = '''
8 changes: 2 additions & 6 deletions .github/scripts/install_ubuntu_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
67 changes: 64 additions & 3 deletions .github/workflows/maincheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
67 changes: 0 additions & 67 deletions .github/workflows/pythonpylint.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ __pycache__/

# OSX
.DS_Store
**/.DS_Store

# C extensions
*.so
Expand All @@ -40,6 +41,8 @@ develop-eggs
lib
lib64
__pycache__
**/__pycache__
venv

# Installer logs
pip-log.txt
Expand Down Expand Up @@ -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~
3 changes: 0 additions & 3 deletions .gitignore_global

This file was deleted.

36 changes: 36 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading