diff --git a/.github/workflows/build_rocky.yml b/.github/workflows/build_rocky.yml index 46b2dd6966..4b88f7e90b 100644 --- a/.github/workflows/build_rocky.yml +++ b/.github/workflows/build_rocky.yml @@ -17,6 +17,7 @@ jobs: sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel \ readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \ findutils xz + python3 -m pip install typing_extensions git config --global --add safe.directory '*' - name: Install aws cli diff --git a/.github/workflows/build_rocky_arm.yml b/.github/workflows/build_rocky_arm.yml index aac5bdba3f..aa6c689ff9 100644 --- a/.github/workflows/build_rocky_arm.yml +++ b/.github/workflows/build_rocky_arm.yml @@ -17,6 +17,7 @@ jobs: sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel \ readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \ findutils xz + python3 -m pip install typing_extensions git config --global --add safe.directory '*' - name: Install aws cli diff --git a/nix/build-all.py b/nix/build-all.py index ae3e227274..8b79a4d03c 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -98,8 +98,12 @@ import time from urllib.request import urlretrieve from collections.abc import Generator, Sequence from pathlib import Path -from typing import Union, Literal - +try: + from typing import Union, Literal +except: + # python 3.6 compatibility for rocky 8 + from typing import Union + from typing_extensions import Literal logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) @@ -237,7 +241,7 @@ cecho( """ ) -dependency_tree: dict[str, tuple[str, ...]] = { +dependency_tree: 'dict[str, tuple[str, ...]]' = { "IfcParse": ("boost", "libxml2", "hdf5"), "IfcGeom": ("IfcParse", "occ", "json", "cgal", "eigen"), "IfcConvert": ("IfcGeom",), @@ -259,7 +263,7 @@ dependency_tree: dict[str, tuple[str, ...]] = { } -def gather_dependencies(dep: str) -> Generator[str]: +def gather_dependencies(dep: str) -> 'Generator[str]': yield dep for d in dependency_tree[dep]: for x in gather_dependencies(d):