diff --git a/Dockerfile b/Dockerfile index fc3e667037..515e823e72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,6 +83,7 @@ RUN --mount=type=bind,target=./requirements/local.txt,src=./requirements/local.t --mount=type=bind,target=./requirements/development.txt,src=./requirements/development.txt \ --mount=type=bind,target=./requirements/base.txt,src=./requirements/base.txt \ --mount=type=cache,target=/root/.cache/pip \ + pip install --upgrade setuptools pip && \ pip install -r requirements/local.txt COPY --chown=superset:superset --from=superset-node /app/superset/static/assets superset/static/assets diff --git a/requirements/base.txt b/requirements/base.txt index 0df7e08041..77521e9230 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -145,9 +145,7 @@ geopy==2.2.0 google-auth==2.27.0 # via shillelagh greenlet==3.0.3 - # via - # shillelagh - # sqlalchemy + # via shillelagh gunicorn==21.2.0 # via apache-superset hashids==1.3.1 @@ -161,7 +159,10 @@ idna==3.2 # email-validator # requests importlib-metadata==6.6.0 - # via apache-superset + # via + # apache-superset + # flask + # shillelagh importlib-resources==5.12.0 # via limits isodate==0.6.0 @@ -357,6 +358,7 @@ typing-extensions==4.4.0 # apache-superset # cattrs # flask-limiter + # kombu # limits # shillelagh tzdata==2023.3 @@ -398,7 +400,9 @@ wtforms-json==0.3.5 xlsxwriter==3.0.7 # via apache-superset zipp==3.15.0 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/development.in b/requirements/development.in index d939d085a0..102a13022f 100644 --- a/requirements/development.in +++ b/requirements/development.in @@ -23,5 +23,4 @@ progress>=1.5,<2 pyinstrument>=4.0.2,<5 pylint python-ldap>=3.4.3 -setuptools>=65.5.1 sqloxide diff --git a/requirements/development.txt b/requirements/development.txt index 463781a1f2..c4c6ee9840 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:e35d6e709dc86002ca35ad59f7119aa6cc1e7179 +# SHA1:5d8f94148b758249eecc1e6a9b2f3ffde15815ad # # This file is autogenerated by pip-compile-multi # To update, run: @@ -10,6 +10,8 @@ # via # -r requirements/base.in # -r requirements/development.in +appnope==0.1.4 + # via ipython astroid==2.15.8 # via pylint asttokens==2.2.1