Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/actions/setup-backend/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ runs:
shell: bash
run: |
if [ "${{ inputs.python-version }}" = "current" ]; then
echo "PYTHON_VERSION=3.10" >> $GITHUB_ENV
elif [ "${{ inputs.python-version }}" = "next" ]; then
echo "PYTHON_VERSION=3.11" >> $GITHUB_ENV
elif [ "${{ inputs.python-version }}" = "next" ]; then
echo "PYTHON_VERSION=3.12.7" >> $GITHUB_ENV
elif [ "${{ inputs.python-version }}" = "previous" ]; then
echo "PYTHON_VERSION=3.9" >> $GITHUB_ENV
echo "PYTHON_VERSION=3.10" >> $GITHUB_ENV
else
echo "PYTHON_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV
fi
Expand All @@ -43,13 +43,15 @@ runs:
run: |
if [ "${{ inputs.install-superset }}" = "true" ]; then
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
uv pip install --system -r requirements/development.txt
REQS=requirements/development.txt
elif [ "${{ inputs.requirements-type }}" = "base" ]; then
uv pip install --system -r requirements/base.txt
REQS=requirements/base.txt
fi
uv pip install --system -r $REQS

uv pip install --system -e .
fi
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
######################################################################
# Node stage to deal with static asset construction
######################################################################
ARG PY_VER=3.10-slim-bookworm
ARG PY_VER=3.11-slim-bookworm

