Skip to content

Commit

Permalink
correct the packaging of core.json, etc.
Browse files Browse the repository at this point in the history
little bug
  • Loading branch information
mscuthbert committed Apr 16, 2014
1 parent 26a8ff6 commit 2212d49
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 301 deletions.
17 changes: 8 additions & 9 deletions dist/dist.py
Expand Up @@ -16,21 +16,19 @@
1. update the VERSION in _version.py and the single test case in base.py, and in freezeThaw.JSONFreezer.jsonPrint
2. run test/multiprocessTest.py
3. run test/test.py (normally not necessary,because it's slower and mostly duplicates multiprocessTest, but should be done before making a release),
4. then test/testDocumentation
5. then test/testSerialization
6. If all tests pass, run `corpus.cacheMetadata(['core'])`,
3. If all tests pass, run `corpus.cacheMetadata(['core'])`,
4. run test/test.py (normally not necessary,because it's slower and mostly duplicates multiprocessTest, but should be done before making a release),
5. then test/testDocumentation
6. then test/testSerialization
7. run documentation/make.py clean
8. run documentation/make.py [*]
9. run documentation/upload [not via eclipse] or upload via ssh.
[*] you will need IPython (pip or easy_install) and pandoc (.dmg) installed
10. and finally this file. (you'll need your GoogleCode password and will need to enter it THREE times; if you
enter it wrong there will be a delay of 10-20 seconds. If you enter it right, there will be a delay of
several minutes while the code uploads.)
10. and finally this file.
11. Update "Featured" on GoogleCode
11. Create a new release on GitHub and upload the FIVE files created here.
12. then update PyPI by going to pypi.python.org and logging in and selecting music21 and clicking edit and augment
the version number and the download URL.
Expand Down Expand Up @@ -111,6 +109,7 @@ def updatePaths(self):
fpNew = fpNew.replace('.macosx-10.9-intel.exe', '.win32.exe')
fpNew = fpNew.replace('.macosx-10.10-intel.exe', '.win32.exe')
fpNew = fpNew.replace('.macosx-10.11-intel.exe', '.win32.exe')
fpNew = fpNew.replace('.macosx-10.12-intel.exe', '.win32.exe')
if fpNew != fp:
os.rename(fp, fpNew)
self.fpWin = fpNew
Expand Down Expand Up @@ -342,6 +341,6 @@ def uploadGoogleCode(self):
d.buildNoCorpus = True
d.build()
d.updatePaths()
d.uploadGoogleCode()
#d.uploadGoogleCode()
#d.uploadGoogleCodeOneFile(d.fpTar)
#d.uploadPyPi()
2 changes: 1 addition & 1 deletion music21/_version.py
Expand Up @@ -17,5 +17,5 @@
updated along with it.
'''

__version_info__ = (1, 8, 0)
__version_info__ = (1, 8, 1)
__version__ = '.'.join(str(x) for x in __version_info__)
2 changes: 1 addition & 1 deletion music21/base.py
Expand Up @@ -33,7 +33,7 @@
::
>>> music21.VERSION_STR
'1.8.0'
'1.8.1'
Alternatively, after doing a complete import, these classes are available
under the module "base":
Expand Down
2 changes: 1 addition & 1 deletion music21/corpus/metadataCache/core.json
Expand Up @@ -755455,6 +755455,6 @@
"__version__": [
1,
8,
0
1
]
}
2 changes: 1 addition & 1 deletion music21/corpus/metadataCache/virtual.json
Expand Up @@ -279,7 +279,7 @@
"__class__": "music21.metadata.bundles.MetadataBundle",
"__version__": [
1,
7,
8,
1
]
}
2 changes: 1 addition & 1 deletion music21/documentation/source/overview/overviewFormats.rst
Expand Up @@ -161,7 +161,7 @@ URL.
::

>>> from music21 import *
>>> s = converter.parse('http://www.musedata.org/cgi-bin/mddata?composer=corelli&edition=chry&genre=trio/op1&work=op1n08&format=stage2&movement=01')
>>> s = converter.parse('http://www.musedata.org/cgi-bin/mddata?composer=corelli&edition=chry&genre=trio/op1&work=op1n08&format=stage2&movement=01') # doctest: +SKIP

If a directory or zipped archive is passed to the
:func:`music21.converter.parse` function, the contained files will be treated
Expand Down
2 changes: 1 addition & 1 deletion music21/documentation/upload.py
Expand Up @@ -28,7 +28,7 @@ def getDirBuildHtml():

# this needs to be on level higher then the level of the source
#DST_MIT = 'athena.dialup.mit.edu:/afs/athena.mit.edu/org/m/music21/doc/'
remoteHost = 'linux.mit.edu'
remoteHost = 'athena.dialup.mit.edu'
remoteDir = '/afs/athena.mit.edu/org/m/music21/doc/'
#tar czpf - -C build/html/ . | ssh cuthbert@linux.mit.edu "tar xzpf - -C /afs/athena.mit.edu/org/m/music21/doc/"

Expand Down
2 changes: 1 addition & 1 deletion music21/freezeThaw.py
Expand Up @@ -1528,7 +1528,7 @@ def jsonPrint(self):
"__version__": [
1,
8,
0
1
]
}
'''
Expand Down
334 changes: 49 additions & 285 deletions music21/test/lastResults.txt

Large diffs are not rendered by default.

0 comments on commit 2212d49

Please sign in to comment.