Skip to content

Commit a243454

Browse files
authored
Merge pull request #1611 from cuthbertLab/v9
music21 v9
2 parents 0fd80b3 + 50ac13b commit a243454

File tree

14 files changed

+53
-50
lines changed

14 files changed

+53
-50
lines changed

dist/dist.py

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,25 @@
1616
1717
1. update the VERSION in _version.py and the single test cases in base.py.
1818
2. run `corpus.corpora.CoreCorpus().cacheMetadata()`.
19-
for a major change run corpus.corpora.CoreCorpus().rebuildMetadataCache()
19+
for a major change that affects parsing run corpus.corpora.CoreCorpus().rebuildMetadataCache()
2020
(20 min on IntelMacbook Air) -- either of these MAY change a
2121
lot of tests in corpus, metadata, etc. so don't skip the next step!
22-
3. run test/warningMultiprocessTest.py for lowest and highest Py version -- fix all warnings!
23-
4. run test/testLint.py and fix any lint errors (covered now by CI)
24-
5. commit and then check test/testSingleCoreAll.py or wait for results on GitHub Actions
22+
3. IMPORTANT: run python documentation/testDocumentation.py and afterwards fix errors [*]
23+
24+
[*] you will need pytest, docutils, nbval installed (along with ipython and jupyter),
25+
you cannot check to see if fixed tests work while it is running.
26+
This takes a while and runs single core, and then almost always needs code patches
27+
so allocate time. Start working on the announcement while it's running.
28+
29+
30+
4. run test/warningMultiprocessTest.py for lowest and highest Py version -- fix all warnings!
31+
5. commit and wait for results on GitHub Actions
2532
(normally not necessary, because it's slower and mostly duplicates multiprocessTest,
2633
but should be done before making a release).
27-
6. IMPORTANT: run python documentation/testDocumentation.py and afterwards fix errors [*]
2834
29-
[*] you will need pytest, docutils, nbval installed (along with ipython and jupyter), you cannot check
30-
to see if fixed tests work while it is running.
31-
This takes a while and runs single core, so allocate time. Start working on
32-
the announcement while it's running.
33-
34-
7. run documentation/make.py clean (skip on minor version changes)
35-
8. run documentation/make.py linkcheck [*]
36-
9. run documentation/make.py [*]
35+
6. run documentation/make.py clean (skip on minor version changes)
36+
7. run documentation/make.py linkcheck [*]
37+
8. run documentation/make.py [*]
3738
3839
[*] you will need sphinx, Jupyter (pip or easy_install), markdown, and pandoc (.dmg) installed
3940
@@ -50,22 +51,24 @@
5051
14. Run this file -- it builds the no-corpus version of music21.
5152
DO NOT RUN THIS ON A PC -- the Mac .tar.gz might have an incorrect permission if you do.
5253
53-
15. COMMIT to GitHub at this point w/ commit comment of the new version,
54+
15. PR and Commit to GitHub at this point w/ commit comment of the new version,
5455
then don't change anything until the next step is done.
5556
(.gitignore will avoid uploading the large files created here...)
5657
57-
16. Tag the commit: git tag -a vX.Y.Z -m "music21 vX.Y.Z"
58+
16. Switch back to master/main branch
59+
60+
17. Tag the commit: git tag -a vX.Y.Z -m "music21 vX.Y.Z"
5861
Don't forget the "v" in the release tag.
5962
Sanity check that the correct commit was tagged: git log
6063
61-
17. Push tags: git push --tags (or git push upstream --tags if not on main branch)
64+
18. Push tags: git push --tags (or git push upstream --tags if not on main branch)
6265
63-
18. Create a new release on GitHub and upload the TWO non-wheel files created here and docs.
66+
19. Create a new release on GitHub and upload the TWO non-wheel files created here and docs.
6467
Drag in this order: .tar.gz, documentation, no-corpus.tar.gz
6568
6669
Finish this before doing the next step, even though it looks like it could be done in parallel.
6770
68-
19. Upload the new file to PyPI with "twine upload music21-7.3.5a2.tar.gz", and same for the
71+
20. Upload the new file to PyPI with "twine upload music21-7.3.5a2.tar.gz", and same for the
6972
whl file (but NOT no corpus) [*]
7073
7174
[*] Requires twine to be installed
@@ -80,9 +83,9 @@
8083
username:your_username
8184
password:your_password
8285
83-
20. Delete the two .tar.gz files and .whl file in dist...
86+
21. Delete the two .tar.gz files and .whl file in dist...
8487
85-
21. For starting a new major release create a GitHub branch for the old one.
88+
22. For starting a new major release create a GitHub branch for the old one.
8689
8790
22. Immediately increment the number in _version.py and run tests on it here
8891
to prepare for next release.

