Skip to content

Commit

Permalink
Merge pull request #602 from cuthbertLab/v6-near-push
Browse files Browse the repository at this point in the history 
Release Candidate for music21 v.6.1
  • Loading branch information
@mscuthbert
mscuthbert authored Sep 1, 2020
2 parents b4c262b + 6304101 commit 1981b55
Show file tree
Hide file tree
Showing 15 changed files with 255 additions and 252 deletions.
79 changes: 40 additions & 39 deletions dist/dist.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
11. zip up documentation/build/html and get ready to upload/delete it. (skip for Alpha/Beta)
12. And finally this file. (from the command line; not as python -m...)
12. And finally this file. (from the command line; not as python -m... Catalina needs sudo)
13. COMMIT to Github at this point w/ commit comment of the new version,
then don't change anything until the next step is done.
Expand Down Expand Up @@ -135,29 +135,30 @@ def updatePaths(self):
fp = os.path.join(self.fpDistDir, fn)
# if self.version in fn and fn.endswith('.egg'):
# self.fpEgg = fp
# if self.version in fn and fn.endswith('.exe'):
# fpNew = fp.replace('.macosx-10.8-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.8-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.9-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.9-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.10-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.10-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.11-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.11-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.12-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.12-x86_64.exe', '.win32.exe')
# if fpNew != fp:
# os.rename(fp, fpNew)
# self.fpWin = fpNew

# if self.version in fn and fn.endswith('.exe'):
# fpNew = fp.replace('.macosx-10.8-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.8-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.9-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.9-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.10-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.10-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.11-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.11-x86_64.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.12-intel.exe', '.win32.exe')
# fpNew = fpNew.replace('.macosx-10.12-x86_64.exe', '.win32.exe')
# if fpNew != fp:
# os.rename(fp, fpNew)
# self.fpWin = fpNew

print(fn)
if self.version in fn and fn.endswith('.tar.gz'):
self.fpTar = fp
else:
environLocal.warn(fn + ' does not end with .tar.gz')

environLocal.warn('giving path for tar.gz')
for fn in [self.fpTar]:
if fn == None:
if fn is None:
environLocal.warn('missing fn path')
else:
environLocal.warn(fn)
Expand All @@ -184,7 +185,7 @@ def removeCorpus(self, fp):
# this has .tar.gz extension; this is the final completed package
fnDst = fn.replace('music21', 'music21-noCorpus')
fpDst = os.path.join(fpDir, fnDst)
# remove file extnesions
# remove file extensions
fnDstDir = fnDst.replace(modeExt, '')
fpDstDir = os.path.join(fpDir, fnDstDir)

Expand Down Expand Up @@ -278,10 +279,10 @@ def build(self):
remove extract build products.
'''
# call setup.py
# import setup # -- for some reason does not work unless called from command line
for buildType in [#'bdist_egg',
#'bdist_wininst',
'sdist --formats=gztar'
# import setup # -- for some reason does not work unless called from command line
for buildType in [ # 'bdist_egg',
# 'bdist_wininst',
'sdist --formats=gztar',
]:
environLocal.warn('making %s' % buildType)

Expand All @@ -292,11 +293,11 @@ def build(self):
os.system('%s setup.py %s' % (PY, buildType))
os.chdir(savePath)

# os.system('cd %s; %s setup.py bdist_egg' % (self.fpPackageDir, PY))
# os.system('cd %s; %s setup.py bdist_wininst' %
# (self.fpPackageDir, PY))
# os.system('cd %s; %s setup.py sdist' %
# (self.fpPackageDir, PY))
# os.system('cd %s; %s setup.py bdist_egg' % (self.fpPackageDir, PY))
# os.system('cd %s; %s setup.py bdist_wininst' %
# (self.fpPackageDir, PY))
# os.system('cd %s; %s setup.py sdist' %
# (self.fpPackageDir, PY))

# os.system('cd %s; python setup.py sdist' % self.fpPackageDir)
self.updatePaths()
Expand All @@ -313,19 +314,19 @@ def build(self):
# self.fpEggNoCorpus = self.removeCorpus(fp=self.fpEgg)


# def uploadPyPi(self):
# '''
# Upload source package to PyPI -- currently source file is too big for PyPi...sigh...
# '''
# environLocal.warn(
# 'putting bdist_egg on pypi -- looks redundant, but we have to do it again')
# savePath = os.getcwd()
# os.chdir(self.fpPackageDir)
# os.system('%s setup.py bdist_egg upload' % PY)
# os.chdir(savePath)
# def uploadPyPi(self):
# '''
# Upload source package to PyPI -- currently source file is too big for PyPi...sigh...
# '''
# environLocal.warn(
# 'putting bdist_egg on pypi -- looks redundant, but we have to do it again')
# savePath = os.getcwd()
# os.chdir(self.fpPackageDir)
# os.system('%s setup.py bdist_egg upload' % PY)
# os.chdir(savePath)

# os.system('cd %s; %s setup.py bdist_egg upload' %
# (self.fpPackageDir, PY))
# os.system('cd %s; %s setup.py bdist_egg upload' %
# (self.fpPackageDir, PY))

def md5ForFile(self, path, hexReturn=True):
if hexReturn:
Expand Down
10 changes: 5 additions & 5 deletions documentation/source/usersGuide/usersGuide_11_corpusSearching.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,12 @@
"output_type": "stream",
"text": [
"/Users/cuthbert/git/music21base/music21/corpus/corpora.py: WARNING: local metadata cache: starting processing of paths: 0\n",
"/Users/cuthbert/git/music21base/music21/corpus/corpora.py: WARNING: cache: filename: /var/folders/1t/0_91h1r94kg21qt1jt20lxkc0000gn/T/music21/local.p.gz\n",
"bundles.py: WARNING: MetadataBundle Modification Time: 1590248376.169355\n",
"/Users/cuthbert/git/music21base/music21/corpus/corpora.py: WARNING: cache: filename: /var/folders/mk/qf43gd_s5f30rzzbt7l7l01h0000gn/T/music21/local.p.gz\n",
"bundles.py: WARNING: MetadataBundle Modification Time: 1598896535.8389168\n",
"bundles.py: WARNING: Skipped 0 sources already in cache.\n",
"/Users/cuthbert/git/music21base/music21/corpus/corpora.py: WARNING: cache: writing time: 0.006 md items: 0\n",
"/Users/cuthbert/git/music21base/music21/corpus/corpora.py: WARNING: cache: writing time: 0.012 md items: 0\n",
"\n",
"/Users/cuthbert/git/music21base/music21/corpus/corpora.py: WARNING: cache: filename: /var/folders/1t/0_91h1r94kg21qt1jt20lxkc0000gn/T/music21/local.p.gz\n"
"/Users/cuthbert/git/music21base/music21/corpus/corpora.py: WARNING: cache: filename: /var/folders/mk/qf43gd_s5f30rzzbt7l7l01h0000gn/T/music21/local.p.gz\n"
]
}
],
Expand Down Expand Up @@ -650,7 +650,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.2"
"version": "3.8.5"
}
},
"nbformat": 4,
Expand Down
Loading

0 comments on commit 1981b55

Please sign in to comment.