# If BUILDPLATFORM is null, set it to 'amd64' (or leave as is otherwise).
ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64}
Expand Down
16 changes: 9 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ name = "apache-superset"
description = "A modern, enterprise-ready business intelligence web application"
readme = "README.md"
dynamic = ["version", "scripts", "entry-points"]
requires-python = ">=3.9"
requires-python = ">=3.10"
license = { file="LICENSE.txt" }
authors = [
{ name = "Apache Software Foundation", email = "[email protected]" },
]
classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"backoff>=1.8.0",
Expand Down Expand Up @@ -67,11 +67,12 @@ dependencies = [
"markdown>=3.0",
"msgpack>=1.0.0, <1.1",
"nh3>=0.2.11, <0.3",
"numpy==1.23.5",
"numpy>=1.23.5, <2",
"packaging",
# --------------------------
# pandas and related (wanting pandas[performance] without numba as it's 100+MB and not needed)
"pandas[excel]>=2.0.3, <2.1",
# upper bounding at 2.2 as df.to_sql changes sqlalchemy type compatibility
"pandas[excel]>=2.0.3, <2.2",
"bottleneck",
# --------------------------
"parsedatetime",
Expand All @@ -98,7 +99,8 @@ dependencies = [
#https://github.com/tobymao/sqlglot/blob/main/CHANGELOG.md#v25250---2024-10-14
"sqlglot>=25.24.0,<25.25.0",
"sqlparse>=0.5.0",
"tabulate>=0.8.9, <0.9",
# newer pandas needs 0.9+
"tabulate>=0.9.0, <1.0",
"typing-extensions>=4, <5",
"waitress; sys_platform == 'win32'",
"wtforms>=2.3.3, <4",
Expand Down Expand Up @@ -275,8 +277,8 @@ exclude = [
line-length = 88
indent-width = 4

# Assume Python 3.9
target-version = "py39"
# Assume Python 3.10
target-version = "py310"

[tool.ruff.lint]
# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.
Expand Down
6 changes: 2 additions & 4 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,5 @@ numexpr>=2.9.0
# -> https://github.com/aio-libs/async-timeout/blob/master/CHANGES.rst#500-2024-10-31
async_timeout>=4.0.0,<5.0.0

# playwright requires greenlet==3.0.3
# submitted a PR to relax deps in 11/2024
# https://github.com/microsoft/playwright-python/pull/2669
greenlet==3.0.3
# needed for python 3.12 support
openapi-schema-validator>=0.6.2
41 changes: 26 additions & 15 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ apispec==6.3.0
apsw==3.46.0.0
# via shillelagh
async-timeout==4.0.3
# via
# -r requirements/base.in
# redis
# via -r requirements/base.in
attrs==24.2.0
# via
# cattrs
# jsonschema
# referencing
# requests-cache
babel==2.16.0
# via flask-babel
Expand Down Expand Up @@ -92,8 +91,6 @@ email-validator==2.2.0
# via flask-appbuilder
et-xmlfile==2.0.0
# via openpyxl
exceptiongroup==1.2.2
# via cattrs
flask==2.3.3
# via
# apache-superset (pyproject.toml)
Expand Down Expand Up @@ -146,7 +143,6 @@ google-auth==2.36.0
# via shillelagh
greenlet==3.0.3
# via
# -r requirements/base.in
# apache-superset (pyproject.toml)
# shillelagh
gunicorn==23.0.0
Expand Down Expand Up @@ -177,8 +173,14 @@ jinja2==3.1.4
# flask-babel
jsonpath-ng==1.7.0
# via apache-superset (pyproject.toml)
jsonschema==4.17.3
# via flask-appbuilder
jsonschema==4.23.0
# via
# flask-appbuilder
# openapi-schema-validator
jsonschema-specifications==2023.12.1
# via
# jsonschema
# openapi-schema-validator
kombu==5.4.2
# via celery
korean-lunar-calendar==0.3.1
Expand Down Expand Up @@ -215,7 +217,7 @@ nh3==0.2.19
# via apache-superset (pyproject.toml)
numexpr==2.10.2
# via -r requirements/base.in
numpy==1.23.5
numpy==1.26.4
# via
# apache-superset (pyproject.toml)
# bottleneck
Expand All @@ -224,6 +226,8 @@ numpy==1.23.5
# pyarrow
odfpy==1.4.1
# via pandas
openapi-schema-validator==0.6.2
# via -r requirements/base.in
openpyxl==3.1.5
# via pandas
ordered-set==4.1.0
Expand All @@ -238,7 +242,7 @@ packaging==24.2
# marshmallow
# marshmallow-sqlalchemy
# shillelagh
pandas==2.0.3
pandas==2.1.4
# via apache-superset (pyproject.toml)
paramiko==3.5.0
# via
Expand Down Expand Up @@ -281,8 +285,6 @@ pyopenssl==24.2.1
# via shillelagh
pyparsing==3.2.0
# via apache-superset (pyproject.toml)
pyrsistent==0.20.0
# via jsonschema
python-dateutil==2.9.0.post0
# via
# apache-superset (pyproject.toml)
Expand All @@ -309,14 +311,24 @@ pyyaml==6.0.2
# apispec
redis==4.6.0
# via apache-superset (pyproject.toml)
referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
requests==2.32.2
# via
# requests-cache
# shillelagh
requests-cache==1.2.0
# via shillelagh
rfc3339-validator==0.1.4
# via openapi-schema-validator
rich==13.9.4
# via flask-limiter
rpds-py==0.22.3
# via
# jsonschema
# referencing
rsa==4.9
# via google-auth
selenium==3.141.0
Expand All @@ -331,6 +343,7 @@ six==1.16.0
# via
# prison
# python-dateutil
# rfc3339-validator
# url-normalize
# wtforms-json
slack-sdk==3.33.4
Expand All @@ -354,16 +367,14 @@ sqlparse==0.5.2
# via apache-superset (pyproject.toml)
sshtunnel==0.4.0
# via apache-superset (pyproject.toml)
tabulate==0.8.10
tabulate==0.9.0
# via apache-superset (pyproject.toml)
typing-extensions==4.12.2
# via
# apache-superset (pyproject.toml)
# alembic
# cattrs
# flask-limiter
# limits
# rich
# shillelagh
tzdata==2024.2
# via
Expand Down
Loading
Loading