music21 v5.7

cuthbertLab · Jun 9, 2019 · 64b8224 · 64b8224
1 parent 9e87914
commit 64b8224
Show file tree

Hide file tree

Showing 22 changed files with 636 additions and 710 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,3 +76,5 @@ documentation/source/tutorials/MersenneDemo_files/_fig_05.png
 .pytest_cache
 .pytest_cache/**
 music21/monkeytype.sqlite3
+.pytest_cache/v/cache/nodeids
+.pytest_cache/v/cache/lastfailed
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,6 @@
 global-include *.p.gz *.py *.txt *.xml *.krn *.mxl *.musicxml *.pdf *.html *.ipynb *.css *.js *.png *.tiff *.jpg *.xls *.mid *.abc *.json *.md *.rst *.zip *.rntxt *.command *.scl *nwc *.nwctxt *.wav *.mei LICENSE
 global-exclude *ipynb_checkpoints* *-checkpoint.ipynb
 prune dist
+prune .mypy_cache
 prune obsolete
 prune documentation
diff --git a/dist/dist.py b/dist/dist.py
@@ -36,7 +36,7 @@
 
 9. ssh to MIT, cd music21/doc and rm -rf *
 
-10. run documentation/upload.py [not via eclipse] or upload via ssh.
+10. run documentation/upload.py or upload via ssh.
    -- you will need an MIT username and password 
 
 11. zip up documentation/build/html and get ready to upload/delete it.

diff --git a/documentation/source/_themes/m21/layout.html b/documentation/source/_themes/m21/layout.html
@@ -1,7 +1,5 @@
 {% extends "basic/layout.html" %}
 
-{% set script_files = script_files + ["_static/copybutton.js"] %}
-
 {%- block doctype -%}
 <!DOCTYPE html>
 {%- endblock -%}
@@ -11,6 +9,12 @@
 <script src='https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js'></script>
 {%- endblock -%}
 
+{%- block scripts %}
+    {{ super() }}
+    <script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>
+{%- endblock %}
+
+
 {# put the sidebar before the body #}
 {% block sidebar1 %}{{ sidebar() }}{% endblock %}
 {% block sidebar2 %}{% endblock %}

diff --git a/documentation/source/developerReference/musicxmlTest.ipynb b/documentation/source/developerReference/musicxmlTest.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_02_notes.ipynb b/documentation/source/usersGuide/usersGuide_02_notes.ipynb
@@ -63,9 +63,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "from music21 import *"
@@ -196,9 +194,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "import music21"
@@ -251,9 +247,7 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "f = note.Note(\"F5\")"
@@ -1524,7 +1518,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,

diff --git a/documentation/source/usersGuide/usersGuide_09_chordify.ipynb b/documentation/source/usersGuide/usersGuide_09_chordify.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_14_timeSignatures.ipynb b/documentation/source/usersGuide/usersGuide_14_timeSignatures.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_16_tinyNotation.ipynb b/documentation/source/usersGuide/usersGuide_16_tinyNotation.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_21_sorting.ipynb b/documentation/source/usersGuide/usersGuide_21_sorting.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_22_graphing.ipynb b/documentation/source/usersGuide/usersGuide_22_graphing.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_26_iterators.ipynb b/documentation/source/usersGuide/usersGuide_26_iterators.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_31_clefs.ipynb b/documentation/source/usersGuide/usersGuide_31_clefs.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_43_searching1.ipynb b/documentation/source/usersGuide/usersGuide_43_searching1.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_44_advancedGraphing.ipynb b/documentation/source/usersGuide/usersGuide_44_advancedGraphing.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_54_extendingConverter.ipynb b/documentation/source/usersGuide/usersGuide_54_extendingConverter.ipynb
@@ -17,9 +17,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "from music21 import converter, note, stream, meter"
@@ -35,9 +33,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "class SingleBeat(converter.subConverters.SubConverter):\n",
@@ -72,9 +68,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "converter.registerSubconverter(SingleBeat)"
@@ -119,7 +113,7 @@
       "    {2.6} <music21.note.Note E>\n",
       "    {2.8} <music21.note.Note D>\n",
       "    {3.0} <music21.note.Note C>\n",
-      "    {4.0} <music21.bar.Barline style=final>\n"
+      "    {4.0} <music21.bar.Barline type=final>\n"
      ]
     }
    ],
@@ -176,7 +170,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "/var/folders/1t/0_91h1r94kg21qt1jt20lxkc0000gn/T/music21/tmp7mvyek9z.sb\n"
+      "/var/folders/1t/0_91h1r94kg21qt1jt20lxkc0000gn/T/music21/tmpvkxam6ik.sb\n"
      ]
     }
    ],
@@ -222,7 +216,7 @@
       "    {2.6} <music21.note.Note E>\n",
       "    {2.8} <music21.note.Note D>\n",
       "    {3.0} <music21.note.Note C>\n",
-      "    {4.0} <music21.bar.Barline style=final>\n"
+      "    {4.0} <music21.bar.Barline type=final>\n"
      ]
     }
    ],
@@ -246,7 +240,7 @@
     {
      "data": {
       "text/plain": [
-       "<music21.stream.Part 0x107c090b8>"
+       "<music21.stream.Part 0x119a786a0>"
       ]
      },
      "execution_count": 8,
@@ -297,9 +291,7 @@
   {
    "cell_type": "code",
    "execution_count": 10,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "converter.resetSubconverters()"
@@ -331,7 +323,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,

diff --git a/documentation/testDocumentation.py b/documentation/testDocumentation.py
@@ -27,7 +27,7 @@
 from music21.exceptions21 import Music21Exception
 from music21.test import testRunner
 
-import nbvalNotebook # @UnresolvedImport
+import nbvalNotebook  # @UnresolvedImport
 
 
 ModTuple = namedtuple('ModTuple', 'module fullModulePath moduleNoExtension autoGen')
@@ -239,10 +239,10 @@ def main(runOne=False):
 
 
 if __name__ == '__main__':
-    # import music21
-    # music21.mainTest()
-    # getDocumentationFromAutoGen(
-    #    '/Users/cuthbert/git/music21base/music21/documentation/autogenerated/usersGuide/usersGuide_02_notes.rst')
-    main()
+    import sys
+    if len(sys.argv) == 1:
+        main()
+    else:
+        main(sys.argv[1])
     # main('usersGuide_02_notes.rst')
     # main('overviewPostTonal.rst')
diff --git a/music21/_version.py b/music21/_version.py
@@ -16,7 +16,7 @@
 Even numbered Ys will be beta releases. Zero Ys 2.0, 3.0, etc. are development releases: they
 CAN change functionality until 2.1, 3.1, etc. is released.  This is against the semver standard,
 but I don't want to have lots of 2.0.0-alpha2, etc., I'd rather call it 2.0.2, and tell users
-to wait for 2.1.
+to wait for 2.1.  Even numbered first decimal releases (e.g. 5.4) are also beta.
 
 
 Q: Why is this here and not in music21/__init__.py?
@@ -42,7 +42,7 @@
 Changing this number invalidates old pickles -- do it if the old pickles create a problem.
 '''
 
-__version_info__ = (5, 6, 1, '')
+__version_info__ = (5, 7, 0, '')
 
 v = '.'.join(str(x) for x in __version_info__[0:3])
 if len(__version_info__) > 3 and __version_info__[3]:
@@ -51,4 +51,5 @@
     v += '.' + '.'.join(__version_info__[4:])
 
 __version__ = v
-del(v)
+
+del v
diff --git a/music21/base.py b/music21/base.py
@@ -28,7 +28,7 @@
 <class 'music21.base.Music21Object'>
 
 >>> music21.VERSION_STR
-'5.6.1'
+'5.7.0'
 
 Alternatively, after doing a complete import, these classes are available
 under the module "base":

diff --git a/music21/chord/__init__.py b/music21/chord/__init__.py
@@ -288,7 +288,7 @@ def __deepcopy__(self, memo=None):
         # as this inherits from NotRest, can use that __deepcopy__ as basis
         # that looks only to _volume to see if it is not None; with a
         # Chord, _volume will always be None
-        new = note.NotRest.__deepcopy__(self, memo=memo)
+        new = super().__deepcopy__(memo=memo)
         # after copying, if a Volume exists, it is linked to the old object
         # look at _volume so as not to create object if not already there
         for d in new._notes:
@@ -5759,6 +5759,12 @@ def testInvertingSimple(self):
         a.inversion(1)
         self.assertEqual(repr(a), '<music21.chord.Chord B4 D5 F5 G5>')
 
+    def testDeepcopyChord(self):
+        ch = Chord('C4 E4 G4')
+        ch2 = copy.deepcopy(ch)
+        self.assertEqual(ch, ch2)
+
+
 # ------------------------------------------------------------------------------
 
 

diff --git a/music21/corpus/_metadataCache/core.p.gz b/music21/corpus/_metadataCache/core.p.gz
diff --git a/music21/note.py b/music21/note.py
@@ -2006,6 +2006,8 @@ def testVolumeB(self):
         self.assertEqual(n1Copy.volume.velocity, 100)
         self.assertEqual(n1Copy.volume.client, n1Copy)
 
+del Optional
+
 # ------------------------------------------------------------------------------
 # define presented order in documentation
 _DOC_ORDER = [Note, Rest, SpacerRest, Unpitched, NotRest, GeneralNote, Lyric]