diff --git a/requirements/base.in b/requirements/base.in index debdc6762cbaf..9d8313823765a 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -15,10 +15,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# -e file:. -pyrsistent>=0.16.1,<0.17 -zipp==3.4.1 -sasl==0.3.1 -wrapt==1.12.1 # required by astroid<2.9 until we bump pylint -aiohttp==3.8.1 -charset-normalizer==2.0.4 diff --git a/requirements/base.txt b/requirements/base.txt index 6b133eec5e02f..ea9e8f7a8480d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:8c236813f9d0bf56d87d845cbffd6ca3f07c3e14 +# SHA1:a9dde048f1ee1f00586264d726d0e89f16e56183 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -8,9 +8,7 @@ -e file:. # via -r requirements/base.in aiohttp==3.8.1 - # via - # -r requirements/base.in - # slackclient + # via slackclient aiosignal==1.2.0 # via aiohttp alembic==1.6.5 @@ -42,9 +40,7 @@ celery==5.2.2 cffi==1.14.6 # via cryptography charset-normalizer==2.0.4 - # via - # -r requirements/base.in - # aiohttp + # via aiohttp click==8.0.4 # via # apache-superset @@ -214,9 +210,7 @@ pyparsing==3.0.6 # apache-superset # packaging pyrsistent==0.16.1 - # via - # -r requirements/base.in - # jsonschema + # via jsonschema python-dateutil==2.8.2 # via # alembic @@ -244,8 +238,6 @@ pyyaml==5.4.1 # apispec redis==3.5.3 # via apache-superset -sasl==0.3.1 - # via -r requirements/base.in selenium==3.141.0 # via apache-superset simplejson==3.17.3 @@ -262,7 +254,6 @@ six==1.16.0 # prison # pyrsistent # python-dateutil - # sasl # sqlalchemy-utils # wtforms-json slackclient==2.5.0 @@ -300,8 +291,6 @@ werkzeug==2.0.3 # via # flask # flask-jwt-extended -wrapt==1.12.1 - # via -r requirements/base.in wtforms==2.3.3 # via # flask-appbuilder @@ -311,8 +300,6 @@ wtforms-json==0.3.3 # via apache-superset yarl==1.6.3 # via aiohttp -zipp==3.4.1 - # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/development.in b/requirements/development.in index a9aa89a2c269f..477fff3376b22 100644 --- a/requirements/development.in +++ b/requirements/development.in @@ -15,14 +15,11 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# -r base.in +-e .[cors,druid,hive,mysql,postgres,thumbnails] flask-cors>=2.0.0 -mysqlclient>=2.1.0 -pillow>=9.0.1,<10 -pydruid>=0.6.1,<0.7 -pyhive[hive]>=0.6.1 -psycopg2-binary==2.9.1 -tableschema -thrift>=0.11.0,<1.0.0 +ipython progress>=1.5,<2 pyinstrument>=4.0.2,<5 +sqloxide diff --git a/requirements/development.txt b/requirements/development.txt index 1b93227828c86..1beebbc9a4cb7 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:b4a3e0dd12a4937fc5a21bdbf63644be9222c65f +# SHA1:2bd0d7307aeb633b7d97b510eb467285210e783a # # This file is autogenerated by pip-compile-multi # To update, run: @@ -7,7 +7,15 @@ # -r base.txt -e file:. - # via -r requirements/base.in + # via + # -r requirements/base.in + # -r requirements/development.in +appnope==0.1.3 + # via ipython +asttokens==2.0.5 + # via stack-data +backcall==0.2.0 + # via ipython boto3==1.18.19 # via tabulator botocore==1.21.19 @@ -20,14 +28,24 @@ certifi==2021.10.8 # via requests chardet==4.0.0 # via tabulator +decorator==5.1.1 + # via ipython et-xmlfile==1.1.0 # via openpyxl +executing==0.8.3 + # via stack-data flask-cors==3.0.10 - # via -r requirements/development.in + # via + # -r requirements/development.in + # apache-superset future==0.18.2 # via pyhive ijson==3.1.4 # via tabulator +ipython==8.3.0 + # via -r requirements/development.in +jedi==0.18.1 + # via ipython jmespath==0.10.0 # via # boto3 @@ -36,22 +54,36 @@ jsonlines==2.0.0 # via tabulator linear-tsv==1.1.0 # via tabulator +matplotlib-inline==0.1.3 + # via ipython mysqlclient==2.1.0 - # via -r requirements/development.in + # via apache-superset openpyxl==3.0.7 # via tabulator +parso==0.8.3 + # via jedi +pexpect==4.8.0 + # via ipython +pickleshare==0.7.5 + # via ipython pillow==9.1.0 - # via -r requirements/development.in + # via apache-superset progress==1.6 # via -r requirements/development.in psycopg2-binary==2.9.1 - # via -r requirements/development.in + # via apache-superset +ptyprocess==0.7.0 + # via pexpect +pure-eval==0.2.2 + # via stack-data pure-sasl==0.6.2 # via thrift-sasl pydruid==0.6.2 - # via -r requirements/development.in + # via apache-superset +pygments==2.12.0 + # via ipython pyhive[hive]==0.6.4 - # via -r requirements/development.in + # via apache-superset pyinstrument==4.0.2 # via -r requirements/development.in requests==2.26.0 @@ -63,17 +95,27 @@ rfc3986==1.5.0 # via tableschema s3transfer==0.5.0 # via boto3 -tableschema==1.20.2 +sasl==0.3.1 + # via pyhive +sqloxide==0.1.17 # via -r requirements/development.in +stack-data==0.2.0 + # via ipython +tableschema==1.20.2 + # via apache-superset tabulator==1.53.5 # via tableschema thrift==0.13.0 # via - # -r requirements/development.in + # apache-superset # pyhive # thrift-sasl thrift-sasl==0.4.3 # via pyhive +traitlets==5.2.1.post0 + # via + # ipython + # matplotlib-inline unicodecsv==0.14.1 # via # tableschema diff --git a/requirements/docker.in b/requirements/docker.in index b9a2f3b2400be..7310c408bb841 100644 --- a/requirements/docker.in +++ b/requirements/docker.in @@ -15,5 +15,5 @@ # limitations under the License. # -r base.in +-e .[postgres] gevent -psycopg2-binary diff --git a/requirements/docker.txt b/requirements/docker.txt index 545e919791bd2..f9ea766f4e69f 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -1,4 +1,4 @@ -# SHA1:e29e1e67c158a87a692dd8ccaf1e343ebb246dc2 +# SHA1:b6943e4be5e050c458e66b470f517acda02c38e6 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -7,16 +7,18 @@ # -r base.txt -e file:. - # via -r requirements/base.in + # via + # -r requirements/base.in + # -r requirements/docker.in gevent==21.8.0 # via -r requirements/docker.in greenlet==1.1.1 # via gevent psycopg2-binary==2.9.1 - # via -r requirements/docker.in -zope.event==4.5.0 + # via apache-superset +zope-event==4.5.0 # via gevent -zope.interface==5.4.0 +zope-interface==5.4.0 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/integration.in b/requirements/integration.in index eff495d881314..9601b3a0d23bf 100644 --- a/requirements/integration.in +++ b/requirements/integration.in @@ -14,8 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -pip-compile-multi!=1.5.9 +pip-compile-multi pre-commit tox -py>=1.10.0 -click diff --git a/requirements/integration.txt b/requirements/integration.txt index edc39fb151267..fb1d37cd53f91 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -1,17 +1,16 @@ -# SHA1:8e2dd1e795bcad7451376b3653eb03465e4f05d3 +# SHA1:39179f2c476f94362aa0705be059a488d7e38b6d # # This file is autogenerated by pip-compile-multi # To update, run: # # pip-compile-multi # -backports.entry-points-selectable==1.1.0 +backports-entry-points-selectable==1.1.0 # via virtualenv cfgv==3.3.0 # via pre-commit click==8.0.4 # via - # -r requirements/integration.in # pip-compile-multi # pip-tools distlib==0.3.2 @@ -39,9 +38,7 @@ pluggy==0.13.1 pre-commit==2.14.0 # via -r requirements/integration.in py==1.10.0 - # via - # -r requirements/integration.in - # tox + # via tox pyparsing==3.0.6 # via packaging pyyaml==5.4.1 diff --git a/requirements/local.txt b/requirements/local.txt index 9cb3f70997bc3..c4bd3cd599b36 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -7,7 +7,9 @@ # -r development.txt -e file:. - # via -r requirements/base.in + # 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.in b/requirements/testing.in index 082dbc934ac5c..9a40c90753da1 100644 --- a/requirements/testing.in +++ b/requirements/testing.in @@ -16,27 +16,15 @@ # -r development.in -r integration.in +-e file:.[bigquery,hive,presto,trino] docker flask-testing freezegun -google-cloud-bigquery -ipdb -# pinning ipython as pip-compile-multi was bringing higher version -# of the ipython that was not found in CI -ipython openapi-spec-validator -openpyxl -pandas_gbq parameterized -pybigquery pyfakefs -pyhive[presto]>=0.6.3 -pylint==2.9.6 +pylint pytest pytest-cov -statsd pytest-mock -sqloxide -# DB dependencies --e file:.[bigquery] --e file:.[trino] +statsd diff --git a/requirements/testing.txt b/requirements/testing.txt index dbdb9e5077e87..5c1c2f7fce345 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,4 +1,4 @@ -# SHA1:e273e8da6bfd5f6f8563fe067e243297cc7c588c +# SHA1:623feb0dd2b6bd376238ecf75069bc82136c2d70 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -10,21 +10,14 @@ -e file:. # via # -r requirements/base.in + # -r requirements/development.in # -r requirements/testing.in -appnope==0.1.2 - # via ipython astroid==2.6.6 # via pylint -backcall==0.2.0 - # via ipython cachetools==4.2.4 # via google-auth coverage==5.5 # via pytest-cov -decorator==5.0.9 - # via - # ipdb - # ipython docker==5.0.0 # via -r requirements/testing.in flask-testing==0.8.1 @@ -51,7 +44,7 @@ google-auth-oauthlib==0.4.6 # pydata-google-auth google-cloud-bigquery[bqstorage,pandas]==2.29.0 # via - # -r requirements/testing.in + # apache-superset # pandas-gbq # pybigquery google-cloud-bigquery-storage==2.9.1 @@ -75,24 +68,12 @@ grpcio-status==1.41.1 # via google-api-core iniconfig==1.1.1 # via pytest -ipdb==0.13.9 - # via -r requirements/testing.in -ipython==7.26.0 - # via - # -r requirements/testing.in - # ipdb -ipython-genutils==0.2.0 - # via traitlets isort==5.9.3 # via pylint -jedi==0.18.0 - # via ipython lazy-object-proxy==1.6.0 # via astroid libcst==0.3.21 # via google-cloud-bigquery-storage -matplotlib-inline==0.1.2 - # via ipython mccabe==0.6.1 # via pylint mypy-extensions==0.4.3 @@ -104,15 +85,9 @@ openapi-schema-validator==0.1.5 openapi-spec-validator==0.3.1 # via -r requirements/testing.in pandas-gbq==0.15.0 - # via -r requirements/testing.in + # via apache-superset parameterized==0.8.1 # via -r requirements/testing.in -parso==0.8.2 - # via jedi -pexpect==4.8.0 - # via ipython -pickleshare==0.7.5 - # via ipython proto-plus==1.19.7 # via # google-cloud-bigquery @@ -124,8 +99,6 @@ protobuf==3.19.1 # googleapis-common-protos # grpcio-status # proto-plus -ptyprocess==0.7.0 - # via pexpect pyasn1==0.4.8 # via # pyasn1-modules @@ -133,17 +106,11 @@ pyasn1==0.4.8 pyasn1-modules==0.2.8 # via google-auth pybigquery==0.10.2 - # via -r requirements/testing.in + # via apache-superset pydata-google-auth==1.2.0 # via pandas-gbq -pyfakefs==4.5.0 +pyfakefs==4.5.6 # via -r requirements/testing.in -pygments==2.9.0 - # via ipython -pyhive[hive,presto]==0.6.4 - # via - # -r requirements/development.in - # -r requirements/testing.in pylint==2.9.6 # via -r requirements/testing.in pytest==6.2.4 @@ -159,22 +126,16 @@ requests-oauthlib==1.3.0 # via google-auth-oauthlib rsa==4.7.2 # via google-auth -sqlalchemy-trino==0.4.1 - # via apache-superset -sqloxide==0.1.15 - # via -r requirements/testing.in statsd==3.3.0 # via -r requirements/testing.in -traitlets==5.0.5 - # via - # ipython - # matplotlib-inline -trino==0.306 - # via sqlalchemy-trino +trino==0.313.0 + # via apache-superset typing-inspect==0.7.1 # via libcst websocket-client==1.2.0 # via docker +wrapt==1.12.1 + # via astroid # The following packages are considered to be unsafe in a requirements file: # pip