Skip to content

Commit

Permalink
music21 v6.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Myke Cuthbert committed Feb 4, 2021
1 parent ea893da commit 72ab7cb
Show file tree
Hide file tree
Showing 10 changed files with 540 additions and 540 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ http://web.mit.edu/music21 or http://music21.readthedocs.org/en/latest/index.htm
And to install, see:
http://web.mit.edu/music21/doc/usersGuide/usersGuide_01_installing.html

Music21 runs on Python 3.6+. Version 4 was the last version to support Python 2 or Py3.4;
Version 5 was the last version to support Py3.5.
Music21 runs on Python 3.6+. User version 4 on Python 2 or Py3.4, version 5
on Py3.5.

Released under the BSD (3-clause) license. Music21 may also be used
under the LGPL license. See LICENSE.
Expand Down
15 changes: 9 additions & 6 deletions dist/dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,22 @@
(40 min on MacPro) -- either of these MAY change a lot of tests in corpus, metadata, etc.
so don't skip the next step!
3. run test/warningMultiprocessTest.py for lowest and highest Py version -- fix all warnings!
4. run test/testLint.py and fix any lint errors
4. run test/testLint.py and fix any lint errors (covered now by CI)
5. commit and then check test/testSingleCoreAll.py or wait for results on Github Actions
(normally not necessary, because it's slower and mostly duplicates multiprocessTest,
but should be done before making a release).
6. then python documentation/testDocumentation.py [*]
6. IMPORTANT: run python documentation/testDocumentation.py and afterwards fix errors [*]
[*] you will need pytest and nbval installed (along with ipython and jupyter), you cannot fix tests
while it is running. This takes a while and runs single core, so allocate time.
while it is running. This takes a while and runs single core, so allocate time. Start working on
the announcement while it's running.
7. run documentation/make.py clean
7. run documentation/make.py clean (skip on minor version changes)
8. run documentation/make.py [*]
[*] you will need sphinx, IPython (pip or easy_install), markdown, and pandoc (.dmg) installed
9. ssh to MIT, cd music21/doc and rm -rf *
9. ssh to MIT, cd music21/doc and rm -rf * (skip on minor version changes)
10. run documentation/upload.py or upload via ssh.
-- you will need an MIT username and password
Expand Down Expand Up @@ -70,7 +71,9 @@
16. Delete the two .tar.gz files in dist...
17. Immediately increment the number in _version.py and run tests on it here
17a. For starting a new major release create a GitHub branch for the old one.
17b. Immediately increment the number in _version.py and run tests on it here
to prepare for next release.
18. Announce on the blog, to the list, and twitter.
Expand Down
1,002 changes: 500 additions & 502 deletions documentation/source/developerReference/musicxmlTest.ipynb

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion documentation/source/usersGuide/usersGuide_02_notes.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@
"data": {
"text/plain": [
"['GeneralNote',\n",
" 'Iterable',\n",
" 'List',\n",
" 'Lyric',\n",
" 'LyricException',\n",
" 'NotRest',\n",
Expand All @@ -123,12 +125,16 @@
" 'NoteException',\n",
" 'Optional',\n",
" 'Rest',\n",
" 'SYLLABIC_CHOICES',\n",
" 'SpacerRest',\n",
" 'Test',\n",
" 'TestExternal',\n",
" 'Tuple',\n",
" 'Union',\n",
" 'Unpitched',\n",
" '_DOC_ORDER',\n",
" '_MOD',\n",
" '__annotations__',\n",
" '__builtins__',\n",
" '__cached__',\n",
" '__doc__',\n",
Expand Down Expand Up @@ -1504,7 +1510,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.2"
"version": "3.8.1"
}
},
"nbformat": 4,
Expand Down
38 changes: 15 additions & 23 deletions documentation/source/usersGuide/usersGuide_28_lyricSearcher.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion music21/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
Changing this number invalidates old pickles -- do it if the old pickles create a problem.
'''

__version_info__ = (6, 6, 1) # can be 4-tuple: (7, 0, 5, 'a2')
__version_info__ = (6, 7, 0) # can be 4-tuple: (7, 0, 5, 'a2')

v = '.'.join(str(x) for x in __version_info__[0:3])
if len(__version_info__) > 3 and __version_info__[3]:
Expand Down
4 changes: 2 additions & 2 deletions music21/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Authors: Michael Scott Cuthbert
# Christopher Ariza
#
# Copyright: Copyright © 2006-2020 Michael Scott Cuthbert and the music21
# Copyright: Copyright © 2006-2021 Michael Scott Cuthbert and the music21
# Project
# License: BSD, see license.txt
# -----------------------------------------------------------------------------
Expand All @@ -28,7 +28,7 @@
<class 'music21.base.Music21Object'>
>>> music21.VERSION_STR
'6.6.1'
'6.7.0'
Alternatively, after doing a complete import, these classes are available
under the module "base":
Expand Down
2 changes: 1 addition & 1 deletion music21/converter/subConverters.py
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ def write(self, obj, fmt, fp=None, subformats=None,
and not str(environLocal['musescoreDirectPNGPath']).startswith('/skip')):
outFp = self.runThroughMusescore(xmlFp, subformats, **keywords)
elif compress:
archiveTools.compressXML(xmlFp, deleteOriginal=True)
archiveTools.compressXML(xmlFp, deleteOriginal=True, silent=True)
filenameOut = os.path.splitext(str(xmlFp))[0] + '.mxl'
outFp = common.pathTools.cleanpath(filenameOut, returnPathlib=True)
else:
Expand Down
Binary file modified music21/corpus/_metadataCache/core.p.gz
Binary file not shown.
5 changes: 3 additions & 2 deletions music21/musicxml/archiveTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def compressAllXMLFiles(*, deleteOriginal=False):
)


def compressXML(filename: Union[str, pathlib.Path], *, deleteOriginal=False):
def compressXML(filename: Union[str, pathlib.Path], *, deleteOriginal=False, silent=False):
'''
Takes a filename, and if the filename corresponds to a musicXML file with
an .xml extension, creates a corresponding compressed .mxl file in the same
Expand All @@ -59,7 +59,8 @@ def compressXML(filename: Union[str, pathlib.Path], *, deleteOriginal=False):
if not filename.endswith('.xml') and not filename.endswith('.musicxml'):
return # not a musicXML file
fp = common.pathTools.cleanpath(filename, returnPathlib=True)
environLocal.warn(f"Updating file: {fp}")
if not silent: # pragma: no cover
environLocal.warn(f"Updating file: {fp}")
newFilename = str(fp.with_suffix('.mxl'))
# contents of container.xml file in META-INF folder
container = f'''<?xml version="1.0" encoding="UTF-8"?>
Expand Down

0 comments on commit 72ab7cb

Please sign in to comment.