diff --git a/.github/actions/setup-backend/action.yml b/.github/actions/setup-backend/action.yml index db3ff7a78..1910f4851 100644 --- a/.github/actions/setup-backend/action.yml +++ b/.github/actions/setup-backend/action.yml @@ -42,12 +42,12 @@ runs: - name: Install dependencies run: | if [ "${{ inputs.install-superset }}" = "true" ]; then - sudo apt-get update && sudo apt-get -y install libldap2-dev libsasl2-dev build-essential - pip install --upgrade pip setuptools wheel + sudo apt-get update && sudo apt-get -y install libldap2-dev libsasl2-dev + pip install --upgrade pip setuptools wheel uv if [ "${{ inputs.requirements-type }}" = "dev" ]; then - pip install -r requirements/development.txt + uv pip install --system -r requirements/development.txt elif [ "${{ inputs.requirements-type }}" = "base" ]; then - pip install -r requirements/base.txt + uv pip install --system -r requirements/base.txt fi fi shell: bash diff --git a/Dockerfile b/Dockerfile index 9a89cef35..60ba12eab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,7 +85,7 @@ RUN if [ "$BUILD_TRANSLATIONS" = "true" ]; then \ # Transition to Python base image FROM python:${PY_VER} AS python-base -RUN pip install --no-cache-dir --upgrade setuptools pip +RUN pip install --no-cache-dir --upgrade setuptools pip uv ###################################################################### # Final lean image... @@ -191,7 +191,7 @@ RUN --mount=type=bind,source=./docker,target=/docker \ # Install Playwright and its dependencies RUN --mount=type=cache,target=/root/.cache/pip \ - pip install playwright \ + uv pip install --system playwright \ && playwright install-deps # Optionally install Chromium diff --git a/docker/pip-install.sh b/docker/pip-install.sh index 2defc7d1e..7e69a6efb 100755 --- a/docker/pip-install.sh +++ b/docker/pip-install.sh @@ -47,10 +47,10 @@ fi # Choose whether to use pip cache if $USE_CACHE; then echo "Using pip cache..." - pip install "${ARGS[@]}" + uv pip install --system "${ARGS[@]}" else echo "Disabling pip cache..." - pip install --no-cache-dir "${ARGS[@]}" + uv pip install --system --no-cache-dir "${ARGS[@]}" fi # Remove build-essential if it was installed diff --git a/superset/__init__.py b/superset/__init__.py index cbab58e0d..c97580b12 100644 --- a/superset/__init__.py +++ b/superset/__init__.py @@ -34,7 +34,8 @@ from superset.security import SupersetSecurityManager # noqa: F401 # All of the fields located here should be considered legacy. The correct way # to declare "global" dependencies is to define it in extensions.py, # then initialize it in app.create_app(). These fields will be removed -# in subsequent PRs as things are migrated towards the factory pattern +# in subsequent PRs as things are migrated towards the factory +# pattern app: Flask = current_app cache = cache_manager.cache conf = LocalProxy(lambda: current_app.config)