Skip to content

Commit

Permalink
Black.
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulChristophel committed Dec 13, 2024
1 parent 9389872 commit 6d15da3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
9 changes: 8 additions & 1 deletion relenv/build/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,14 @@ def run(
cwd = os.getcwd()
if download:
extract_archive(dirs.sources, str(download.filepath))
dirs.source = dirs.sources / next((download.filepath.name.split(ext)[0] for ext in [".tar", ".tgz"] if ext in download.filepath.name), None)
dirs.source = dirs.sources / next(
(
download.filepath.name.split(ext)[0]
for ext in [".tar", ".tgz"]
if ext in download.filepath.name
),
None,
)
os.chdir(dirs.source)
else:
os.chdir(dirs.prefix)
Expand Down
3 changes: 2 additions & 1 deletion relenv/build/linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def build_openldap(env, dirs, logfp):
"""
# Ensure position-independent code for shared libraries
env["CFLAGS"] = "-fPIC {}".format(env.get("CFLAGS", ""))

runcmd(
[
"./configure",
Expand All @@ -342,6 +342,7 @@ def build_openldap(env, dirs, logfp):
runcmd(["make", "-j8"], env=env, stderr=logfp, stdout=logfp)
runcmd(["make", "install"], env=env, stderr=logfp, stdout=logfp)


def build_krb(env, dirs, logfp):
"""
Build kerberos.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
from setuptools import setup

if __name__ == "__main__":
setup(include_package_data=True)
setup(include_package_data=True)
6 changes: 3 additions & 3 deletions tests/test_verify_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,9 @@ def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch):
env = os.environ.copy()
env["RELENV_BUILDENV"] = "yes"
env["USE_STATIC_REQUIREMENTS"] = "1"
env[
"CFLAGS"
] = f"{env.get('CFLAGS', '')} -DCMAKE_OSX_ARCHITECTURES='arm64' -DZMQ_HAVE_CURVE=0"
env["CFLAGS"] = (
f"{env.get('CFLAGS', '')} -DCMAKE_OSX_ARCHITECTURES='arm64' -DZMQ_HAVE_CURVE=0"
)
p = subprocess.run(
[
str(pipexec),
Expand Down

0 comments on commit 6d15da3

Please sign in to comment.