Merge pull request #1811 from cuthbertLab/num-dot

1. -> 1.0

Author: mscuthbert

README.md

@@ -15,7 +15,7 @@ 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.)
+on Py3.5, version 6 on Py3.6, version 7 on Py3.7, version 8 on Py3.8/Py3.9)
 
 Released under the BSD (3-clause) license. See LICENSE.
 Externally provided software (including the MIT-licensed Lilypond/MusicXML test Suite) and

documentation/source/testsAndInProgress/devTest_widgets.ipynb

@@ -124,9 +124,9 @@
    ],
    "source": [
     "@widgets.interact_manual(\n",
-    "    color=['blue', 'red', 'green'], lw=(1., 10.))\n",
-    "def plot(freq=1., color='blue', lw=2, grid=True):\n",
-    "    t = np.linspace(-1., +1., 1000)\n",
+    "    color=['blue', 'red', 'green'], lw=(1.0, 10.0))\n",
+    "def plot(freq=1.0, color='blue', lw=2, grid=True):\n",
+    "    t = np.linspace(-1.0, 1.0, 1000)\n",
     "    fig, ax = plt.subplots(1, 1, figsize=(8, 6))\n",
     "    ax.plot(t, np.sin(2 * np.pi * freq * t),\n",
     "            lw=lw, color=color)\n",
@@ -157,8 +157,8 @@
    ],
    "source": [
     "freq_slider = widgets.FloatSlider(\n",
-    "    value=2.,\n",
-    "    min=1.,\n",
+    "    value=2.0,\n",
+    "    min=1.0,\n",
     "    max=10.0,\n",
     "    step=0.1,\n",
     "    description='Frequency:',\n",

music21/alpha/analysis/aligner.py

@@ -1049,7 +1049,7 @@ def testChordSimilarityStream(self):
 
         sa = StreamAligner(target, source)
         sa.align()
-        self.assertEqual(sa.similarityScore, 1.)
+        self.assertEqual(sa.similarityScore, 1.0)
 
     def testShowInsertion(self):
         '''

music21/common/numberTools.py

@@ -401,7 +401,7 @@ def mixedNumeral(expr: numbers.Real,
     '2 1/10000000'
     '''
     if not isinstance(expr, Fraction):
-        quotient, remainder = divmod(float(expr), 1.)
+        quotient, remainder = divmod(float(expr), 1.0)
         remainderFrac = Fraction(remainder).limit_denominator(limitDenominator)
         if quotient < -1:
             quotient += 1
@@ -824,7 +824,10 @@ def approximateGCD(values: Collection[int|float|Fraction], grain: float = 1e-4)
         return lowest
 
     # assume that one of these divisions will match
-    divisors = (1., 2., 3., 4., 5., 6., 7., 8., 9., 10., 11., 12., 13., 14., 15., 16.)
+    divisors = (
+        1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0,
+        9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0,
+    )
     divisions = []  # a list of lists, one for each entry
     uniqueDivisions = set()
     for index in values:

music21/instrument.py

@@ -2426,7 +2426,7 @@ def fromString(instrumentString: str,
     (an honorary 'language' for these purposes).
 
     Alternatively, you can specify the language to search using the `language`
-    argument. (New in v7.3.)
+    argument. (New in v7.3)
 
     >>> t12 = instrument.fromString('Klarinette', language=instrument.SearchLanguage.GERMAN)
     >>> t12

music21/meter/base.py

@@ -381,7 +381,7 @@ class TimeSignature(TimeSignatureBase):
     >>> [thisNote.beatStr for thisNote in m3.notes]
     ['1', '2', '3', '4', '5', '6']
 
-    As of v7., 3/8 also defaults to fast 3/8, that is, one beat:
+    As of v7, 3/8 also defaults to fast 3/8, that is, one beat:
 
     >>> meter.TimeSignature('3/8').beatCount
     1
@@ -1310,7 +1310,7 @@ def _setDefaultAccentWeights(self, depth: int = 3) -> None:
 
             maxInt = max(weightInts)
             weightValues = {}  # reference dictionary
-            # minimum value, something like 1/16., to be multiplied by powers of 2
+            # minimum value, something like 1/16, to be multiplied by powers of 2
             weightValueMin = 1 / pow(2, maxInt - 1)
             for x in range(maxInt):
                 # multiply base value (0.125) by 1, 2, 4

music21/musicxml/m21ToXml.py

@@ -5247,7 +5247,7 @@ def expressionToXml(self, expression: expressions.Expression) -> Element:
         >>> MEX.dump(mxExpression)
         <inverted-turn placement="above" />
 
-        >>> invDelayedTurn = expressions.InvertedTurn(delay=1.)
+        >>> invDelayedTurn = expressions.InvertedTurn(delay=1.0)
         >>> invDelayedTurn.placement = 'below'
         >>> MEX = musicxml.m21ToXml.MeasureExporter()
         >>> mxExpression = MEX.expressionToXml(invDelayedTurn)

music21/musicxml/test_m21ToXml.py

@@ -747,7 +747,7 @@ def test_writeFromSpannerAnchorsGetsMeasureEndOffsetRight(self):
                     currOffsetQL = common.opFrac(currOffsetQL - durQL)
                 else:
                     currOffsetQL = common.opFrac(currOffsetQL + durQL)
-        self.assertEqual(currOffsetQL, 4.)
+        self.assertEqual(currOffsetQL, 4.0)
 
     def testOutOfBoundsExpressionDoesNotCreateForward(self):
         '''

music21/musicxml/test_xmlToM21.py

@@ -1134,7 +1134,7 @@ def testPedalMarks(self):
         self.assertEqual(pm.pedalType, expressions.PedalType.Sustain)
         spElements = pm.getSpannedElements()
         self.assertEqual(len(spElements), 4)
-        expectedOffsets = [0., 1., 1., 2.]
+        expectedOffsets = [0.0, 1.0, 1.0, 2.0]
         for i, (el, expectedOffset) in enumerate(zip(spElements, expectedOffsets)):
             if i == 1:
                 self.assertIsInstance(el, expressions.PedalBounce)
@@ -1152,7 +1152,7 @@ def testPedalMarks(self):
         self.assertEqual(pm.pedalType, expressions.PedalType.Sustain)
         spElements = pm.getSpannedElements()
         self.assertEqual(len(spElements), 3)
-        expectedOffsets = [0., 1., 1.]
+        expectedOffsets = [0.0, 1.0, 1.0]
         for i, (el, expectedOffset) in enumerate(zip(spElements, expectedOffsets)):
             if i == 1:
                 self.assertIsInstance(el, expressions.PedalBounce)
@@ -1189,7 +1189,7 @@ def testPedalMarks(self):
         self.assertEqual(pm.pedalType, expressions.PedalType.Sustain)
         spElements = pm.getSpannedElements()
         self.assertEqual(len(spElements), 5)
-        expectedOffsets = [1.5, 1.75, 0., 0.75, 1.0]
+        expectedOffsets = [1.5, 1.75, 0.0, 0.75, 1.0]
         for i, (el, expectedOffset) in enumerate(zip(spElements, expectedOffsets)):
             self.assertIsInstance(el, note.Note)
             self.assertEqual(el.nameWithOctave, 'A3')

music21/pitch.py

@@ -308,7 +308,7 @@ def _convertPsToOct(ps: int|float) -> int:
     '''
     # environLocal.printDebug(['_convertPsToOct: input', ps])
     ps = round(ps, PITCH_SPACE_SIG_DIGITS)
-    return int(math.floor(ps / 12.)) - 1
+    return int(math.floor(ps / 12)) - 1
 
 
 def _convertPsToStep(