8000 rewrite History in .md (post-release adjustment) · winpython/winpython@cf4915f · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit cf4915f

Browse files
author
stonebig
committed
rewrite History in .md (post-release adjustment)
1 parent bb541db commit cf4915f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

diff.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def __init__(self, version, rootdir=None, flavor=''):
8585

8686
def from_file(self, basedir):
8787
fname = osp.join(basedir, 'build%s' % self.flavor,
88-
'WinPython%s-%s.txt' % (self.flavor, self.version))
88+
'WinPython%s-%s.md' % (self.flavor, self.version))
8989
with open(fname, 'r') as fdesc: # python3 doesn't like 'rb'
9090
text = fdesc.read()
9191
self.from_text(text)
@@ -157,7 +157,7 @@ def diff_package_dicts(dict1_in, dict2_in):
157157
def find_closer_version(version1, rootdir=None, flavor=''):
158158
"""Find version which is the closest to `version`"""
159159
builddir = osp.join(get_basedir(version1, rootdir), 'build%s' % flavor)
160-
func = lambda name: re.match(r'WinPython%s-([0-9\.]*)\.txt' % flavor, name)
160+
func = lambda name: re.match(r'WinPython%s-([0-9\.]*)\.(txt|md)' % flavor, name)
161161
versions = [func(name).groups()[0]
162162
for name in os.listdir(builddir) if func(name)]
163163
try:
@@ -176,7 +176,7 @@ def compare_package_indexes(version2, version1=None, rootdir=None, flavor='',
176176
if version1 is None:
177177
version1 = find_closer_version(version2, rootdir=rootdir,
178178
flavor=flavor)
179-
flavor1 = flavor1 if flavor1 else flavor
179+
flavor1 = flavor1 if flavor1 is not None else flavor
180180
text = '\r\n'.join(["## History of changes for WinPython %s" %
181181
(version2+flavor),
182182
"", "The following changes were made to WinPython "
@@ -197,7 +197,7 @@ def compare_package_indexes(version2, version1=None, rootdir=None, flavor='',
197197
def _copy_all_changelogs(version, basedir, flavor=''):
198198
basever = '.'.join(version.split('.')[:2])
199199
for name in os.listdir(CHANGELOGS_DIR):
200-
if re.match(r'WinPython%s-%s([0-9\.]*)\.txt' %
200+
if re.match(r'WinPython%s-%s([0-9\.]*)\.(txt|md)' %
201201
(flavor, basever), name):
202202
shutil.copyfile(osp.join(CHANGELOGS_DIR, name),
203203
osp.join(basedir, 'build%s' % flavor, name))
@@ -212,7 +212,7 @@ def write_changelog(version2, version1=None, rootdir=None, flavor='',
212212
text = compare_package_indexes(version2, version1, rootdir=rootdir,
213213
flavor=flavor)
214214
fname = osp.join(basedir, 'build%s' % flavor,
215-
'WinPython%s-%s_History.txt' % (flavor, version2))
215+
'WinPython%s-%s_History.md' % (flavor, version2))
216216
with open(fname, 'w', encoding='utf-8-sig') as fdesc: # python 3 need
217217
fdesc.write(text)
218218
# Copy to winpython/changelogs
@@ -238,8 +238,8 @@ def test_compare(basedir, version2, version1):
238238

239239

240240
if __name__ == '__main__':
241-
print (compare_package_indexes('3.4.3.7', '3.4.3.7',
242-
rootdir='D:\Winpython', flavor='Slim', flavor1='Qt5'))
241+
print (compare_package_indexes('3.5.0.1', '3.4.3.6',
242+
rootdir='D:\Winpython', flavor='Slim', flavor1=''))
243243
# test_parse_package_index_wiki('2.7.3.3')
244244
# print(compare_package_indexes('2.7.3.3', '2.7.3.1'))
245245
# write_changelog('2.7.4.1', '2.7.4.0')

make.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ def make(self, remove_existing=True, requirements=None): #, find_links=None):
843843
# winpyver2 = need the version without build part
844844
self.winpyver2 = '%s.%s' % (self.python_fullversion, self.build_number)
845845
fname = osp.join(self.winpydir, os.pardir,
846-
'WinPython%s-%s.txt' % (self.flavor, self.winpyver2))
846+
'WinPython%s-%s.md' % (self.flavor, self.winpyver2))
847847
open(fname, 'w').write(self.package_index_wiki)
848848
# Copy to winpython/changelogs
849849
shutil.copyfile(fname, osp.join(CHANGELOGS_DIR, osp.basename(fname)))

0 commit comments

Comments
 (0)
0