documentation/source/about/applications.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ Ariza, C. and Michael Scott Cuthbert. 2011. "The `music21` Stream: A New Object
5050
Model for Representing, Filtering, and Transforming Symbolic Musical
5151
Structures." In *Proceedings of the International Computer Music Conference*.
5252
San Francisco: International Computer Music Association, pp. 61-68.
53-
Available online at http://www.flexatone.org/static/docs/music21Stream.pdf
53+
Available online at https://www.flexatone.net/static/docs/music21Stream.pdf
5454

5555
Ariza, C. and Michael Scott Cuthbert. 2011. "Analytical and Compositional
5656
Applications of a Network-Based Scale Model in `music21`." In *Proceedings of the
5757
International Computer Music Conference*. San Francisco: International Computer
5858
Music Association, pp. 701-708. Available online at
59-
http://www.flexatone.org/static/docs/scaleNetwork.pdf
59+
https://www.flexatone.net/static/docs/scaleNetwork.pdf
6060

6161
Ariza, C. and Michael Scott Cuthbert. 2010. "Modeling Beats, Accents, Beams, and
6262
Time Signatures Hierarchically with `music21` Meter Objects." In *Proceedings of the

documentation/source/about/faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,6 @@ And this Humdrum about which you speak?
206206
Information on Humdrum can be found here at the following links:
207207

208208
* https://www.humdrum.org
209-
* http://kern.humdrum.org
209+
* https://kern.humdrum.org
210210

211211

documentation/source/developerReference/musicxmlTest.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"http://lilypond.org/doc/v2.18/input/regression/musicxml/collated-files\n",
3333
"\n",
3434
"The test suite is licensed under the MIT license\n",
35-
"(https://opensource.org/licenses/mit-license.php)\n",
35+
"(https://opensource.org/license/mit/)\n",
3636
"and copyrighted by the Lilypond project.\n",
3737
"\n"
3838
]

