Skip to content

black 22.12 reformat #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Dec 11, 2022
Merged

black 22.12 reformat #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 71 additions & 110 deletions diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@
def normalize(name):
return re.sub(r"[-_.]+", "-", name).lower()

CHANGELOGS_DIR = str(Path(__file__).parent / 'changelogs')

CHANGELOGS_DIR = str(Path(__file__).parent / "changelogs")
assert Path(CHANGELOGS_DIR).is_dir()


class Package(object):
# SourceForge Wiki syntax:
PATTERN = r'\[([a-zA-Z\-\:\/\.\_0-9]*)\]\(([^\]\ ]*)\) \| ([^\|]*) \| ([^\|]*)'
PATTERN = r"\[([a-zA-Z\-\:\/\.\_0-9]*)\]\(([^\]\ ]*)\) \| ([^\|]*) \| ([^\|]*)"
# Google Code Wiki syntax:
PATTERN_OLD = r'\[([a-zA-Z\-\:\/\.\_0-9]*) ([^\]\ ]*)\] \| ([^\|]*) \| ([^\|]*)'
PATTERN_OLD = r"\[([a-zA-Z\-\:\/\.\_0-9]*) ([^\]\ ]*)\] \| ([^\|]*) \| ([^\|]*)"

def __init__(self):
self.name = None
Expand Down Expand Up @@ -61,26 +62,23 @@ def to_wiki(self):
def upgrade_wiki(self, other):
# wheel replace '-' per '_' in package name
assert (
self.name.replace('-', '_').lower()
== other.name.replace('-', '_').lower()
self.name.replace("-", "_").lower() == other.name.replace("-", "_").lower()
)
return f" * [{self.name}]({self.url}) {other.version} → {self.version} ({self.description})\r\n"


class PackageIndex(object):
WINPYTHON_PATTERN = (
r'\#\# WinPython\-*[0-9b-t]* ([0-9\.a-zA-Z]*)'
)
TOOLS_LINE = '### Tools'
PYTHON_PACKAGES_LINE = '### Python packages'
HEADER_LINE1 = 'Name | Version | Description'
HEADER_LINE2 = '-----|---------|------------'
WINPYTHON_PATTERN = r"\#\# WinPython\-*[0-9b-t]* ([0-9\.a-zA-Z]*)"
TOOLS_LINE = "### Tools"
PYTHON_PACKAGES_LINE = "### Python packages"
HEADER_LINE1 = "Name | Version | Description"
HEADER_LINE2 = "-----|---------|------------"

