From eba65949b81708f86161921dd4300ec028097fce Mon Sep 17 00:00:00 2001 From: Marlon Costa Date: Wed, 23 Sep 2026 12:39:28 -0300 Subject: [PATCH 1/4] fixes --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6708255f..fedb47bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ dependencies = [ "flext-core @ git+https://github.com/flext-sh/flext-core.git@0.12.0-dev", "packaging>=26.3", "pydantic>=2.13.5", - "pydantic-settings>=2.14.0,<2.15", + "pydantic-settings>=2.14.2,<2.15", "pyyaml>=6.0.3", "starlette>=1.6.0", "structlog>=25.5.0,<27", From 05bacd329ecfb6eac1604651dd7ca96c4a6b0ceb Mon Sep 17 00:00:00 2001 From: Marlon Costa Date: Wed, 23 Sep 2026 13:53:03 -0300 Subject: [PATCH 2/4] fixes --- .github/workflows/docs.yml | 15 ++- bin/mise | 198 ++++++++++++++++++---------------- examples/__init__.py | 23 +++- src/flext_web/__init__.py | 7 +- tests/__init__.py | 28 ++--- tests/integration/__init__.py | 4 +- tests/unit/__init__.py | 4 +- 7 files changed, 155 insertions(+), 124 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ecabc241..aecdbe06 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -28,6 +28,14 @@ jobs: timeout-minutes: 30 permissions: contents: read + # Why: GitHub-hosted runners share egress IPs, so the unauthenticated + # 60 req/h REST budget is exhausted before mise resolves the moving + # @latest backends (observed 2026-09-23: 403, rate limit 0/60, on every + # backend in Sync workspace toolchain), and docs generation reads the + # governed sibling repos. The job token authenticates both, as in CI. + env: + GITHUB_TOKEN: ${{ github.token }} + MISE_GITHUB_TOKEN: ${{ github.token }} steps: - name: Checkout uses: actions/checkout@v7 @@ -94,6 +102,10 @@ jobs: timeout-minutes: 60 permissions: contents: read + # Why: same authenticated toolchain and docs-source resolution as docs-quality. + env: + GITHUB_TOKEN: ${{ github.token }} + MISE_GITHUB_TOKEN: ${{ github.token }} steps: - name: Checkout uses: actions/checkout@v7 @@ -134,9 +146,6 @@ jobs: permissions: pages: write id-token: write - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} steps: - name: Deploy to GitHub Pages id: deployment diff --git a/bin/mise b/bin/mise index 6f1cafb7..2034243e 100755 --- a/bin/mise +++ b/bin/mise @@ -3,15 +3,16 @@ set -eu __mise_bootstrap() { - local mise_data_dir="${MISE_DATA_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/mise}" + local mise_data_dir="${MISE_DATA_DIR:-${XDG_DATA_HOME:-${HOME}/.local/share}/mise}" # mise itself expands a leading ~ in these (env::var_path -> file::replace_path); parameter # expansion does not, so without this a tilde value ends up as a relative directory. CI YAML # supplies exactly this shape (MISE_DATA_DIR: ~/.local/share/mise). - case $mise_data_dir in - "~") mise_data_dir=$HOME ;; - "~/"*) mise_data_dir=$HOME/${mise_data_dir#\~/} ;; + case ${mise_data_dir} in + ~) mise_data_dir=${HOME} ;; + ~/*) mise_data_dir=${HOME}/${mise_data_dir#\~/} ;; + *) : ;; esac - local cache_home="${XDG_CACHE_HOME:-$HOME/.cache}/mise" + local cache_home="${XDG_CACHE_HOME:-${HOME}/.cache}/mise" # Unlocked fleet: converge on the newest published mise release. Only an # explicit MISE_VERSION pins; the default resolves the latest tag through # the releases/latest redirect and fails loud when resolution is impossible. @@ -19,7 +20,7 @@ __mise_bootstrap() { mise_version="${MISE_VERSION#v}" else mise_version="$(command -p curl -fsSI -o /dev/null -w '%{redirect_url}' https://github.com/jdx/mise/releases/latest)" - case $mise_version in + case ${mise_version} in */tag/*) mise_version="${mise_version##*/tag/}" ; mise_version="${mise_version#v}" ;; *) echo "mise bootstrap: could not resolve the latest mise release; set MISE_VERSION to pin one" >&2; exit 1 ;; esac @@ -27,16 +28,16 @@ __mise_bootstrap() { # Only a defaulted path may fall back: an explicit MISE_INSTALL_PATH wins even while its file # does not exist yet. if [ -z "${MISE_INSTALL_PATH:-}" ]; then - export MISE_INSTALL_PATH="$mise_data_dir/bootstrap/mise-$mise_version" + export MISE_INSTALL_PATH="${mise_data_dir}/bootstrap/mise-${mise_version}" # Wrappers generated before the data-dir default put the binary in the cache dir; run that # one instead of re-downloading it. -x so a non-executable leftover reinstalls rather than # dying at exec. - if [ ! -f "$MISE_INSTALL_PATH" ] && [ -x "$cache_home/mise-$mise_version" ]; then - MISE_INSTALL_PATH="$cache_home/mise-$mise_version" + if [ ! -f "${MISE_INSTALL_PATH}" ] && [ -x "${cache_home}/mise-${mise_version}" ]; then + MISE_INSTALL_PATH="${cache_home}/mise-${mise_version}" fi fi install() { - local initial_working_dir="$PWD" + local initial_working_dir="${PWD}" #!/bin/sh set -eu @@ -72,7 +73,7 @@ __mise_bootstrap() { unsupported_arch() { arch="$1" - warn "unsupported architecture: $arch" + warn "unsupported architecture: ${arch}" warn "" warn "mise does not provide prebuilt binaries for this platform." warn "If Rust/Cargo is available, install from source with:" @@ -84,12 +85,12 @@ __mise_bootstrap() { #region environment setup get_os() { os="$(uname -s)" - if [ "$os" = Darwin ]; then + if [ "${os}" = Darwin ]; then echo "macos" - elif [ "$os" = Linux ]; then + elif [ "${os}" = Linux ]; then echo "linux" else - error "unsupported OS: $os" + error "unsupported OS: ${os}" fi } @@ -98,32 +99,37 @@ __mise_bootstrap() { if type ldd >/dev/null 2>/dev/null; then if [ "${MISE_INSTALL_MUSL-}" = "1" ] || [ "${MISE_INSTALL_MUSL-}" = "true" ]; then musl="-musl" - elif [ "$(uname -o)" = "Android" ]; then - # Android (Termux) always uses musl - musl="-musl" else - libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1) - if [ -n "$libc" ]; then + uname_o="$(uname -o 2>/dev/null || true)" + if [ "${uname_o}" = "Android" ]; then + # Android (Termux) always uses musl musl="-musl" + else + ldd_output="$(ldd /bin/ls 2>/dev/null || true)" + grep_output="$(echo "${ldd_output}" | grep 'musl' | head -1 || true)" + libc="$(echo "${grep_output}" | cut -d ' ' -f1 || true)" + if [ -n "${libc}" ]; then + musl="-musl" + fi fi fi fi arch="$(uname -m)" - if [ "$arch" = x86_64 ]; then - echo "x64$musl" - elif [ "$arch" = aarch64 ] || [ "$arch" = arm64 ]; then - echo "arm64$musl" - elif [ "$arch" = armv7l ]; then - echo "armv7$musl" + if [ "${arch}" = x86_64 ]; then + echo "x64${musl}" + elif [ "${arch}" = aarch64 ] || [ "${arch}" = arm64 ]; then + echo "arm64${musl}" + elif [ "${arch}" = armv7l ]; then + echo "armv7${musl}" else - unsupported_arch "$arch" + unsupported_arch "${arch}" fi } get_ext() { if [ -n "${MISE_INSTALL_EXT:-}" ]; then - echo "$MISE_INSTALL_EXT" - elif [ -n "${MISE_VERSION:-}" ] && echo "$MISE_VERSION" | grep -q '^v2024'; then + echo "${MISE_INSTALL_EXT}" + elif [ -n "${MISE_VERSION:-}" ] && echo "${MISE_VERSION}" | grep -q '^v2024'; then # 2024 versions don't have zstd tarballs echo "tar.gz" elif tar_supports_zstd; then @@ -137,18 +143,21 @@ __mise_bootstrap() { if ! command -v zstd >/dev/null 2>&1; then false # tar is bsdtar - elif tar --version | grep -q 'bsdtar'; then - true - # busybox tar reports a "1.3x" version that matches the GNU check below, but it - # cannot decompress .tar.zst itself. Detect it so we fall back to the zstd pipe - # (or a .tar.gz download) instead of running `tar -xf` on a zstd tarball. - elif tar --version 2>&1 | grep -qi 'busybox'; then - false - # tar version is >= 1.31 - elif tar --version | grep -q '1\.\(3[1-9]\|[4-9][0-9]\)'; then - true else - false + tar_version="$(tar --version 2>/dev/null || true)" + if echo "${tar_version}" | grep -q 'bsdtar'; then + true + # busybox tar reports a "1.3x" version that matches the GNU check below, but it + # cannot decompress .tar.zst itself. Detect it so we fall back to the zstd pipe + # (or a .tar.gz download) instead of running `tar -xf` on a zstd tarball. + elif echo "${tar_version}" | grep -qi 'busybox'; then + false + # tar version is >= 1.31 + elif echo "${tar_version}" | grep -q '1\.\(3[1-9]\|[4-9][0-9]\)'; then + true + else + false + fi fi } @@ -169,23 +178,23 @@ __mise_bootstrap() { ext=$4 url="https://github.com/jdx/mise/releases/download/v${version}/SHASUMS256.txt" if command -v curl >/dev/null 2>&1; then - debug ">" curl -fsSL "$url" - checksums="$(curl --compressed -fsSL "$url")" + debug ">" curl -fsSL "${url}" + checksums="$(curl --compressed -fsSL "${url}")" else if command -v wget >/dev/null 2>&1; then - debug ">" wget -qO - "$url" - checksums="$(wget -qO - "$url")" + debug ">" wget -qO - "${url}" + checksums="$(wget -qO - "${url}")" else error "mise standalone install specific version requires curl or wget but neither is installed. Aborting." fi fi # TODO: verify with minisign or gpg if available - checksum="$(echo "$checksums" | grep "$os-$arch.$ext")" - if ! echo "$checksum" | grep -Eq "^([0-9a-f]{32}|[0-9a-f]{64})"; then - warn "no checksum for mise $version and $os-$arch" + checksum="$(echo "${checksums}" | grep "${os}-${arch}.${ext}")" + if ! echo "${checksum}" | grep -Eq "^([0-9a-f]{32}|[0-9a-f]{64})"; then + warn "no checksum for mise ${version} and ${os}-${arch}" else - echo "$checksum" + echo "${checksum}" fi } @@ -194,26 +203,26 @@ __mise_bootstrap() { download_file() { url="$1" download_dir="$2" - filename="$(basename "$url")" - file="$download_dir/$filename" + filename="$(basename "${url}")" + file="${download_dir}/${filename}" info "mise: installing mise..." if command -v curl >/dev/null 2>&1; then - debug ">" curl -#fLo "$file" "$url" - curl -#fLo "$file" "$url" + debug ">" curl -#fLo "${file}" "${url}" + curl -#fLo "${file}" "${url}" else if command -v wget >/dev/null 2>&1; then - debug ">" wget -qO "$file" "$url" - stderr=$(mktemp) - wget -O "$file" "$url" >"$stderr" 2>&1 || error "wget failed: $(cat "$stderr")" - rm "$stderr" + debug ">" wget -qO "${file}" "${url}" + stderr="$(mktemp)" + wget_output="$(wget -O "${file}" "${url}" 2>&1)" || error "wget failed: ${wget_output}" + rm "${stderr}" else error "mise standalone install requires curl or wget but neither is installed. Aborting." fi fi - echo "$file" + echo "${file}" } # Prints the version of an installed mise binary (the first field of @@ -221,31 +230,33 @@ __mise_bootstrap() { # nothing if the binary is missing or fails to report a version. installed_mise_version() { bin="$1" - if [ -x "$bin" ]; then - installed_version="$("$bin" version 2>/dev/null | head -n1 | cut -d' ' -f1)" - echo "${installed_version#v}" + if [ -x "${bin}" ]; then + bin_version_raw="$("${bin}" version 2>/dev/null || true)" + bin_version_head="$(echo "${bin_version_raw}" | head -n1 || true)" + bin_version="$(echo "${bin_version_head}" | cut -d' ' -f1 || true)" + echo "${bin_version#v}" fi } install_mise() { version="${MISE_VERSION:-${mise_version:-}}" - [ -n "$version" ] || error "mise bootstrap: no mise version resolved; set MISE_VERSION to pin one" + [ -n "${version}" ] || error "mise bootstrap: no mise version resolved; set MISE_VERSION to pin one" version="${version#v}" os="${MISE_INSTALL_OS:-$(get_os)}" arch="${MISE_INSTALL_ARCH:-$(get_arch)}" ext="${MISE_INSTALL_EXT:-$(get_ext)}" - install_path="${MISE_INSTALL_PATH:-$HOME/.local/bin/mise}" - install_dir="$(dirname "$install_path")" + install_path="${MISE_INSTALL_PATH:-${HOME}/.local/bin/mise}" + install_dir="$(dirname "${install_path}")" # Opt-in: skip the download/install if the binary already at the install # path matches the requested version. Only the install path is checked (not # the wider PATH) so that skipping never leaves install_path missing. skip_if_exists="${MISE_INSTALL_SKIP_IF_EXISTS-}" - if [ "$skip_if_exists" = "1" ] || [ "$skip_if_exists" = "true" ]; then - if [ -x "$install_path" ]; then - existing_version="$(installed_mise_version "$install_path")" - if [ -n "$existing_version" ] && [ "$existing_version" = "$version" ]; then - info "mise: $install_path is already at version $version, skipping install" + if [ "${skip_if_exists}" = "1" ] || [ "${skip_if_exists}" = "true" ]; then + if [ -x "${install_path}" ]; then + existing_version="$(installed_mise_version "${install_path}")" + if [ -n "${existing_version}" ] && [ "${existing_version}" = "${version}" ]; then + info "mise: ${install_path} is already at version ${version}, skipping install" return 0 fi fi @@ -253,61 +264,66 @@ __mise_bootstrap() { tarball_url="${MISE_TARBALL_URL:-https://github.com/jdx/mise/releases/download/v${version}/mise-v${version}-${os}-${arch}.${ext}}" download_dir="$(mktemp -d)" - cache_file=$(download_file "$tarball_url" "$download_dir") - debug "mise-setup: tarball=$cache_file" + cache_file=$(download_file "${tarball_url}" "${download_dir}") + debug "mise-setup: tarball=${cache_file}" debug "validating checksum" - cd "$(dirname "$cache_file")" && get_checksum "$version" "$os" "$arch" "$ext" | "$(shasum_bin)" -c >/dev/null + cache_file_dir="$(dirname "${cache_file}")" + cd "${cache_file_dir}" || return 1 + checksum_output="$(get_checksum "${version}" "${os}" "${arch}" "${ext}" || true)" + echo "${checksum_output}" | "$(shasum_bin)" -c >/dev/null # extract tarball - if [ -d "$install_path" ]; then - error "MISE_INSTALL_PATH '$install_path' is a directory. Please set it to a file path, e.g. '$install_path/mise'." + if [ -d "${install_path}" ]; then + error "MISE_INSTALL_PATH '${install_path}' is a directory. Please set it to a file path, e.g. '${install_path}/mise'." fi - mkdir -p "$install_dir" - rm -f "$install_path" + mkdir -p "${install_dir}" + rm -f "${install_path}" extract_dir="$(mktemp -d)" - cd "$extract_dir" - if [ "$ext" = "tar.zst" ] && ! tar_supports_zstd; then - zstd -d -c "$cache_file" | tar --no-same-owner -xf - + cd "${extract_dir}" + if [ "${ext}" = "tar.zst" ] && ! tar_supports_zstd; then + zstd_output="$(zstd -d -c "${cache_file}" 2>/dev/null || true)" + echo "${zstd_output}" | tar --no-same-owner -xf - else - tar --no-same-owner -xf "$cache_file" + tar --no-same-owner -xf "${cache_file}" fi - if [ "$(id -u)" = "0" ]; then + current_uid="$(id -u 2>/dev/null || true)" + if [ "${current_uid}" = "0" ]; then chown 0:0 mise/bin/mise chmod 755 mise/bin/mise fi - mv mise/bin/mise "$install_path" + mv mise/bin/mise "${install_path}" # cleanup - cd / # Move out of $extract_dir before removing it - rm -rf "$download_dir" - rm -rf "$extract_dir" + cd / # Move out of ${extract_dir} before removing it + rm -rf "${download_dir}" + rm -rf "${extract_dir}" - info "mise: installed successfully to $install_path" + info "mise: installed successfully to ${install_path}" } after_finish_help() { case "${SHELL:-}" in */zsh) info "mise: run the following to activate mise in your shell:" - info "echo \"eval \\\"\\\$($install_path activate zsh)\\\"\" >> \"${ZDOTDIR-$HOME}/.zshrc\"" + info "echo \"eval \\\"\\\$(${install_path} activate zsh)\\\"\" >> \"${ZDOTDIR-${HOME}}/.zshrc\"" info "" info "mise: run \`mise doctor\` to verify this is set up correctly" ;; */bash) info "mise: run the following to activate mise in your shell:" - info "echo \"eval \\\"\\\$($install_path activate bash)\\\"\" >> ~/.bashrc" + info "echo \"eval \\\"\\\$(${install_path} activate bash)\\\"\" >> ~/.bashrc" info "" info "mise: run \`mise doctor\` to verify this is set up correctly" ;; */fish) info "mise: run the following to activate mise in your shell:" - info "echo \"$install_path activate fish | source\" >> ~/.config/fish/config.fish" + info "echo \"${install_path} activate fish | source\" >> ~/.config/fish/config.fish" info "" info "mise: run \`mise doctor\` to verify this is set up correctly" ;; *) - info "mise: run \`$install_path --help\` to get started" + info "mise: run \`${install_path} --help\` to get started" ;; esac } @@ -317,10 +333,10 @@ __mise_bootstrap() { after_finish_help fi - cd -- "$initial_working_dir" + cd -- "${initial_working_dir}" } local MISE_INSTALL_HELP=0 - test -f "$MISE_INSTALL_PATH" || install + test -f "${MISE_INSTALL_PATH}" || install } __mise_bootstrap -exec -a "$0" "$MISE_INSTALL_PATH" "$@" +exec -a "$0" "${MISE_INSTALL_PATH}" "$@" diff --git a/examples/__init__.py b/examples/__init__.py index f666bc6e..e127c26c 100644 --- a/examples/__init__.py +++ b/examples/__init__.py @@ -9,8 +9,19 @@ from flext_core.lazy import build_lazy_import_map, install_lazy_exports if TYPE_CHECKING: - from flext_cli import cli, core, d, e, h, lazy_attribute, r, services, x + from flext_cli import cli + from flext_core import ( + core, + d, + e, + h, + lazy, + lazy_attribute, + normalize_lazy_imports, + r, + x, + ) from flext_web import c, config, m, main, p, s, settings, t, u, web from .constants import FlextWebExamplesConstants @@ -33,13 +44,14 @@ "d", "e", "h", + "lazy", "lazy_attribute", "m", "main", + "normalize_lazy_imports", "p", "r", "s", - "services", "settings", "t", "u", @@ -55,15 +67,16 @@ ".protocols": ("FlextWebExamplesProtocols",), ".typings": ("FlextWebExamplesTypes",), ".utilities": ("FlextWebExamplesUtilities",), - "flext_cli": ( - "cli", + "flext_cli": ("cli",), + "flext_core": ( "core", "d", "e", "h", + "lazy", "lazy_attribute", + "normalize_lazy_imports", "r", - "services", "x", ), "flext_web": ( diff --git a/src/flext_web/__init__.py b/src/flext_web/__init__.py index 583bde1d..2cfef34e 100644 --- a/src/flext_web/__init__.py +++ b/src/flext_web/__init__.py @@ -20,7 +20,9 @@ ) if TYPE_CHECKING: - from flext_cli import cli, core, d, e, h, lazy_attribute, r, x + from flext_cli import cli + + from flext_core import core, d, e, h, lazy_attribute, r, x from . import services from ._config import FlextWebConfig, config @@ -107,7 +109,8 @@ ".services.web": ("FlextWebServices",), ".typings": ("FlextWebTypes", "t"), ".utilities": ("FlextWebUtilities", "u"), - "flext_cli": ("cli", "core", "d", "e", "h", "lazy_attribute", "r", "x"), + "flext_cli": ("cli",), + "flext_core": ("core", "d", "e", "h", "lazy_attribute", "r", "x"), }), alias_groups=MappingProxyType({}), sort_keys=False, diff --git a/tests/__init__.py b/tests/__init__.py index 79910b93..14399c9e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -11,24 +11,20 @@ if TYPE_CHECKING: from flext_cli import cli from flext_tests import ( + active_rules, api, - core, - d, - e, - h, + discover_repository_root, install_local_packages, - lazy_attribute, load_infra_report, - r, - services, + split_csv, td, tf, tk, tm, tv, - x, ) + from flext_core import core, d, e, h, lazy_attribute, r, x from flext_web import config, main, s, settings, web from . import fixtures, integration, unit @@ -49,12 +45,14 @@ "TestsFlextWebSettings", "TestsFlextWebTypes", "TestsFlextWebUtilities", + "active_rules", "api", "c", "cli", "config", "core", "d", + "discover_repository_root", "e", "fixtures", "h", @@ -67,8 +65,8 @@ "p", "r", "s", - "services", "settings", + "split_csv", "t", "td", "tf", @@ -95,23 +93,19 @@ ".unit": ("unit",), ".utilities": ("TestsFlextWebUtilities", "u"), "flext_cli": ("cli",), + "flext_core": ("core", "d", "e", "h", "lazy_attribute", "r", "x"), "flext_tests": ( + "active_rules", "api", - "core", - "d", - "e", - "h", + "discover_repository_root", "install_local_packages", - "lazy_attribute", "load_infra_report", - "r", - "services", + "split_csv", "td", "tf", "tk", "tm", "tv", - "x", ), "flext_web": ("config", "main", "s", "settings", "web"), }), diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index 32cf6ef4..92a8c754 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -11,9 +11,7 @@ _LAZY_IMPORTS = MappingProxyType( build_lazy_import_map( - MappingProxyType({}), - alias_groups=MappingProxyType({}), - sort_keys=False, + MappingProxyType({}), alias_groups=MappingProxyType({}), sort_keys=False ) ) diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index f090d7fe..6b84ab25 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -11,9 +11,7 @@ _LAZY_IMPORTS = MappingProxyType( build_lazy_import_map( - MappingProxyType({}), - alias_groups=MappingProxyType({}), - sort_keys=False, + MappingProxyType({}), alias_groups=MappingProxyType({}), sort_keys=False ) ) From 5bc4241d072e7c1b6dca1d3a80fbfacd95580de7 Mon Sep 17 00:00:00 2001 From: Marlon Costa Date: Wed, 23 Sep 2026 14:00:03 -0300 Subject: [PATCH 3/4] fixes --- tests/integration/__init__.py | 4 +++- tests/unit/__init__.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index 92a8c754..32cf6ef4 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -11,7 +11,9 @@ _LAZY_IMPORTS = MappingProxyType( build_lazy_import_map( - MappingProxyType({}), alias_groups=MappingProxyType({}), sort_keys=False + MappingProxyType({}), + alias_groups=MappingProxyType({}), + sort_keys=False, ) ) diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index 6b84ab25..f090d7fe 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -11,7 +11,9 @@ _LAZY_IMPORTS = MappingProxyType( build_lazy_import_map( - MappingProxyType({}), alias_groups=MappingProxyType({}), sort_keys=False + MappingProxyType({}), + alias_groups=MappingProxyType({}), + sort_keys=False, ) ) From 37bc979a0d51ddca064892f2e4dd246ff15e9481 Mon Sep 17 00:00:00 2001 From: Marlon Costa Date: Wed, 23 Sep 2026 14:34:07 -0300 Subject: [PATCH 4/4] chore(gen): fixed point regeneration --- examples/__init__.py | 23 +++++------------------ src/flext_web/__init__.py | 7 ++----- tests/__init__.py | 28 +++++++++++++++++----------- 3 files changed, 24 insertions(+), 34 deletions(-) diff --git a/examples/__init__.py b/examples/__init__.py index e127c26c..f666bc6e 100644 --- a/examples/__init__.py +++ b/examples/__init__.py @@ -9,19 +9,8 @@ from flext_core.lazy import build_lazy_import_map, install_lazy_exports if TYPE_CHECKING: - from flext_cli import cli + from flext_cli import cli, core, d, e, h, lazy_attribute, r, services, x - from flext_core import ( - core, - d, - e, - h, - lazy, - lazy_attribute, - normalize_lazy_imports, - r, - x, - ) from flext_web import c, config, m, main, p, s, settings, t, u, web from .constants import FlextWebExamplesConstants @@ -44,14 +33,13 @@ "d", "e", "h", - "lazy", "lazy_attribute", "m", "main", - "normalize_lazy_imports", "p", "r", "s", + "services", "settings", "t", "u", @@ -67,16 +55,15 @@ ".protocols": ("FlextWebExamplesProtocols",), ".typings": ("FlextWebExamplesTypes",), ".utilities": ("FlextWebExamplesUtilities",), - "flext_cli": ("cli",), - "flext_core": ( + "flext_cli": ( + "cli", "core", "d", "e", "h", - "lazy", "lazy_attribute", - "normalize_lazy_imports", "r", + "services", "x", ), "flext_web": ( diff --git a/src/flext_web/__init__.py b/src/flext_web/__init__.py index 2cfef34e..583bde1d 100644 --- a/src/flext_web/__init__.py +++ b/src/flext_web/__init__.py @@ -20,9 +20,7 @@ ) if TYPE_CHECKING: - from flext_cli import cli - - from flext_core import core, d, e, h, lazy_attribute, r, x + from flext_cli import cli, core, d, e, h, lazy_attribute, r, x from . import services from ._config import FlextWebConfig, config @@ -109,8 +107,7 @@ ".services.web": ("FlextWebServices",), ".typings": ("FlextWebTypes", "t"), ".utilities": ("FlextWebUtilities", "u"), - "flext_cli": ("cli",), - "flext_core": ("core", "d", "e", "h", "lazy_attribute", "r", "x"), + "flext_cli": ("cli", "core", "d", "e", "h", "lazy_attribute", "r", "x"), }), alias_groups=MappingProxyType({}), sort_keys=False, diff --git a/tests/__init__.py b/tests/__init__.py index 14399c9e..79910b93 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -11,20 +11,24 @@ if TYPE_CHECKING: from flext_cli import cli from flext_tests import ( - active_rules, api, - discover_repository_root, + core, + d, + e, + h, install_local_packages, + lazy_attribute, load_infra_report, - split_csv, + r, + services, td, tf, tk, tm, tv, + x, ) - from flext_core import core, d, e, h, lazy_attribute, r, x from flext_web import config, main, s, settings, web from . import fixtures, integration, unit @@ -45,14 +49,12 @@ "TestsFlextWebSettings", "TestsFlextWebTypes", "TestsFlextWebUtilities", - "active_rules", "api", "c", "cli", "config", "core", "d", - "discover_repository_root", "e", "fixtures", "h", @@ -65,8 +67,8 @@ "p", "r", "s", + "services", "settings", - "split_csv", "t", "td", "tf", @@ -93,19 +95,23 @@ ".unit": ("unit",), ".utilities": ("TestsFlextWebUtilities", "u"), "flext_cli": ("cli",), - "flext_core": ("core", "d", "e", "h", "lazy_attribute", "r", "x"), "flext_tests": ( - "active_rules", "api", - "discover_repository_root", + "core", + "d", + "e", + "h", "install_local_packages", + "lazy_attribute", "load_infra_report", - "split_csv", + "r", + "services", "td", "tf", "tk", "tm", "tv", + "x", ), "flext_web": ("config", "main", "s", "settings", "web"), }),