documentation/source/usersGuide/usersGuide_08_installingMusicXML.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
}
181181
],
182182
"source": [
183-
"url = 'http://kern.ccarh.org/cgi-bin/ksdata?l=cc/bach/cello&file=bwv1007-01.krn&f=xml'\n",
183+
"url = 'https://kern.ccarh.org/cgi-bin/ksdata?l=cc/bach/cello&file=bwv1007-01.krn&f=xml'\n",
184184
"sAlt = converter.parse(url)\n",
185185
"sAlt.measures(1, 5).show() # show first 5 measures"
186186
]
@@ -363,7 +363,7 @@
363363
"metadata": {},
364364
"outputs": [],
365365
"source": [
366-
"sBach = converter.parse('http://kern.ccarh.org/cgi-bin/ksdata?' +\n",
366+
"sBach = converter.parse('https://kern.ccarh.org/cgi-bin/ksdata?' +\n",
367367
" 'l=users/craig/classical/bach/cello&file=bwv1007-01.krn&f=kern')"
368368
]
369369
},
@@ -373,7 +373,7 @@
373373
"source": [
374374
"Over one hundred thousand Kern files can be found at the following URL.\n",
375375
"\n",
376-
"http://kern.humdrum.org/"
376+
"https://kern.humdrum.org/"
377377
]
378378
},
379379
{

music21/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
'''
4848
from __future__ import annotations
4949

50-
__version__ = '9.0.0b1'
50+
__version__ = '9.1.0'
5151

5252
def get_version_tuple(vv):
5353
v = vv.split('.')

music21/abcFormat/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
2525
For users who will be editing ABC extensively or need a way to have music21 output ABC
2626
(which it doesn't do natively), we suggest using the open source EasyABC package:
27-
http://easyabc.sourceforge.net . You can set it up as a MusicXML reader through:
27+
https://easyabc.sourceforge.net . You can set it up as a MusicXML reader through:
2828
2929
>>> #_DOCS_SHOW us = environment.UserSettings()
3030
>>> #_DOCS_SHOW us['musicxmlPath'] = '/Applications/EasyABC.app'

music21/analysis/discrete.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ class KrumhanslSchmuckler(KeyWeightKeyAnalysis):
723723
Implementation of Krumhansl-Schmuckler/Kessler weightings for
724724
Krumhansl-Schmuckler key determination algorithm.
725725
726-
Values from from http://extras.humdrum.org/man/keycor/, which describes these
726+
Values from from https://extras.humdrum.org/man/keycor/, which describes these
727727
weightings as "Strong tendency to identify the dominant key as the tonic."
728728
729729
* Changed in v6.3: it used to be that these were different from the
@@ -771,7 +771,7 @@ class AardenEssen(KeyWeightKeyAnalysis):
771771
'''
772772
Implementation of Aarden-Essen weightings for Krumhansl-Schmuckler key determination algorithm.
773773
774-
Values from from http://extras.humdrum.org/man/keycor/, which
774+
Values from from https://extras.humdrum.org/man/keycor/, which
775775
describes these weightings as "Weak tendency to identify the subdominant key as the tonic."
776776
777777
(N.B. -- we are not sure exactly where the minor weightings come from, and recommend
@@ -816,7 +816,7 @@ class SimpleWeights(KeyWeightKeyAnalysis):
816816
Implementation of simple weights by Craig Sapp for Krumhansl-Schmuckler
817817
key determination algorithm.
818818
819-
Values from from http://extras.humdrum.org/man/keycor/, which describes
819+
Values from from https://extras.humdrum.org/man/keycor/, which describes
820820
these weightings as "Performs most consistently with large regions of music,
821821
becomes noisier with smaller regions of music."
822822
'''
@@ -853,7 +853,7 @@ class BellmanBudge(KeyWeightKeyAnalysis):
853853
'''
854854
Implementation of Bellman-Budge weightings for Krumhansl-Schmuckler key determination algorithm.
855855
856-
Values from from http://extras.humdrum.org/man/keycor/, which describes these
856+
Values from from https://extras.humdrum.org/man/keycor/, which describes these
857857
weightings as "No particular tendencies for confusions with neighboring keys."
858858
'''
859859
_DOC_ALL_INHERITED = False
@@ -893,7 +893,7 @@ class TemperleyKostkaPayne(KeyWeightKeyAnalysis):
893893
Implementation of Temperley-Kostka-Payne weightings for Krumhansl-Schmuckler
894894
key determination algorithm.
895895
896-
Values from from http://extras.humdrum.org/man/keycor/, which describes
896+
Values from from https://extras.humdrum.org/man/keycor/, which describes
897897
these weightings as "Strong tendency to identify the relative major as the tonic
898898
in minor keys. Well-balanced for major keys."
899899
'''

music21/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<class 'music21.base.Music21Object'>
2828
2929
>>> music21.VERSION_STR
30-
'9.0.0b1'
30+
'9.1.0'
3131
3232
Alternatively, after doing a complete import, these classes are available
3333
under the module "base":
377 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)