This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to branch run_p_c_m in repository https://gitbox.apache.org/repos/asf/superset.git
commit e22f942e71e72eaf2cca336cc62724f5f20c4c6c Author: Maxime Beauchemin <[email protected]> AuthorDate: Tue Apr 2 20:49:16 2024 -0700 fix: run pip-compile-multi --no-upgrade I think I might have done some bad merge conflict resolution while rebasing the branch. It was conflicting all over the place and likely made a mistake merging --- requirements/base.txt | 4 +--- requirements/development.txt | 11 ++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index f9c91091f8..0bdb637651 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -148,9 +148,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.txt b/requirements/development.txt index 929c9d6b5f..fc0e4dae67 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -203,7 +203,9 @@ ptyprocess==0.7.0 pure-eval==0.2.2 # via stack-data pure-sasl==0.6.2 - # via thrift-sasl + # via + # pyhive + # thrift-sasl pydata-google-auth==1.7.0 # via pandas-gbq pydruid==0.6.6 @@ -212,7 +214,7 @@ pyee==11.0.1 # via playwright pyfakefs==5.2.2 # via apache-superset -pyhive[presto]==0.7.0 +pyhive[hive_pure_sasl]==0.7.0 # via apache-superset pyinstrument==4.4.0 # via apache-superset @@ -256,9 +258,12 @@ tableschema==1.20.10 thrift==0.16.0 # via # apache-superset + # pyhive # thrift-sasl thrift-sasl==0.4.3 - # via apache-superset + # via + # apache-superset + # pyhive tomli==2.0.1 # via # build
