8000 Satisfied linter · solvingj/portable-python@7f4105b · GitHub
[go: up one dir, main page]
Skip to content

Commit 7f4105b

Browse files
Zoran Simiczsimic
Zoran Simic
authored and
zsimic
committed
Satisfied linter
1 parent 3d4b3e2 commit 7f4105b

File tree

2 files changed

+36
-23
lines changed

2 files changed

+36
-23
lines changed

‎src/portable_python/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import os
1616
import pathlib
1717
import re
18-
from typing import ClassVar, List
1918
from string import Template
19+
from typing import ClassVar, List
2020

2121
import runez
2222
from runez.http import RestClient

‎src/portable_python/external/xcpython.py

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ def version(self):
3030
def c_configure_args(self):
3131
if config_args := self.cfg_configure(self.deps_lib):
3232
yield config_args
33+
3334
else:
3435
yield "--enable-shared=no"
3536
yield "--enable-static=yes"
3637
yield "--enable-dbm"
3738
yield "--with-pic=yes"
3839

39-
4040
def _do_linux_compile(self):
4141
self.run_configure("../dist/configure", self.c_configure_args())
4242
self.run_make()
@@ -85,10 +85,11 @@ def url(self):
8585
@property
8686
def version(self):
8787
return self.cfg_version("1.24")
88-
88+
8989
def c_configure_args(self):
9090
if config_args := self.cfg_configure(self.deps_lib):
9191
yield config_args
92+
9293
else:
9394
yield "--enable-shared=no"
9495
yield "--enable-static=yes"
@@ -122,22 +123,24 @@ class LibFFI(ModuleBuilder):
122123

123124
@property
124125
def url(self):
125-
return self.cfg_url(self.version) or f"https://github.com/libffi/libffi/releases/download/v{self.version}/libffi-{self.version}.tar.gz"
126+
return (
127+
self.cfg_url(self.version) or f"https://github.com/libffi/libffi/releases/download/v{self.version}/libffi-{self.version}.tar.gz"
128+
)
126129

127130
@property
128131
def version(self):
129132
return self.cfg_version("3.4.6")
130-
133+
131134
def c_configure_args(self):
132135
if config_args := self.cfg_configure(self.deps_lib):
133136
yield config_args
137+
134138
else:
135139
yield "--enable-shared=no"
136140
yield "--enable-static=yes"
137141
yield "--with-pic=yes"
138142
yield PPG.target.is_macos and "--disable-multi-os-directory"
139143
yield "--disable-docs"
140-
141144

142145
def _do_linux_compile(self):
143146
self.run_configure("./configure", self.c_configure_args())
@@ -162,7 +165,10 @@ def url(self):
162165
if self.version and self.version.startswith("1.1.1"):
163166
# Not sure why URL suddenly changed for this on github...
164167
vfolder = self.version.replace(".", "_")
165-
return self.cfg_url(self.version) or f"https://github.com/openssl/openssl/releases/download/OpenSSL_{vfolder}/openssl-{self.version}.tar.gz"
168+
return (
169+
self.cfg_url(self.version)
170+
or f"https://github.com/openssl/openssl/releases/download/OpenSSL_{vfolder}/openssl-{self.version}.tar.gz"
171+
)
166172

167173
return f"https://github.com/openssl/openssl/releases/download/openssl-{self.version}/openssl-{self.version}.tar.gz"
168174

@@ -175,6 +181,7 @@ def version(self):
175181
def c_configure_args(self):
176182
if config_args := self.cfg_configure(self.deps_lib):
177183
yield config_args
184+
178185
else:
179186
yield "-v"
180187
yield "--openssldir=/etc/ssl"
@@ -203,6 +210,7 @@ def version(self):
203210
def c_configure_args(self):
204211
if config_args := self.cfg_configure(self.deps_lib):
205212
yield config_args
213+
206214
else:
207215
yield "--disable-shared"
208216
yield "--enable-static"
@@ -259,6 +267,7 @@ def version(self):
259267
def c_configure_args(self):
260268
if config_args := self.cfg_configure(self.deps_lib):
261269
yield config_args
270+
262271
else:
263272
yield "--enable-shared=no"
264273
yield "--enable-static=yes"
@@ -298,16 +307,17 @@ def url(self):
298307
@property
299308
def version(self):
300309
return self.cfg_version("3.47.0")
301-
310+
302311
def c_configure_args(self):
303312
if config_args := self.cfg_configure(self.deps_lib):
304313
yield config_args
314+
305315
else:
306-
yield "--enable-shared=no",
307-
yield "--enable-static=yes",
308-
yield "--disable-tcl",
309-
yield "--disable-readline",
310-
yield "--with-pic=yes",
316+
yield "--enable-shared=no"
317+
yield "--enable-static=yes"
318+
yield "--disable-tcl"
319+
yield "--disable-readline"
320+
yield "--with-pic=yes"
311321

312322
def _do_linux_compile(self):
313323
self.run_configure("./configure", self.c_configure_args())
@@ -338,6 +348,7 @@ def version(self):
338348
def c_configure_args(self):
339349
if config_args := self.cfg_configure(self.deps_lib):
340350
yield config_args
351+
341352
else:
342353
yield "--enable-shared=no"
343354
yield "--enable-static=yes"
@@ -363,19 +374,20 @@ def url(self):
363374
@property
364375
def version(self):
365376
return self.cfg_version("5.6.3")
366-
377+
367378
def c_configure_args(self):
368379
if config_args := self.cfg_configure(self.deps_lib):
369380
yield config_args
381+
370382
else:
371-
yield "--enable-shared=no",
372-
yield "--enable-static=yes",
373-
yield "--with-pic=yes",
374-
yield "--disable-rpath",
375-
yield "--disable-dependency-tracking",
376-
yield "--disable-doc",
377-
yield "--disable-nls",
378-
yield "--without-libintl-prefix",
383+
yield "--enable-shared=no"
384+
yield "--enable-static=yes"
385+
yield "--with-pic=yes"
386+
yield "--disable-rpath"
387+
yield "--disable-dependency-tracking"
388+
yield "--disable-doc"
389+
yield "--disable-nls"
390+
yield "--without-libintl-prefix"
379391

380392
def _do_linux_compile(self):
381393
self.run_configure("./configure", self.c_configure_args())
@@ -405,10 +417,11 @@ def url(self):
405417
@property
406418
def version(self):
407419
return self.cfg_version("1.3.1")
408-
420+
409421
def c_configure_args(self):
410422
if config_args := self.cfg_configure(self.deps_lib):
411423
yield config_args
424+
412425
else:
413426
yield "--static"
414427

0 commit comments

Comments
 (0)
0