IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applying black formatting

Browse Source 
- Fixing flake8 configuration to agree with black
- Adding black validation check to github actions
This commit is contained in:
Jacob Alexander
2021-10-01 11:00:22 -07:00
parent 5dade41aeb
commit 6e7fffd7de
51 changed files with 2536 additions and 1837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
buildutils/build.py
View File

@@ -1,4 +1,4 @@
'Build the bundled capnp distribution'
"Build the bundled capnp distribution"
import subprocess
import os
@@ -8,53 +8,53 @@ import sys
def build_libcapnp(bundle_dir, build_dir): # noqa: C901
'''
"""
Build capnproto
'''
"""
bundle_dir = os.path.abspath(bundle_dir)
capnp_dir = os.path.join(bundle_dir, 'capnproto-c++')
capnp_dir = os.path.join(bundle_dir, "capnproto-c++")
build_dir = os.path.abspath(build_dir)
tmp_dir = os.path.join(capnp_dir, 'build{}'.format(8 * struct.calcsize("P")))
tmp_dir = os.path.join(capnp_dir, "build{}".format(8 * struct.calcsize("P")))
# Clean the tmp build directory every time
if os.path.exists(tmp_dir):
shutil.rmtree(tmp_dir)
os.mkdir(tmp_dir)
cxxflags = os.environ.get('CXXFLAGS', None)
ldflags = os.environ.get('LDFLAGS', None)
os.environ['CXXFLAGS'] = (cxxflags or '') + ' -O2 -DNDEBUG'
os.environ['LDFLAGS'] = (ldflags or '')
cxxflags = os.environ.get("CXXFLAGS", None)
ldflags = os.environ.get("LDFLAGS", None)
os.environ["CXXFLAGS"] = (cxxflags or "") + " -O2 -DNDEBUG"
os.environ["LDFLAGS"] = ldflags or ""
# Enable ninja for compilation if available
build_type = []
if shutil.which('ninja'):
build_type = ['-G', 'Ninja']
if shutil.which("ninja"):
build_type = ["-G", "Ninja"]
# Determine python shell architecture for Windows
python_arch = 8 * struct.calcsize("P")
build_arch = []
build_flags = []
if os.name == 'nt':
if os.name == "nt":
if python_arch == 64:
build_arch_flag = "x64"
elif python_arch == 32:
build_arch_flag = "Win32"
else:
raise RuntimeError('Unknown windows build arch')
build_arch = ['-A', build_arch_flag]
build_flags = ['--config', 'Release']
print('Building module for {}'.format(python_arch))
raise RuntimeError("Unknown windows build arch")
build_arch = ["-A", build_arch_flag]
build_flags = ["--config", "Release"]
print("Building module for {}".format(python_arch))
if not shutil.which('cmake'):
raise RuntimeError('Could not find cmake in your path!')
if not shutil.which("cmake"):
raise RuntimeError("Could not find cmake in your path!")
args = [
'cmake',
'-DCMAKE_POSITION_INDEPENDENT_CODE=1',
'-DBUILD_TESTING=OFF',
'-DBUILD_SHARED_LIBS=OFF',
'-DCMAKE_INSTALL_PREFIX:PATH={}'.format(build_dir),
"cmake",
"-DCMAKE_POSITION_INDEPENDENT_CODE=1",
"-DBUILD_TESTING=OFF",
"-DBUILD_SHARED_LIBS=OFF",
"-DCMAKE_INSTALL_PREFIX:PATH={}".format(build_dir),
capnp_dir,
]
args.extend(build_type)
@@ -62,26 +62,26 @@ def build_libcapnp(bundle_dir, build_dir): # noqa: C901
conf = subprocess.Popen(args, cwd=tmp_dir, stdout=sys.stdout)
returncode = conf.wait()
if returncode != 0:
raise RuntimeError('CMake failed {}'.format(returncode))
raise RuntimeError("CMake failed {}".format(returncode))
# Run build through cmake
args = [
'cmake',
'--build',
'.',
'--target',
'install',
"cmake",
"--build",
".",
"--target",
"install",
]
args.extend(build_flags)
build = subprocess.Popen(args, cwd=tmp_dir, stdout=sys.stdout)
returncode = build.wait()
if cxxflags is None:
del os.environ['CXXFLAGS']
del os.environ["CXXFLAGS"]
else:
os.environ['CXXFLAGS'] = cxxflags
os.environ["CXXFLAGS"] = cxxflags
if ldflags is None:
del os.environ['LDFLAGS']
del os.environ["LDFLAGS"]
else:
os.environ['LDFLAGS'] = ldflags
os.environ["LDFLAGS"] = ldflags
if returncode != 0:
raise RuntimeError('capnproto compilation failed: {}'.format(returncode))
raise RuntimeError("capnproto compilation failed: {}".format(returncode))