diff --git a/requirements/base.in b/requirements/base.in index 294583801824..00071c4ac8f1 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -18,3 +18,4 @@ -e file:. pyrsistent>=0.16.1,<0.17 zipp==3.4.1 +sasl==0.2.1 diff --git a/requirements/base.txt b/requirements/base.txt index 0125e9760899..6c903a098df4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:0862095245a068ae2fc00217da78331e1e7ae505 +# SHA1:57a754a4cf09b58d8e02c45bfb1058d2ce4286a6 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -7,9 +7,9 @@ # -e file:. # via -r requirements/base.in -aiohttp==3.7.2 +aiohttp==3.7.4.post0 # via slackclient -alembic==1.4.3 +alembic==1.6.5 # via flask-migrate amqp==2.6.1 # via kombu @@ -17,17 +17,17 @@ apispec[yaml]==3.3.2 # via flask-appbuilder async-timeout==3.0.1 # via aiohttp -attrs==20.2.0 +attrs==21.2.0 # via # aiohttp # jsonschema -babel==2.8.0 +babel==2.9.1 # via flask-babel -backoff==1.10.0 +backoff==1.11.1 # via apache-superset -billiard==3.6.3.0 +billiard==3.6.4.0 # via celery -bleach==3.3.0 +bleach==3.3.1 # via apache-superset brotli==1.0.9 # via flask-compress @@ -35,9 +35,9 @@ cachelib==0.1.1 # via apache-superset celery==4.4.7 # via apache-superset -cffi==1.14.3 +cffi==1.14.6 # via cryptography -chardet==3.0.4 +chardet==4.0.0 # via aiohttp click==7.1.2 # via @@ -48,23 +48,23 @@ colorama==0.4.4 # via # apache-superset # flask-appbuilder -convertdate==2.3.0 +convertdate==2.3.2 # via holidays cron-descriptor==1.2.24 # via apache-superset -croniter==0.3.36 +croniter==1.0.15 # via apache-superset -cryptography==3.3.2 +cryptography==3.4.7 # via apache-superset -defusedxml==0.6.0 +defusedxml==0.7.1 # via python3-openid deprecation==2.1.0 # via apache-superset -dnspython==2.0.0 +dnspython==2.1.0 # via email-validator -email-validator==1.1.1 +email-validator==1.1.3 # via flask-appbuilder -flask==1.1.2 +flask==1.1.4 # via # apache-superset # flask-appbuilder @@ -77,35 +77,35 @@ flask==1.1.2 # flask-openid # flask-sqlalchemy # flask-wtf -flask-appbuilder==3.3.0 +flask-appbuilder==3.3.2 # via apache-superset flask-babel==1.0.0 # via flask-appbuilder flask-caching==1.10.1 # via apache-superset -flask-compress==1.8.0 +flask-compress==1.10.1 # via apache-superset -flask-jwt-extended==3.24.1 +flask-jwt-extended==3.25.1 # via flask-appbuilder flask-login==0.4.1 # via flask-appbuilder -flask-migrate==2.5.3 +flask-migrate==3.1.0 # via apache-superset flask-openid==1.2.5 # via flask-appbuilder -flask-sqlalchemy==2.4.4 +flask-sqlalchemy==2.5.1 # via # flask-appbuilder # flask-migrate -flask-talisman==0.7.0 +flask-talisman==0.8.1 # via apache-superset flask-wtf==0.14.3 # via # apache-superset # flask-appbuilder -geographiclib==1.50 +geographiclib==1.52 # via geopy -geopy==2.0.0 +geopy==2.2.0 # via apache-superset graphlib-backport==1.0.3 # via apache-superset @@ -113,9 +113,9 @@ gunicorn==20.0.4 # via apache-superset holidays==0.10.3 # via apache-superset -humanize==3.1.0 +humanize==3.11.0 # via apache-superset -idna==2.10 +idna==3.2 # via # email-validator # yarl @@ -136,16 +136,16 @@ kombu==4.6.11 # via celery korean-lunar-calendar==0.2.1 # via holidays -mako==1.1.3 +mako==1.1.4 # via alembic -markdown==3.3.3 +markdown==3.3.4 # via apache-superset -markupsafe==1.1.1 +markupsafe==2.0.1 # via # jinja2 # mako # wtforms -marshmallow==3.9.0 +marshmallow==3.13.0 # via # flask-appbuilder # marshmallow-enum @@ -154,23 +154,21 @@ marshmallow-enum==1.5.1 # via flask-appbuilder marshmallow-sqlalchemy==0.23.1 # via flask-appbuilder -msgpack==1.0.0 +msgpack==1.0.2 # via apache-superset -multidict==5.0.0 +multidict==5.1.0 # via # aiohttp # yarl -natsort==7.0.1 - # via croniter -numpy==1.19.4 +numpy==1.21.1 # via # pandas # pyarrow -packaging==20.4 +packaging==21.0 # via # bleach # deprecation -pandas==1.2.2 +pandas==1.2.5 # via apache-superset parsedatetime==2.6 # via apache-superset @@ -189,7 +187,7 @@ pyjwt==1.7.1 # apache-superset # flask-appbuilder # flask-jwt-extended -pymeeus==0.3.7 +pymeeus==0.5.11 # via convertdate pyparsing==2.4.7 # via @@ -199,7 +197,7 @@ pyrsistent==0.16.1 # via # -r requirements/base.in # jsonschema -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # alembic # apache-superset @@ -207,7 +205,7 @@ python-dateutil==2.8.1 # flask-appbuilder # holidays # pandas -python-dotenv==0.15.0 +python-dotenv==0.19.0 # via apache-superset python-editor==1.0.4 # via alembic @@ -215,7 +213,7 @@ python-geohash==0.8.5 # via apache-superset python3-openid==3.2.0 # via flask-openid -pytz==2020.4 +pytz==2021.1 # via # babel # celery @@ -228,29 +226,30 @@ pyyaml==5.4.1 # apispec redis==3.5.3 # via apache-superset +sasl==0.2.1 + # via -r requirements/base.in selenium==3.141.0 # via apache-superset -simplejson==3.17.2 +simplejson==3.17.3 # via apache-superset -six==1.15.0 +six==1.16.0 # via # bleach - # cryptography # flask-jwt-extended # flask-talisman # holidays # isodate # jsonschema - # packaging # polyline # prison # pyrsistent # python-dateutil + # sasl # sqlalchemy-utils # wtforms-json slackclient==2.5.0 # via apache-superset -sqlalchemy==1.3.20 +sqlalchemy==1.3.24 # via # alembic # apache-superset @@ -266,11 +265,11 @@ sqlparse==0.3.0 # via apache-superset tabulate==0.8.9 # via apache-superset -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.0 # via # aiohttp # apache-superset -urllib3==1.25.11 +urllib3==1.26.6 # via selenium vine==1.3.0 # via @@ -288,7 +287,7 @@ wtforms==2.3.3 # wtforms-json wtforms-json==0.3.3 # via apache-superset -yarl==1.6.2 +yarl==1.6.3 # via aiohttp zipp==3.4.1 # via -r requirements/base.in diff --git a/requirements/development.in b/requirements/development.in index 8f2379941e65..db2162341dac 100644 --- a/requirements/development.in +++ b/requirements/development.in @@ -24,6 +24,5 @@ pyhive[hive]>=0.6.1 psycopg2-binary==2.8.5 tableschema thrift>=0.11.0,<1.0.0 -pygithub>=1.54.1,<2.0.0 progress>=1.5,<2 pyinstrument>=4.0.2,<5 diff --git a/requirements/development.txt b/requirements/development.txt index be77b5847218..82133b43a320 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:1144991012e228fb2ef85afbf78a635e7d5a33f1 +# SHA1:e4f3ea65026a8aec3735d6d9977f89fef4a1a4f9 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -8,86 +8,77 @@ -r base.txt -e file:. # via -r requirements/base.in -boto3==1.16.10 +boto3==1.18.19 # via tabulator -botocore==1.19.10 +botocore==1.21.19 # via # boto3 # s3transfer cached-property==1.5.2 # via tableschema -certifi==2020.6.20 +certifi==2021.5.30 # via requests -deprecated==1.2.11 - # via pygithub -et-xmlfile==1.0.1 +charset-normalizer==2.0.4 + # via requests +et-xmlfile==1.1.0 # via openpyxl -flask-cors==3.0.9 +flask-cors==3.0.10 # via -r requirements/development.in future==0.18.2 # via pyhive -ijson==3.1.2.post0 +ijson==3.1.4 # via tabulator -jdcal==1.4.1 - # via openpyxl jmespath==0.10.0 # via # boto3 # botocore -jsonlines==1.2.0 +jsonlines==2.0.0 # via tabulator linear-tsv==1.1.0 # via tabulator mysqlclient==1.4.2.post1 # via -r requirements/development.in -openpyxl==3.0.5 +openpyxl==3.0.7 # via tabulator pillow==7.2.0 # via -r requirements/development.in -progress==1.5 +progress==1.6 # via -r requirements/development.in psycopg2-binary==2.8.5 # via -r requirements/development.in -pydruid==0.6.1 - # via -r requirements/development.in -pygithub==1.54.1 +pure-sasl==0.6.2 + # via thrift-sasl +pydruid==0.6.2 # via -r requirements/development.in -pyhive[hive]==0.6.3 +pyhive[hive]==0.6.4 # via -r requirements/development.in pyinstrument==4.0.2 # via -r requirements/development.in -requests==2.24.0 +requests==2.26.0 # via # pydruid - # pygithub # tableschema # tabulator -rfc3986==1.4.0 +rfc3986==1.5.0 # via tableschema -s3transfer==0.3.3 +s3transfer==0.5.0 # via boto3 -sasl==0.2.1 - # via - # pyhive - # thrift-sasl -tableschema==1.20.0 +tableschema==1.20.2 # via -r requirements/development.in -tabulator==1.52.5 +tabulator==1.53.5 # via tableschema thrift==0.13.0 # via # -r requirements/development.in # pyhive # thrift-sasl -thrift-sasl==0.4.2 +thrift-sasl==0.4.3 # via pyhive unicodecsv==0.14.1 # via # tableschema # tabulator -wrapt==1.12.1 - # via deprecated -xlrd==1.2.0 +xlrd==2.0.1 # via tabulator # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/docker.txt b/requirements/docker.txt index e1d3f07003ab..545e919791bd 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -8,15 +8,15 @@ -r base.txt -e file:. # via -r requirements/base.in -gevent==20.9.0 +gevent==21.8.0 # via -r requirements/docker.in -greenlet==0.4.17 +greenlet==1.1.1 # via gevent -psycopg2-binary==2.8.6 +psycopg2-binary==2.9.1 # via -r requirements/docker.in zope.event==4.5.0 # via gevent -zope.interface==5.1.2 +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 1aaee9255f97..1bc94c7fb71d 100644 --- a/requirements/integration.in +++ b/requirements/integration.in @@ -17,3 +17,6 @@ pip-compile-multi!=1.5.9 pre-commit tox +py>=1.10.0 +click==7.1.2 +packaging==21.0 diff --git a/requirements/integration.txt b/requirements/integration.txt index b9ec99d13326..b7da99e3da36 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -1,62 +1,74 @@ -# SHA1:f95c1152ed0bcc554f3668440d63eec2a7d1567c +# SHA1:17ab2346746deadfc557e1df96014e77c8337f4b # # This file is autogenerated by pip-compile-multi # To update, run: # # pip-compile-multi # -appdirs==1.4.4 +backports.entry-points-selectable==1.1.0 # via virtualenv -cfgv==3.2.0 +cfgv==3.3.0 # via pre-commit click==7.1.2 # via + # -r requirements/integration.in # pip-compile-multi # pip-tools -distlib==0.3.1 +distlib==0.3.2 # via virtualenv filelock==3.0.12 # via # tox # virtualenv -identify==1.5.9 +identify==2.2.13 # via pre-commit -nodeenv==1.5.0 +nodeenv==1.6.0 # via pre-commit -packaging==20.4 - # via tox +packaging==21.0 + # via + # -r requirements/integration.in + # tox +pep517==0.11.0 + # via pip-tools pip-compile-multi==2.4.1 # via -r requirements/integration.in -pip-tools==5.3.1 +pip-tools==6.2.0 # via pip-compile-multi +platformdirs==2.2.0 + # via virtualenv pluggy==0.13.1 # via tox -pre-commit==2.8.2 +pre-commit==2.14.0 # via -r requirements/integration.in -py==1.9.0 - # via tox +py==1.10.0 + # via + # -r requirements/integration.in + # tox pyparsing==2.4.7 # via packaging pyyaml==5.4.1 # via pre-commit -six==1.15.0 +six==1.16.0 # via - # packaging - # pip-tools # tox # virtualenv toml==0.10.2 # via # pre-commit # tox -toposort==1.5 +tomli==1.2.1 + # via pep517 +toposort==1.6 # via pip-compile-multi -tox==3.20.1 +tox==3.24.1 # via -r requirements/integration.in -virtualenv==20.1.0 +virtualenv==20.7.2 # via # pre-commit # tox +wheel==0.37.0 + # via pip-tools # The following packages are considered to be unsafe in a requirements file: # pip +# setuptools diff --git a/requirements/testing.in b/requirements/testing.in index 9c67f790a73e..3355d71fa433 100644 --- a/requirements/testing.in +++ b/requirements/testing.in @@ -22,14 +22,15 @@ freezegun ipdb # pinning ipython as pip-compile-multi was bringing higher version # of the ipython that was not found in CI -ipython==7.16.1 +ipython openapi-spec-validator openpyxl parameterized pyfakefs pyhive[presto]>=0.6.3 -pylint +pylint==2.6.0 pytest pytest-cov statsd pytest-mock +packaging==21.0 diff --git a/requirements/testing.txt b/requirements/testing.txt index 5b736e38140c..1b56b39593fd 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,4 +1,4 @@ -# SHA1:d39180c0eb498d1a7dd73b8428e6ab304b728484 +# SHA1:5bfcfb5d0ab31dd532ce58caa2aab91d6807b123 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -11,79 +11,89 @@ # via -r requirements/base.in appnope==0.1.2 # via ipython -astroid==2.4.2 +astroid==2.5 # via pylint backcall==0.2.0 # via ipython -coverage==5.3 +coverage==5.5 # via pytest-cov decorator==5.0.9 - # via ipython -docker==4.3.1 + # via + # ipdb + # ipython +docker==5.0.0 # via -r requirements/testing.in -flask-testing==0.8.0 +flask-testing==0.8.1 # via -r requirements/testing.in -freezegun==1.0.0 +freezegun==1.1.0 # via -r requirements/testing.in iniconfig==1.1.1 # via pytest -ipdb==0.13.4 +ipdb==0.13.9 # via -r requirements/testing.in -ipython==7.16.1 +ipython==7.26.0 # via # -r requirements/testing.in # ipdb ipython-genutils==0.2.0 # via traitlets -isort==5.6.4 +isort==5.9.3 # via pylint -jedi==0.17.2 +jedi==0.18.0 # via ipython -lazy-object-proxy==1.4.3 +lazy-object-proxy==1.6.0 # via astroid +matplotlib-inline==0.1.2 + # via ipython mccabe==0.6.1 # via pylint -openapi-spec-validator==0.2.9 +openapi-schema-validator==0.1.5 + # via openapi-spec-validator +openapi-spec-validator==0.3.1 # via -r requirements/testing.in -parameterized==0.7.4 +parameterized==0.8.1 # via -r requirements/testing.in -parso==0.7.1 +parso==0.8.2 # via jedi pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -prompt-toolkit==3.0.8 +prompt-toolkit==3.0.19 # via ipython -ptyprocess==0.6.0 +ptyprocess==0.7.0 # via pexpect -pyfakefs==4.4.0 +pyfakefs==4.5.0 # via -r requirements/testing.in -pygments==2.7.2 +pygments==2.9.0 # via ipython -pyhive[hive,presto]==0.6.3 +pyhive[hive,presto]==0.6.4 # via # -r requirements/development.in # -r requirements/testing.in pylint==2.6.0 # via -r requirements/testing.in -pytest==6.1.2 +pytest==6.2.4 # via # -r requirements/testing.in # pytest-cov # pytest-mock -pytest-cov==2.10.1 +pytest-cov==2.12.1 # via -r requirements/testing.in pytest-mock==3.6.1 # via -r requirements/testing.in statsd==3.3.0 # via -r requirements/testing.in traitlets==5.0.5 - # via ipython + # via + # ipython + # matplotlib-inline wcwidth==0.2.5 # via prompt-toolkit -websocket-client==0.57.0 +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 diff --git a/superset/common/tags.py b/superset/common/tags.py index 74c882cf92f6..d1b411444117 100644 --- a/superset/common/tags.py +++ b/superset/common/tags.py @@ -79,7 +79,7 @@ def add_types(engine: Engine, metadata: Metadata) -> None: # add a tag for each object type insert = tag.insert() - for type_ in ObjectTypes.__members__: + for type_ in ObjectTypes.__members__: # pylint: disable=not-an-iterable try: engine.execute(insert, name=f"type:{type_}", type=TagTypes.type) except IntegrityError: diff --git a/superset/models/core.py b/superset/models/core.py index ef3cd55426c4..87711561f784 100755 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -167,7 +167,7 @@ class Database( extra_import_fields = ["password"] export_children = ["tables"] - def __repr__(self) -> str: + def __repr__(self) -> str: # pylint: disable=invalid-repr-returned return self.name @property diff --git a/superset/reports/commands/execute.py b/superset/reports/commands/execute.py index 347646a7cb96..e401d33ec28e 100644 --- a/superset/reports/commands/execute.py +++ b/superset/reports/commands/execute.py @@ -541,7 +541,7 @@ def run(self) -> None: if (self._report_schedule.last_state is None and state_cls.initial) or ( self._report_schedule.last_state in state_cls.current_states ): - state_cls( + state_cls( # pylint: disable=not-callable self._session, self._report_schedule, self._scheduled_dttm,