Skip to content

Commit 460f76e

Browse files
gershnikgershnik
committed
Cleanup of python scripts
1 parent cf21829 commit 460f76e

File tree

5 files changed

+39
-24
lines changed

5 files changed

+39
-24
lines changed

‎installers/deb/build.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: BSD-3-Clause
55

66
import sys
7-
import os
87
import subprocess
98
import shutil
109
from pathlib import Path
@@ -83,7 +82,8 @@
8382
/etc/wsddn.conf
8483
""".lstrip())
8584

86-
deps = subprocess.run(['dpkg-shlibdeps', '-O', '-eusr/bin/wsddn'], check=True, cwd=stagedir, stdout=subprocess.PIPE, encoding="utf-8").stdout.strip()
85+
deps = subprocess.run(['dpkg-shlibdeps', '-O', '-eusr/bin/wsddn'],
86+
check=True, cwd=stagedir, stdout=subprocess.PIPE, encoding="utf-8").stdout.strip()
8787
key, val = deps.split('=', 1)
8888
key = key.replace(':', "_")
8989
control.write_text(control.read_text().format_map({key: val}))

‎installers/freebsd/build.py‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,15 @@
8585
with open(workdir / 'plist', 'w', encoding='utf-8') as plist:
8686
for item in stagedir.glob('**/*'):
8787
if not item.is_dir():
88-
print(str(item.relative_to(stagedir)), file=plist)
88+
print(str(item.relative_to(stagedir)), file=plist)
8989

9090
shutil.copy(mydir / 'pre', workdir / '+PRE_INSTALL')
9191
shutil.copy(mydir / 'post_install', workdir / '+POST_INSTALL')
9292
shutil.copy(mydir / 'pre', workdir / '+PRE_DEINSTALL')
9393
shutil.copy(mydir / 'post_deinstall', workdir / '+POST_DEINSTALL')
9494

95-
subprocess.run(['pkg', 'create', '--verbose', '-m', workdir, '-r', stagedir, '-p', workdir/'plist', '-o', workdir], check=True)
95+
subprocess.run(['pkg', 'create', '--verbose',
96+
'-m', workdir, '-r', stagedir, '-p', workdir/'plist', '-o', workdir], check=True)
9697

9798

9899
subprocess.run(['gzip', '--keep', '--force', builddir / 'wsddn'], check=True)
@@ -101,9 +102,15 @@
101102
ostype, oslevel, osarch = ABI.split(':')
102103
abiMarker = '-'.join((ostype, oslevel, osarch))
103104

104-
subprocess.run(['aws', 's3', 'cp', workdir / f'wsddn-{VERSION}.pkg', f's3://gershnik-builds/freebsd/wsddn-{VERSION}-{ARCH}-{oslevel}.pkg'],
105+
subprocess.run(['aws', 's3', 'cp',
106+
workdir / f'wsddn-{VERSION}.pkg',
107+
f's3://gershnik-builds/freebsd/wsddn-{VERSION}-{ARCH}-{oslevel}.pkg'],
105108
check=True)
106-
subprocess.run(['aws', 's3', 'cp', builddir / 'wsddn.gz', f's3://wsddn-symbols/wsddn-{VERSION}-{abiMarker}.gz'], check=True)
107-
109+
subprocess.run(['aws', 's3', 'cp',
110+
builddir / 'wsddn.gz',
111+
f's3://wsddn-symbols/wsddn-{VERSION}-{abiMarker}.gz'],
112+
check=True)
113+
108114
shutil.move(workdir / f'wsddn-{VERSION}.pkg', workdir / f'wsddn-{VERSION}-{abiMarker}.pkg')
109-
subprocess.run(['gh', 'release', 'upload', f'v{VERSION}', workdir / f'wsddn-{VERSION}-{abiMarker}.pkg'], check=True)
115+
subprocess.run(['gh', 'release', 'upload', f'v{VERSION}', workdir / f'wsddn-{VERSION}-{abiMarker}.pkg'],
116+
check=True)

‎installers/mac/build.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
VERSION = getVersion(builddir)
2929

3030
workdir = builddir / 'stage/mac'
31-
stagedir = workdir / f'root'
31+
stagedir = workdir / 'root'
3232
shutil.rmtree(workdir, ignore_errors=True)
3333
stagedir.mkdir(parents=True)
3434

@@ -145,8 +145,12 @@
145145
sys.exit(1)
146146

147147
if args.uploadResults:
148-
subprocess.run(['tar', '-C', builddir, '-czf', workdir.absolute() / f'wsddn-macos-{VERSION}.dSYM.tgz', 'wsddn.dSYM'], check=True)
149-
subprocess.run(['tar', '-C', builddir / 'wrapper', '-czf', workdir.absolute() / f'wsdd-native-macos-{VERSION}.app.dSYM.tgz', 'wsdd-native.app.dSYM'], check=True)
150-
subprocess.run(['aws', 's3', 'cp', workdir / f'wsddn-macos-{VERSION}.dSYM.tgz', 's3://wsddn-symbols/'], check=True)
151-
subprocess.run(['aws', 's3', 'cp', workdir / f'wsdd-native-macos-{VERSION}.app.dSYM.tgz', 's3://wsddn-symbols/'], check=True)
148+
subprocess.run(['tar', '-C', builddir, '-czf',
149+
workdir.absolute() / f'wsddn-macos-{VERSION}.dSYM.tgz', 'wsddn.dSYM'], check=True)
150+
subprocess.run(['tar', '-C', builddir / 'wrapper', '-czf',
151+
workdir.absolute() / f'wsdd-native-macos-{VERSION}.app.dSYM.tgz', 'wsdd-native.app.dSYM'], check=True)
152+
subprocess.run(['aws', 's3', 'cp',
153+
workdir / f'wsddn-macos-{VERSION}.dSYM.tgz', 's3://wsddn-symbols/'], check=True)
154+
subprocess.run(['aws', 's3', 'cp',
155+
workdir / f'wsdd-native-macos-{VERSION}.app.dSYM.tgz', 's3://wsddn-symbols/'], check=True)
152156
subprocess.run(['gh', 'release', 'upload', f'v{VERSION}', installer], check=True)

‎installers/openbsd/build.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
sys.path.append(str(mydir.absolute().parent))
1818

19-
from common import getVersion, getSrcVersion, buildCode, installCode, copyTemplated
19+
from common import getSrcVersion, buildCode, installCode, copyTemplated
2020

2121
parser = argparse.ArgumentParser()
2222

@@ -53,7 +53,8 @@
5353
})
5454

5555
libs = []
56-
ldd_out = subprocess.run(['ldd', stagedir / 'usr/local/bin/wsddn'], stdout=subprocess.PIPE, encoding='utf-8', check=True).stdout
56+
ldd_out = subprocess.run(['ldd', stagedir / 'usr/local/bin/wsddn'],
57+
stdout=subprocess.PIPE, encoding='utf-8', check=True).stdout
5758
for line in iter(ldd_out.splitlines()):
5859
m = re.match(r'^\t[0-9a-f]+ [0-9a-f]+ ([^ ]+) +[^ ]+ +[^ ]+ +[^ ]+ +(.*)$', line)
5960
if not m:
@@ -117,10 +118,13 @@
117118
subprocess.run(['gzip', '--keep', '--force', builddir / 'wsddn'], check=True)
118119

119120
if args.uploadResults:
120-
subprocess.run(['aws', 's3', 'cp', workdir / f'wsddn-{VERSION}.tgz', f's3://gershnik-builds/openbsd/wsddn-{VERSION}-{ARCH}.tgz'],
121+
subprocess.run(['aws', 's3', 'cp',
122+
workdir / f'wsddn-{VERSION}.tgz', f's3://gershnik-builds/openbsd/wsddn-{VERSION}-{ARCH}.tgz'],
121123
check=True)
122-
subprocess.run(['aws', 's3', 'cp', builddir / 'wsddn.gz', f's3://wsddn-symbols/wsddn-openbsd-{VERSION}-{ARCH}.tgz'], check=True)
124+
subprocess.run(['aws', 's3', 'cp',
125+
builddir / 'wsddn.gz', f's3://wsddn-symbols/wsddn-openbsd-{VERSION}-{ARCH}.tgz'], check=True)
123126

124127
shutil.move(workdir / f'wsddn-{VERSION}.tgz', workdir / f'wsddn-{VERSION}-OpenBSD-{ARCH}.tgz')
125-
subprocess.run(['gh', 'release', 'upload', f'v{VERSION}', workdir / f'wsddn-{VERSION}-OpenBSD-{ARCH}.tgz'], check=True)
128+
subprocess.run(['gh', 'release', 'upload', f'v{VERSION}', workdir / f'wsddn-{VERSION}-OpenBSD-{ARCH}.tgz'],
129+
check=True)
126130

‎tools/create-release‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ NEW_VER = sys.argv[1]
1515

1616
unreleased_link_pattern = re.compile(r"^\[Unreleased\]: (.*)$", re.DOTALL)
1717
lines = []
18-
with open(ROOT / "CHANGELOG.md", "rt") as change_log:
18+
with open(ROOT / "CHANGELOG.md", "rt", encoding="utf-8") as change_log:
1919
for line in change_log.readlines():
2020
# Move Unreleased section to new version
2121
if re.fullmatch(r"^## Unreleased.*$", line, re.DOTALL):
@@ -28,7 +28,7 @@ with open(ROOT / "CHANGELOG.md", "rt") as change_log:
2828
lines.append(line)
2929
lines.append(f'[{NEW_VER}]: https://github.com/gershnik/wsdd-native/releases/v{NEW_VER}\n')
3030

31-
with open(ROOT / "CHANGELOG.md", "wt") as change_log:
31+
with open(ROOT / "CHANGELOG.md", "wt", encoding="utf-8") as change_log:
3232
change_log.writelines(lines)
3333

3434
(ROOT / "VERSION").write_text(f'{NEW_VER}\n')
@@ -41,17 +41,17 @@ rpmSpec = re.sub(r'%changelog\n', f'%changelog\n* {today} gershnik - {NEW_VER}-1
4141
(ROOT / "installers/rpm/wsddn.spec").write_text(rpmSpec)
4242

4343
readme = (ROOT / 'README.md').read_text()
44-
readme = re.subn(r'https://github.com/gershnik/wsdd-native/releases/download/v(?:\d+(?:\.\d+)+)',
44+
readme = re.subn(r'https://github.com/gershnik/wsdd-native/releases/download/v(?:\d+(?:\.\d+)+)',
4545
f'https://github.com/gershnik/wsdd-native/releases/download/v{NEW_VER}',
4646
readme)[0]
4747
readme = re.subn(r'wsddn-macos-(?:\d+(?:\.\d+)+).pkg',
4848
f'wsddn-macos-{NEW_VER}.pkg',
4949
readme)[0]
5050
(ROOT / 'README.md').write_text(readme)
5151

52-
subprocess.run(['git', 'add',
53-
ROOT / "README.md",
54-
ROOT / "CHANGELOG.md",
52+
subprocess.run(['git', 'add',
53+
ROOT / "README.md",
54+
ROOT / "CHANGELOG.md",
5555
ROOT / "VERSION",
5656
ROOT / "installers/rpm/wsddn.spec"], check=True)
5757
subprocess.run(['git', 'commit', '-m', f'chore: creating version {NEW_VER}'], check=True)

0 commit comments

Comments
 (0)