From d68a32af5fd69947f0630ab43b64f8f4c79d3880 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 5 Mar 2024 18:08:44 -0800 Subject: [PATCH 1/4] 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 fc3e66703783e..084967798bf5f 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 0df7e08041ee5..2479692d36723 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 d939d085a0295..102a13022feda 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 463781a1f21c9..adb22a3f5e75a 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 27c135e04c757..39026ce161394 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 ce55c02b8b2e5..a17dbc42d825b 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 c4bd3cd599b36..f49e02645d60f 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 55e03e44706da..4353d39b8236e 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 From 5edb3647ccb6541dd1e8006b7ebda380c017b5d3 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 6 Mar 2024 08:50:56 -0800 Subject: [PATCH 2/4] && --- 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 ++++ 7 files changed, 21 insertions(+) diff --git a/requirements/base.txt b/requirements/base.txt index 2479692d36723..0df7e08041ee5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -399,3 +399,6 @@ 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 102a13022feda..d939d085a0295 100644 --- a/requirements/development.in +++ b/requirements/development.in @@ -23,4 +23,5 @@ 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 adb22a3f5e75a..463781a1f21c9 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -127,3 +127,6 @@ 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 39026ce161394..27c135e04c757 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -18,3 +18,6 @@ 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 a17dbc42d825b..ce55c02b8b2e5 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -68,3 +68,7 @@ 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 f49e02645d60f..c4bd3cd599b36 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -10,3 +10,6 @@ # 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 4353d39b8236e..55e03e44706da 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -141,3 +141,7 @@ 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 From 9670244cc2455417dac73e093c2fbf6bdc7831e0 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 6 Mar 2024 08:55:11 -0800 Subject: [PATCH 3/4] typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 084967798bf5f..515e823e7297a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,7 +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 --upgrade setuptools pip && \ pip install -r requirements/local.txt COPY --chown=superset:superset --from=superset-node /app/superset/static/assets superset/static/assets From 489ff0c3e90ff414e27ee1c29570e2e8e3ed828f Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 6 Mar 2024 10:49:32 -0800 Subject: [PATCH 4/4] remove setuptools from development.in and run pip-compile-multi --no-upgrade --- requirements/base.txt | 14 +++++++++----- requirements/development.in | 1 - requirements/development.txt | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 0df7e08041ee5..77521e92303de 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 d939d085a0295..102a13022feda 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 463781a1f21c9..c4c6ee9840b32 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