From dcd60b9d5086415c4edc15037d8c6be8b79d0642 Mon Sep 17 00:00:00 2001 From: Daniel Gaspar Date: Tue, 20 Feb 2024 11:30:53 +0000 Subject: [PATCH 1/2] fix: setting important lower bounds versions on requirements --- requirements/base.in | 3 +++ requirements/base.txt | 8 ++++++-- requirements/docker.in | 3 +-- requirements/docker.txt | 4 ++-- requirements/testing.in | 1 + requirements/testing.txt | 3 ++- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 9d8313823765..7bb37e9a2e39 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -17,3 +17,6 @@ # under the License. # -e file:. +paramiko>=3.4.0 +urllib3>=1.26.18 +werkzeug>=3.0.1 diff --git a/requirements/base.txt b/requirements/base.txt index f32e509db1da..71ac45419132 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:a9dde048f1ee1f00586264d726d0e89f16e56183 +# SHA1:73c239670fa72655a98ca0fede0b97148b116b19 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -232,7 +232,9 @@ packaging==23.1 pandas[performance]==2.0.3 # via apache-superset paramiko==3.4.0 - # via sshtunnel + # via + # -r requirements/base.in + # sshtunnel parsedatetime==2.6 # via apache-superset pgsanity==0.2.9 @@ -358,6 +360,7 @@ url-normalize==1.4.3 # via requests-cache urllib3==1.26.18 # via + # -r requirements/base.in # requests # requests-cache # selenium @@ -370,6 +373,7 @@ wcwidth==0.2.5 # via prompt-toolkit werkzeug==3.0.1 # via + # -r requirements/base.in # flask # flask-appbuilder # flask-jwt-extended diff --git a/requirements/docker.in b/requirements/docker.in index b7e893f3e9c3..5b65cc68718f 100644 --- a/requirements/docker.in +++ b/requirements/docker.in @@ -15,6 +15,5 @@ # limitations under the License. # -r base.in --e .[postgres] -gevent +-e .[postgres,gevent] greenlet>=2.0.2 diff --git a/requirements/docker.txt b/requirements/docker.txt index be65b7d36b1b..27c135e04c75 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -1,4 +1,4 @@ -# SHA1:439e3ee196ce81f342c935117ba5e0eeee8c385b +# SHA1:f00a57c70a52607d638c19f64f426f887382927e # # This file is autogenerated by pip-compile-multi # To update, run: @@ -11,7 +11,7 @@ # -r requirements/base.in # -r requirements/docker.in gevent==23.9.1 - # via -r requirements/docker.in + # via apache-superset psycopg2-binary==2.9.6 # via apache-superset zope-event==4.5.0 diff --git a/requirements/testing.in b/requirements/testing.in index 5b498bb09005..3245886ec854 100644 --- a/requirements/testing.in +++ b/requirements/testing.in @@ -20,6 +20,7 @@ docker flask-testing freezegun +grpcio>=1.55.3 openapi-spec-validator parameterized pyfakefs diff --git a/requirements/testing.txt b/requirements/testing.txt index 1e7215e00098..634616df4b2c 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,4 +1,4 @@ -# SHA1:95300275481abb1413eb98a5c79fb7cf96814cdd +# SHA1:a37a1037f359c1101162ef43288178fbf00c487d # # This file is autogenerated by pip-compile-multi # To update, run: @@ -62,6 +62,7 @@ googleapis-common-protos==1.59.0 # grpcio-status grpcio==1.60.1 # via + # -r requirements/testing.in # google-api-core # google-cloud-bigquery # grpcio-status From 6e11ea1fd62310333ea9ff2fca3459beb450c133 Mon Sep 17 00:00:00 2001 From: Daniel Gaspar Date: Thu, 22 Feb 2024 08:59:19 +0000 Subject: [PATCH 2/2] add paramiko to setup.py --- requirements/base.in | 1 - requirements/base.txt | 4 ++-- setup.py | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 7bb37e9a2e39..6ecbbb51d66b 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -17,6 +17,5 @@ # under the License. # -e file:. -paramiko>=3.4.0 urllib3>=1.26.18 werkzeug>=3.0.1 diff --git a/requirements/base.txt b/requirements/base.txt index 71ac45419132..6cd21291ad9d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:73c239670fa72655a98ca0fede0b97148b116b19 +# SHA1:60b260247b40133819664dc998d9e2da48e9a592 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -233,7 +233,7 @@ pandas[performance]==2.0.3 # via apache-superset paramiko==3.4.0 # via - # -r requirements/base.in + # apache-superset # sshtunnel parsedatetime==2.6 # via apache-superset diff --git a/setup.py b/setup.py index 3917d8a3f2f3..13955a3d86ba 100644 --- a/setup.py +++ b/setup.py @@ -108,6 +108,7 @@ def get_git_sha() -> str: "packaging", "pandas[performance]>=2.0.3, <2.1", "parsedatetime", + "paramiko>=3.4.0", "pgsanity", "polyline>=2.0.0, <3.0", "pyparsing>=3.0.6, <4",