@@ -36,10 +36,10 @@ def from_text(self, text):
36
36
raise ValueError (f"Unrecognized package line format: { text } " )
37
37
38
38
def to_wiki (self ):
39
- return f" * [{ self .name } ]({ self .url } ) { self .version } ({ self .description } )\r \ n "
39
+ return f" * [{ self .name } ]({ self .url } ) { self .version } ({ self .description } )\n "
40
40
41
41
def upgrade_wiki (self , other ):
42
- return f" * [{ self .name } ]({ self .url } ) { other .version } → { self .version } ({ self .description } )\r \ n "
42
+ return f" * [{ self .name } ]({ self .url } ) { other .version } → { self .version } ({ self .description } )\n "
43
43
44
44
class PackageIndex :
45
45
HEADERS = {"tools" : "### Tools" , "python" : "### Python packages" , "wheelhouse" : "### WheelHouse packages" }
@@ -86,11 +86,11 @@ def normalize(d): return {k.replace("-", "_").lower(): v for k, v in d.items()}
86
86
removed = [old [k ].to_wiki () for k in old if k not in new ]
87
87
88
88
if added :
89
- output += "New packages:\r \n \r \ n " + "" .join (added ) + "\r \n "
89
+ output += "New packages:\n \ n " + "" .join (added ) + "\n \n "
90
90
if upgraded :
91
- output += "Upgraded packages:\r \n \r \ n " + "" .join (upgraded ) + "\r \n "
91
+ output += "Upgraded packages:\n \ n " + "" .join (upgraded ) + "\n \n "
92
92
if removed :
93
- output += "Removed packages:\r \n \r \ n " + "" .join (removed ) + "\r \n "
93
+ output += "Removed packages:\n \ n " + "" .join (removed ) + "\n \n "
94
94
return output
95
95
96
96
def find_previous_version (target_version , searchdir = None , flavor = "" , architecture = 64 ):
@@ -110,16 +110,16 @@ def compare_package_indexes(version2, version1=None, searchdir=None, flavor="",
110
110
111
111
text = (
112
112
f"## History of changes for WinPython-{ architecture } bit { version2 + flavor } \r \n \r \n "
113
- f"The following changes were made to WinPython-{ architecture } bit distribution since version { version1 + flavor1 } .\r \n \r \n "
114
- "<details>\r \n \r \n "
113
+ f"The following changes were made to WinPython-{ architecture } bit distribution since version { version1 + flavor1 } .\n \n \n "
114
+ "<details>\n \n "
115
115
)
116
116
117
117
for key in PackageIndex .HEADERS :
118
118
diff = compare_packages (pi1 .packages [key ], pi2 .packages [key ])
119
119
if diff :
120
- text += f"{ PackageIndex .HEADERS [key ]} \r \n \r \n { diff } "
120
+ text += f"\n { PackageIndex .HEADERS [key ]} \n \n { diff } "
121
121
122
- return text + "\r \ n </details>\r \n * * *\r \n "
122
+ return text + "\n </details>\n \n * * *\n "
123
123
124
124
def copy_changelogs (version , searchdir , flavor = "" , architecture = 64 , basedir = None ):
125
125
basever = "." .join (version .split ("." )[:2 ])
0 commit comments