point of no return

apache · Mar 28, 2024 · 3860d31 · 3860d31
1 parent 3c0fcca
commit 3860d31
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 70 deletions.
diff --git a/.github/workflows/bump-python-package.yml b/.github/workflows/bump-python-package.yml
@@ -39,23 +39,11 @@ jobs:
       - name: Setup supersetbot
         uses: ./.github/actions/setup-supersetbot/
 
-      ######################
-      # DELETE ME
-      - name: cp pyproject
-        run: cp pyproject.toml /tmp
-      ######################
-
       - name: "Checkout `master` ( ${{ github.sha }} )"
         uses: actions/checkout@v4
         with:
           ref: master
 
-      ######################
-      # DELETE ME
-      - name: cp pyproject back
-        run: cp /tmp/pyproject.toml ./
-      ######################
-
       - name: Install pip-compile-multi
         run: pip install pip-compile-multi
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -169,6 +169,29 @@ vertica = ["sqlalchemy-vertica-python>=0.5.9, < 0.6"]
 netezza = ["nzalchemy>=11.0.2"]
 starrocks = ["starrocks>=1.0.0"]
 doris = ["pydoris>=1.0.0, <2.0.0"]
+development = [
+    "docker",
+    "flask-testing",
+    "freezegun",
+    "greenlet>=2.0.2",
+    "grpcio>=1.55.3",
+    "ipython",
+    "openapi-spec-validator",
+    "parameterized",
+    "pip-compile-multi",
+    "pre-commit",
+    "progress>=1.5,<2",
+    "pyfakefs",
+    "pyinstrument>=4.0.2,<5",
+    "pylint",
+    "pytest",
+    "pytest-cov",
+    "pytest-mock",
+    "python-ldap>=3.4.3",
+    "sqloxide",
+    "statsd",
+    "tox",
+]
 
 [project.urls]
 homepage = "https://superset.apache.org/"

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -147,9 +147,7 @@ geopy==2.4.1
 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

diff --git a/requirements/development.in b/requirements/development.in
@@ -17,26 +17,4 @@
 # under the License.
 #
 -r base.in
--e .[bigquery,cors,druid,gevent,gsheets,hive,mysql,playwright,postgres,presto,prophet,trino,thumbnails]
-
-docker
-flask-testing
-freezegun
-greenlet>=2.0.2
-grpcio>=1.55.3
-ipython
-openapi-spec-validator
-parameterized
-pip-compile-multi
-pre-commit
-progress>=1.5,<2
-pyfakefs
-pyinstrument>=4.0.2,<5
-pylint
-pytest
-pytest-cov
-pytest-mock
-python-ldap>=3.4.3
-sqloxide
-statsd
-tox
+-e .[development,bigquery,cors,druid,gevent,gsheets,hive,mysql,playwright,postgres,presto,prophet,trino,thumbnails]
diff --git a/requirements/development.txt b/requirements/development.txt
@@ -1,4 +1,4 @@
-# SHA1:3b6a7d105f9d14b449d4232aa368bd6a40d4c7ef
+# SHA1:c186006a3f82c8775e1039f37c52309f6c858197
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -51,7 +51,7 @@ dill==0.3.6
 distlib==0.3.6
     # via virtualenv
 docker==6.1.1
-    # via -r requirements/development.in
+    # via apache-superset
 et-xmlfile==1.1.0
     # via openpyxl
 executing==1.2.0
@@ -63,11 +63,11 @@ filelock==3.12.2
 flask-cors==3.0.10
     # via apache-superset
 flask-testing==0.8.1
-    # via -r requirements/development.in
+    # via apache-superset
 fonttools==4.43.0
     # via matplotlib
 freezegun==1.2.2
-    # via -r requirements/development.in
+    # via apache-superset
 future==0.18.3
     # via
     #   pyhive
@@ -106,7 +106,7 @@ googleapis-common-protos==1.59.0
     #   grpcio-status
 grpcio==1.60.1
     # via