def __init__(
self,
version,
basedir=None,
flavor='',
flavor="",
architecture=64,
):
self.version = version
Expand All @@ -92,19 +90,17 @@ def __init__(
self.from_file(basedir)

def from_file(self, basedir):
fname = str(Path(CHANGELOGS_DIR) /
f'WinPython{self.flavor}-{self.architecture}bit-{self.version}.md')
fname = str(
Path(CHANGELOGS_DIR)
/ f"WinPython{self.flavor}-{self.architecture}bit-{self.version}.md"
)

with open(
fname, 'r'
) as fdesc: # python3 doesn't like 'rb'
with open(fname, "r") as fdesc: # python3 doesn't like 'rb'
text = fdesc.read()
self.from_text(text)

def from_text(self, text):
version = re.match(
self.WINPYTHON_PATTERN + self.flavor, text
).groups()[0]
version = re.match(self.WINPYTHON_PATTERN + self.flavor, text).groups()[0]
assert version == self.version
tools_flag = False
python_flag = False
Expand All @@ -120,21 +116,17 @@ def from_text(self, text):
elif line in (
self.HEADER_LINE1,
self.HEADER_LINE2,
'<details>',
'</details>'
"<details>",
"</details>",
):
continue
if tools_flag or python_flag:
package = Package()
package.from_text(line)
if tools_flag:
self.other_packages[
package.name
] = package
self.other_packages[package.name] = package
else:
self.python_packages[
package.name
] = package
self.python_packages[package.name] = package


def diff_package_dicts(dict1_in, dict2_in):
Expand All @@ -144,9 +136,9 @@ def diff_package_dicts(dict1_in, dict2_in):
dict1 = {}
dict2 = {}
for key in dict1_in:
dict1[key.replace('-', '_').lower()] = dict1_in[key]
dict1[key.replace("-", "_").lower()] = dict1_in[key]
for key in dict2_in:
dict2[key.replace('-', '_').lower()] = dict2_in[key]
dict2[key.replace("-", "_").lower()] = dict2_in[key]
set1, set2 = set(dict1.keys()), set(dict2.keys())
# New packages
new = sorted(set2 - set1)
Expand All @@ -155,46 +147,35 @@ def diff_package_dicts(dict1_in, dict2_in):
for name in new:
package = dict2[name]
text += package.to_wiki()
text += '\r\n'
text += "\r\n"
# Upgraded packages
upgraded_list = []
for name in sorted(set1 & set2):
package1 = dict1[name]
package2 = dict2[name]
if package1.version != package2.version:
upgraded_list.append(
package2.upgrade_wiki(package1)
)
upgraded_list.append(package2.upgrade_wiki(package1))
if upgraded_list:
text += (
"Upgraded packages:\r\n\r\n"+f"{''.join(upgraded_list)}"+"\r\n"
)
text += "Upgraded packages:\r\n\r\n" + f"{''.join(upgraded_list)}" + "\r\n"
# Removed packages
removed = sorted(set1 - set2)
if removed:
text += "Removed packages:\r\n\r\n"
for name in removed:
package = dict1[name]
text += package.to_wiki()
text += '\r\n'
text += "\r\n"
return text


def find_closer_version(
version1, basedir=None, flavor='', architecture=64
):
def find_closer_version(version1, basedir=None, flavor="", architecture=64):
"""Find version which is the closest to `version`"""
builddir = str(Path(basedir) / f'bu{flavor}')
builddir = str(Path(basedir) / f"bu{flavor}")
func = lambda name: re.match(
r'WinPython%s-%sbit-([0-9\.]*)\.(txt|md)'
% (flavor, architecture),
r"WinPython%s-%sbit-([0-9\.]*)\.(txt|md)" % (flavor, architecture),
name,
)
versions = [
func(name).groups()[0]
for name in os.listdir(builddir)
if func(name)
]
versions = [func(name).groups()[0] for name in os.listdir(builddir) if func(name)]
try:
index = versions.index(version1)
except ValueError:
Expand All @@ -209,7 +190,7 @@ def compare_package_indexes(
version2,
version1=None,
basedir=None,
flavor='',
flavor="",
flavor1=None,
architecture=64,
):
Expand All @@ -222,7 +203,7 @@ def compare_package_indexes(
architecture=architecture,
)
flavor1 = flavor1 if flavor1 is not None else flavor
text = '\r\n'.join(
text = "\r\n".join(
[
f"## History of changes for WinPython-{architecture}bit {version2 + flavor}",
"",
Expand All @@ -245,50 +226,36 @@ def compare_package_indexes(
flavor=flavor,
architecture=architecture,
)
tools_text = diff_package_dicts(
pi1.other_packages, pi2.other_packages
)
tools_text = diff_package_dicts(pi1.other_packages, pi2.other_packages)
if tools_text:
text += (
PackageIndex.TOOLS_LINE
+ '\r\n\r\n'
+ tools_text
)
py_text = diff_package_dicts(
pi1.python_packages, pi2.python_packages
)
text += PackageIndex.TOOLS_LINE + "\r\n\r\n" + tools_text
py_text = diff_package_dicts(pi1.python_packages, pi2.python_packages)
if py_text:
text += (
PackageIndex.PYTHON_PACKAGES_LINE
+ '\r\n\r\n'
+ py_text
)
text += '\r\n</details>\r\n* * *\r\n'
text += PackageIndex.PYTHON_PACKAGES_LINE + "\r\n\r\n" + py_text
text += "\r\n</details>\r\n* * *\r\n"
return text


def _copy_all_changelogs(
version, basedir, flavor='', architecture=64
):
basever = '.'.join(version.split('.')[:2])
def _copy_all_changelogs(version, basedir, flavor="", architecture=64):
basever = ".".join(version.split(".")[:2])
for name in os.listdir(CHANGELOGS_DIR):
if re.match(
r'WinPython%s-%sbit-%s([0-9\.]*)\.(txt|md)'
r"WinPython%s-%sbit-%s([0-9\.]*)\.(txt|md)"
% (flavor, architecture, basever),
name,
):
shutil.copyfile(
str(Path(CHANGELOGS_DIR) / name),
str(Path(basedir) / f'bu{flavor}' / name),
str(Path(basedir) / f"bu{flavor}" / name),
)


def write_changelog(
version2,
version1=None,
basedir=None,
flavor='',
release_level='',
flavor="",
release_level="",
architecture=64,
):
"""Write changelog between version1 and version2 of WinPython"""
Expand All @@ -299,7 +266,7 @@ def write_changelog(
architecture=architecture,
)
print(
'comparing_package_indexes',
"comparing_package_indexes",
version2,
basedir,
flavor,
Expand All @@ -312,24 +279,19 @@ def write_changelog(
flavor=flavor,
architecture=architecture,
)
fname = str(Path(basedir) /
f'bu{flavor}' /
f'WinPython{flavor}-{architecture}bit-{version2}_History.md')

fname = str(
Path(basedir)
/ f"bu{flavor}"
/ f"WinPython{flavor}-{architecture}bit-{version2}_History.md"
)

with open(
fname, 'w', encoding='utf-8-sig'
) as fdesc: # python 3 need
with open(fname, "w", encoding="utf-8-sig") as fdesc: # python 3 need
fdesc.write(text)
# Copy to winpython/changelogs
shutil.copyfile(
fname, str(Path(CHANGELOGS_DIR) / Path(fname).name)
)
shutil.copyfile(fname, str(Path(CHANGELOGS_DIR) / Path(fname).name))


def test_parse_package_index_wiki(
version, basedir=None, flavor='', architecture=64
):
def test_parse_package_index_wiki(version, basedir=None, flavor="", architecture=64):
"""Parse the package index Wiki page"""
pi = PackageIndex(
version,
Expand All @@ -341,16 +303,14 @@ def test_parse_package_index_wiki(
utils.print_box("Tools:")
for package in pi.other_packages.values():
print(package)
print('')
print("")
utils.print_box("Python packages:")
for package in pi.python_packages.values():
print(package)
print('')
print("")


def test_compare(
basedir, version2, version1, architecture=64
):
def test_compare(basedir, version2, version1, architecture=64):
print(
compare_package_indexes(
basedir,
Expand All @@ -361,23 +321,24 @@ def test_compare(
)


if __name__ == '__main__':
if __name__ == "__main__":
print(
compare_package_indexes(
version2='3.7.4.0',
version1='3.7.2.0',
basedir=r'C:\WinP\bd37',
flavor='Zero',
flavor1='Zero',
architecture=32
))
version2="3.7.4.0",
version1="3.7.2.0",
basedir=r"C:\WinP\bd37",
flavor="Zero",
flavor1="Zero",
architecture=32,
)
)
write_changelog(
version2='3.7.4.0',
version1='3.7.2.0',
basedir=r'C:\WinP\bd37',
flavor='Ps2',
architecture=64
)
version2="3.7.4.0",
version1="3.7.2.0",
basedir=r"C:\WinP\bd37",
flavor="Ps2",
architecture=64,
)
# test_parse_package_index_wiki('2.7.3.3')
# print(compare_package_indexes('2.7.3.3', '2.7.3.1'))
# write_changelog('2.7.4.1', '2.7.4.0')
Expand Down
Loading