Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Python dependencies in #11499 #12079

Merged
merged 1 commit into from
Dec 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# under the License.
-e file:.
pyrsistent>=0.16.1,<0.17
importlib-metadata>=1.7.0, <2
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed to resolve conflicting versions.

importlib-metadata==2.1.1
7 changes: 4 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:1b5e15727cda5c8d6f711f02629430e1560618eb
# SHA1:9eeea842b4dffc85a3611351dcb33aca43fbb9e9
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand Down Expand Up @@ -48,7 +48,7 @@ geopy==2.0.0 # via apache-superset
gunicorn==20.0.4 # via apache-superset
humanize==3.1.0 # via apache-superset
idna==2.10 # via email-validator, yarl
importlib-metadata==1.7.0 # via -r requirements/base.in
importlib-metadata==2.1.1 # via -r requirements/base.in, jsonschema, kombu, markdown
isodate==0.6.0 # via apache-superset
itsdangerous==1.1.0 # via flask, flask-wtf
jinja2==2.11.2 # via flask, flask-babel
Expand Down Expand Up @@ -84,6 +84,7 @@ python-geohash==0.8.5 # via apache-superset
python3-openid==3.2.0 # via flask-openid
pytz==2020.4 # via babel, celery, flask-babel, pandas
pyyaml==5.3.1 # via apache-superset, apispec
redis==3.5.3 # via apache-superset
retry==0.9.2 # via apache-superset
selenium==3.141.0 # via apache-superset
simplejson==3.17.2 # via apache-superset
Expand All @@ -92,7 +93,7 @@ slackclient==2.5.0 # via apache-superset
sqlalchemy-utils==0.36.8 # via apache-superset, flask-appbuilder
sqlalchemy==1.3.20 # via alembic, apache-superset, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
sqlparse==0.3.0 # via apache-superset
typing-extensions==3.7.4.3 # via aiohttp
typing-extensions==3.7.4.3 # via aiohttp, yarl
urllib3==1.25.11 # via selenium
vine==1.3.0 # via amqp, celery
webencodings==0.5.1 # via bleach
Expand Down
8 changes: 4 additions & 4 deletions requirements/development.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
# under the License.
-r base.in
flask-cors>=2.0.0
mysqlclient==1.4.2.post1
pillow>=7.0.0,<8.0.0
pydruid>=0.6.1,<0.7
pyhive[hive]>=0.6.1
tableschema
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ABC.

thrift>=0.11.0, <1.0.0
mysqlclient==1.4.2.post1
psycopg2-binary==2.8.5
Pillow>=7.0.0, <8.0.0
tableschema
thrift>=0.11.0,<1.0.0
2 changes: 1 addition & 1 deletion requirements/development.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:3c2ff5fb241e76e4d027742510de3b719d39e0f2
# SHA1:ae0364cae066a5cb8fb543c4f568bfcdacb6c1b7
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand Down
1 change: 0 additions & 1 deletion requirements/docker.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@
-r base.in
gevent
psycopg2-binary
redis
3 changes: 1 addition & 2 deletions requirements/docker.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:54074dcfe0a3bf83a9f4f8e2fb9d24746a86b50c
# SHA1:465a3e60283551f04dc2897dc9f08d28b0d85228
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -10,7 +10,6 @@
gevent==20.9.0 # via -r requirements/docker.in
greenlet==0.4.17 # via gevent
psycopg2-binary==2.8.6 # via -r requirements/docker.in
redis==3.5.3 # via -r requirements/docker.in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is replaced by the requirement in base, yes?

zope.event==4.5.0 # via gevent
zope.interface==5.1.2 # via gevent

Expand Down
2 changes: 2 additions & 0 deletions requirements/integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ click==7.1.2 # via pip-compile-multi, pip-tools
distlib==0.3.1 # via virtualenv
filelock==3.0.12 # via tox, virtualenv
identify==1.5.9 # via pre-commit
importlib-metadata==2.1.1 # via pluggy, pre-commit, tox, virtualenv
nodeenv==1.5.0 # via pre-commit
packaging==20.4 # via tox
pip-compile-multi==2.1.0 # via -r requirements/integration.in
Expand All @@ -25,6 +26,7 @@ toml==0.10.2 # via pre-commit, tox
toposort==1.5 # via pip-compile-multi
tox==3.20.1 # via -r requirements/integration.in
virtualenv==20.1.0 # via pre-commit, tox
zipp==3.4.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
1 change: 0 additions & 1 deletion requirements/testing.in
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ pyhive[presto]>=0.6.3
pylint
pytest
pytest-cov
redis
statsd
4 changes: 2 additions & 2 deletions requirements/testing.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:b16b83f856b2dbc53535f71414f5c3e8dfa838e0
# SHA1:9d449781bc4ef88cd346b9dd5db55240472d5f0c
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand Down Expand Up @@ -35,9 +35,9 @@ pyhive[hive,presto]==0.6.3 # via -r requirements/development.in, -r requirement
pylint==2.6.0 # via -r requirements/testing.in
pytest-cov==2.10.1 # via -r requirements/testing.in
pytest==6.1.2 # via -r requirements/testing.in, pytest-cov
redis==3.5.3 # via -r requirements/testing.in
Copy link
Member

@robdiciuccio robdiciuccio Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redis is currently required for running tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robdiciuccio this will be inherited from base.in.

statsd==3.3.0 # via -r requirements/testing.in
traitlets==5.0.5 # via ipython
typed-ast==1.4.1 # via astroid
wcwidth==0.2.5 # via prompt-toolkit
websocket-client==0.57.0 # via docker
wrapt==1.12.1 # via astroid
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def get_git_sha():
"python-geohash",
"pyarrow>=1.0.1, <1.1",
"pyyaml>=5.1",
"redis",
"retry>=0.9.2",
"selenium>=3.141.0",
"simplejson>=3.15.0",
Expand Down