-    #   -r requirements/development.in
+    #   apache-superset
     #   google-api-core
     #   google-cloud-bigquery
     #   grpcio-status
@@ -119,7 +119,7 @@ ijson==3.2.0.post0
 iniconfig==2.0.0
     # via pytest
 ipython==8.12.2
-    # via -r requirements/development.in
+    # via apache-superset
 isort==5.12.0
     # via pylint
 jedi==0.18.2
@@ -155,13 +155,13 @@ oauthlib==3.2.2
 openapi-schema-validator==0.4.4
     # via openapi-spec-validator
 openapi-spec-validator==0.5.6
-    # via -r requirements/development.in
+    # via apache-superset
 openpyxl==3.1.2
     # via tabulator
 pandas-gbq==0.19.1
     # via apache-superset
 parameterized==0.9.0
-    # via -r requirements/development.in
+    # via apache-superset
 parso==0.8.3
     # via jedi
 pathable==0.4.3
@@ -175,7 +175,7 @@ pillow==10.2.0
     #   apache-superset
     #   matplotlib
 pip-compile-multi==2.6.3
-    # via -r requirements/development.in
+    # via apache-superset
 pip-tools==7.3.0
     # via pip-compile-multi
 playwright==1.41.2
@@ -185,9 +185,9 @@ pluggy==1.2.0
     #   pytest
     #   tox
 pre-commit==3.3.3
-    # via -r requirements/development.in
+    # via apache-superset
 progress==1.6
-    # via -r requirements/development.in
+    # via apache-superset
 prophet==1.1.5
     # via apache-superset
 proto-plus==1.22.2
@@ -208,39 +208,35 @@ ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.2
     # via stack-data
-pure-sasl==0.6.2
-    # via
-    #   pyhive
-    #   thrift-sasl
 pydata-google-auth==1.7.0
     # via pandas-gbq
 pydruid==0.6.5
     # via apache-superset
 pyee==11.0.1
     # via playwright
 pyfakefs==5.2.2
-    # via -r requirements/development.in
-pyhive[hive_pure_sasl]==0.7.0
+    # via apache-superset
+pyhive[presto]==0.7.0
     # via apache-superset
 pyinstrument==4.4.0
-    # via -r requirements/development.in
+    # via apache-superset
 pylint==2.17.7
-    # via -r requirements/development.in
+    # via apache-superset
 pyproject-api==1.5.2
     # via tox
 pyproject-hooks==1.0.0
     # via build
 pytest==7.3.1
     # via
-    #   -r requirements/development.in
+    #   apache-superset
     #   pytest-cov
     #   pytest-mock
 pytest-cov==4.0.0
-    # via -r requirements/development.in
+    # via apache-superset
 pytest-mock==3.10.0
-    # via -r requirements/development.in
+    # via apache-superset
 python-ldap==3.4.3
-    # via -r requirements/development.in
+    # via apache-superset
 pytz-deprecation-shim==0.1.0.post0
     # via tzlocal
 requests-oauthlib==1.3.1
@@ -254,22 +250,17 @@ s3transfer==0.6.1
 sqlalchemy-bigquery==1.6.1
     # via apache-superset
 sqloxide==0.1.33
-    # via -r requirements/development.in
+    # via apache-superset
 stack-data==0.6.2
     # via ipython
 statsd==4.0.1
-    # via -r requirements/development.in
+    # via apache-superset
 tableschema==1.20.2
     # via apache-superset
 tabulator==1.53.5
     # via tableschema
 thrift==0.16.0
-    # via
-    #   apache-superset
-    #   pyhive
-    #   thrift-sasl
-thrift-sasl==0.4.3
-    # via pyhive
+    # via apache-superset
 tomli==2.0.1
     # via
     #   build
@@ -285,7 +276,7 @@ tomlkit==0.11.8
 toposort==1.10
     # via pip-compile-multi
 tox==4.6.4
-    # via -r requirements/development.in
+    # via apache-superset
 tqdm==4.65.0
     # via
     #   cmdstanpy