This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to branch upgrade_setuptools in repository https://gitbox.apache.org/repos/asf/superset.git
commit d68a32af5fd69947f0630ab43b64f8f4c79d3880 Author: Maxime Beauchemin <[email protected]> AuthorDate: Tue Mar 5 18:08:44 2024 -0800 chore: upgrade setuptools/pip in Dockerfile Removing setuptools from requirements/development.in as it's bad practice to touch the setuptools while setting up tools, and moving that to the Dockerfile, insuring latest pip and setuptools there --- Dockerfile | 1 + requirements/base.txt | 3 --- requirements/development.in | 1 - requirements/development.txt | 3 --- requirements/docker.txt | 3 --- requirements/integration.txt | 4 ---- requirements/local.txt | 3 --- requirements/testing.txt | 4 ---- 8 files changed, 1 insertion(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc3e667037..084967798b 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..2479692d36 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -399,6 +399,3 @@ xlsxwriter==3.0.7 # via apache-superset zipp==3.15.0 # via importlib-metadata - -# 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..adb22a3f5e 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -127,6 +127,3 @@ unicodecsv==0.14.1 # tabulator xlrd==2.0.1 # via tabulator - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/docker.txt b/requirements/docker.txt index 27c135e04c..39026ce161 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -18,6 +18,3 @@ zope-event==4.5.0 # via gevent zope-interface==5.4.0 # via gevent - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/integration.txt b/requirements/integration.txt index ce55c02b8b..a17dbc42d8 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -68,7 +68,3 @@ virtualenv==20.23.1 # tox wheel==0.40.0 # via pip-tools - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements/local.txt b/requirements/local.txt index c4bd3cd599..f49e02645d 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -10,6 +10,3 @@ # via # -r requirements/base.in # -r requirements/development.in - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/testing.txt b/requirements/testing.txt index 55e03e4470..4353d39b82 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -141,7 +141,3 @@ tzlocal==4.3 # via trino websocket-client==1.5.1 # via docker - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools
