You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by dp...@apache.org on 2020/09/22 13:29:14 UTC
[incubator-superset] 05/09: refactor: ASF only dependencies on
base.txt (#10875)
This is an automated email from the ASF dual-hosted git repository.
dpgaspar pushed a commit to branch 0.38
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 18bd3cee295fa2c2a3dea277900b202f3dcd8e33
Author: Daniel Vaz Gaspar <da...@gmail.com>
AuthorDate: Wed Sep 16 14:57:41 2020 +0100
refactor: ASF only dependencies on base.txt (#10875)
---
requirements/base.in | 2 +-
requirements/base.txt | 51 +++++++-------------------------
requirements/{base.in => development.in} | 10 ++++++-
requirements/development.txt | 41 +++++++++++++++++++++++++
requirements/docker.txt | 1 +
requirements/local.in | 2 +-
requirements/local.txt | 4 +--
requirements/testing.in | 2 +-
requirements/testing.txt | 6 ++--
9 files changed, 70 insertions(+), 49 deletions(-)
diff --git a/requirements/base.in b/requirements/base.in
index e659852..3a801db 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -15,4 +15,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
--e file:.[cors,druid,hive,mysql,postgres,thumbnails]
+-e file:.
diff --git a/requirements/base.txt b/requirements/base.txt
index 13aa2b2..1b87a67 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:3b8e2a2d526726ac7ff836060bf89101ff52c1c8
+# SHA1:6d5583095e299af7f7e1c4fdf953577bc873a8a6
#
# This file is autogenerated by pip-compile-multi
# To update, run:
@@ -16,16 +16,12 @@ babel==2.8.0 # via flask-babel
backoff==1.10.0 # via apache-superset
billiard==3.6.3.0 # via celery
bleach==3.1.5 # via apache-superset
-boto3==1.14.56 # via tabulator
-botocore==1.17.56 # via boto3, s3transfer
brotli==1.0.9 # via flask-compress
-cached-property==1.5.1 # via tableschema
cachelib==0.1.1 # via apache-superset
celery==4.4.7 # via apache-superset
-certifi==2020.6.20 # via requests
cffi==1.14.2 # via cryptography
-chardet==3.0.4 # via aiohttp, requests, tabulator
-click==7.1.2 # via apache-superset, flask, flask-appbuilder, tableschema, tabulator
+chardet==3.0.4 # via aiohttp
+click==7.1.2 # via apache-superset, flask, flask-appbuilder
colorama==0.4.3 # via apache-superset, flask-appbuilder
contextlib2==0.6.0.post1 # via apache-superset
croniter==0.3.34 # via apache-superset
@@ -33,14 +29,11 @@ cryptography==3.1 # via apache-superset
decorator==4.4.2 # via retry
defusedxml==0.6.0 # via python3-openid
dnspython==2.0.0 # via email-validator
-docutils==0.15.2 # via botocore
email-validator==1.1.1 # via flask-appbuilder
-et-xmlfile==1.0.1 # via openpyxl
flask-appbuilder==3.0.1 # via apache-superset
flask-babel==1.0.0 # via flask-appbuilder
flask-caching==1.9.0 # via apache-superset
flask-compress==1.5.0 # via apache-superset
-flask-cors==3.0.9 # via apache-superset
flask-jwt-extended==3.24.1 # via flask-appbuilder
flask-login==0.4.1 # via flask-appbuilder
flask-migrate==2.5.3 # via apache-superset
@@ -48,24 +41,18 @@ flask-openid==1.2.5 # via flask-appbuilder
flask-sqlalchemy==2.4.4 # via flask-appbuilder, flask-migrate
flask-talisman==0.7.0 # via apache-superset
flask-wtf==0.14.3 # via apache-superset, flask-appbuilder
-flask==1.1.2 # via apache-superset, flask-appbuilder, flask-babel, flask-caching, flask-compress, flask-cors, flask-jwt-extended, flask-login, flask-migrate, flask-openid, flask-sqlalchemy, flask-wtf
-future==0.18.2 # via pyhive
+flask==1.1.2 # via apache-superset, flask-appbuilder, flask-babel, flask-caching, flask-compress, flask-jwt-extended, flask-login, flask-migrate, flask-openid, flask-sqlalchemy, flask-wtf
geographiclib==1.50 # via geopy
geopy==2.0.0 # via apache-superset
gunicorn==20.0.4 # via apache-superset
humanize==2.6.0 # via apache-superset
-idna==2.10 # via email-validator, requests, yarl
-ijson==3.1.1 # via tabulator
+idna==2.10 # via email-validator, yarl
importlib-metadata==1.7.0 # via jsonschema, kombu, markdown
-isodate==0.6.0 # via apache-superset, tableschema
+isodate==0.6.0 # via apache-superset
itsdangerous==1.1.0 # via flask, flask-wtf
-jdcal==1.4.1 # via openpyxl
jinja2==2.11.2 # via flask, flask-babel
-jmespath==0.10.0 # via boto3, botocore
-jsonlines==1.2.0 # via tabulator
-jsonschema==3.2.0 # via flask-appbuilder, tableschema
+jsonschema==3.2.0 # via flask-appbuilder
kombu==4.6.11 # via celery
-linear-tsv==1.1.0 # via tabulator
mako==1.1.3 # via alembic
markdown==3.2.2 # via apache-superset
markupsafe==1.1.1 # via jinja2, mako, wtforms
@@ -74,58 +61,42 @@ marshmallow-sqlalchemy==0.23.1 # via flask-appbuilder
marshmallow==3.7.1 # via flask-appbuilder, marshmallow-enum, marshmallow-sqlalchemy
msgpack==1.0.0 # via apache-superset
multidict==4.7.6 # via aiohttp, yarl
-mysqlclient==1.4.2.post1 # via apache-superset
natsort==7.0.1 # via croniter
numpy==1.19.1 # via pandas, pyarrow
-openpyxl==3.0.5 # via tabulator
packaging==20.4 # via bleach
pandas==1.0.5 # via apache-superset
parsedatetime==2.6 # via apache-superset
pathlib2==2.3.5 # via apache-superset
-pillow==7.2.0 # via apache-superset
polyline==1.4.0 # via apache-superset
prison==0.1.3 # via flask-appbuilder
-psycopg2-binary==2.8.5 # via apache-superset
py==1.9.0 # via retry
pyarrow==1.0.1 # via apache-superset
pycparser==2.20 # via cffi
-pydruid==0.6.1 # via apache-superset
-pyhive[hive]==0.6.3 # via apache-superset
pyjwt==1.7.1 # via flask-appbuilder, flask-jwt-extended
pyparsing==2.4.7 # via packaging
pyrsistent==0.16.0 # via jsonschema
-python-dateutil==2.8.1 # via alembic, apache-superset, botocore, croniter, flask-appbuilder, pandas, pyhive, tableschema
+python-dateutil==2.8.1 # via alembic, apache-superset, croniter, flask-appbuilder, pandas
python-dotenv==0.14.0 # via apache-superset
python-editor==1.0.4 # via alembic
python-geohash==0.8.5 # via apache-superset
python3-openid==3.2.0 # via flask-openid
pytz==2020.1 # via babel, celery, flask-babel, pandas
pyyaml==5.3.1 # via apache-superset, apispec
-requests==2.24.0 # via pydruid, tableschema, tabulator
retry==0.9.2 # via apache-superset
-rfc3986==1.4.0 # via tableschema
-s3transfer==0.3.3 # via boto3
-sasl==0.2.1 # via pyhive, thrift-sasl
selenium==3.141.0 # via apache-superset
simplejson==3.17.2 # via apache-superset
-six==1.15.0 # via bleach, cryptography, flask-cors, flask-jwt-extended, flask-talisman, isodate, jsonlines, jsonschema, linear-tsv, packaging, pathlib2, polyline, prison, pyrsistent, python-dateutil, sasl, sqlalchemy-utils, tableschema, tabulator, thrift, thrift-sasl, wtforms-json
+six==1.15.0 # via bleach, cryptography, flask-jwt-extended, flask-talisman, isodate, jsonschema, packaging, pathlib2, polyline, prison, pyrsistent, python-dateutil, sqlalchemy-utils, wtforms-json
slackclient==2.5.0 # via apache-superset
sqlalchemy-utils==0.36.8 # via apache-superset, flask-appbuilder
-sqlalchemy==1.3.19 # via alembic, apache-superset, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils, tabulator
+sqlalchemy==1.3.19 # via alembic, apache-superset, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
sqlparse==0.3.0 # via apache-superset
-tableschema==1.19.3 # via apache-superset
-tabulator==1.52.3 # via tableschema
-thrift-sasl==0.4.2 # via pyhive
-thrift==0.13.0 # via apache-superset, pyhive, thrift-sasl
typing-extensions==3.7.4.3 # via yarl
-unicodecsv==0.14.1 # via tableschema, tabulator
-urllib3==1.25.10 # via botocore, requests, selenium
+urllib3==1.25.10 # via selenium
vine==1.3.0 # via amqp, celery
webencodings==0.5.1 # via bleach
werkzeug==1.0.1 # via flask, flask-jwt-extended
wtforms-json==0.3.3 # via apache-superset
wtforms==2.3.3 # via flask-wtf, wtforms-json
-xlrd==1.2.0 # via tabulator
yarl==1.5.1 # via aiohttp
zipp==3.1.0 # via importlib-metadata
diff --git a/requirements/base.in b/requirements/development.in
similarity index 81%
copy from requirements/base.in
copy to requirements/development.in
index e659852..ce736aa 100644
--- a/requirements/base.in
+++ b/requirements/development.in
@@ -15,4 +15,12 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
--e file:.[cors,druid,hive,mysql,postgres,thumbnails]
+-r base.in
+flask-cors>=2.0.0
+pydruid>=0.6.1,<0.7
+pyhive[hive]>=0.6.1
+tableschema
+thrift>=0.11.0, <1.0.0
+mysqlclient==1.4.2.post1
+psycopg2-binary==2.8.5
+Pillow>=7.0.0, <8.0.0
diff --git a/requirements/development.txt b/requirements/development.txt
new file mode 100644
index 0000000..c91b91b
--- /dev/null
+++ b/requirements/development.txt
@@ -0,0 +1,41 @@
+# SHA1:3c2ff5fb241e76e4d027742510de3b719d39e0f2
+#
+# This file is autogenerated by pip-compile-multi
+# To update, run:
+#
+# pip-compile-multi
+#
+-r base.txt
+-e file:. # via -r requirements/base.in
+boto3==1.14.62 # via tabulator
+botocore==1.17.62 # via boto3, s3transfer
+cached-property==1.5.1 # via tableschema
+certifi==2020.6.20 # via requests
+docutils==0.15.2 # via botocore
+et-xmlfile==1.0.1 # via openpyxl
+flask-cors==3.0.9 # via -r requirements/development.in
+future==0.18.2 # via pyhive
+ijson==3.1.1 # via tabulator
+jdcal==1.4.1 # via openpyxl
+jmespath==0.10.0 # via boto3, botocore
+jsonlines==1.2.0 # via tabulator
+linear-tsv==1.1.0 # via tabulator
+mysqlclient==1.4.2.post1 # via -r requirements/development.in
+openpyxl==3.0.5 # via tabulator
+pillow==7.2.0 # via -r requirements/development.in
+psycopg2-binary==2.8.5 # via -r requirements/development.in
+pydruid==0.6.1 # via -r requirements/development.in
+pyhive[hive]==0.6.3 # via -r requirements/development.in
+requests==2.24.0 # via pydruid, tableschema, tabulator
+rfc3986==1.4.0 # via tableschema
+s3transfer==0.3.3 # via boto3
+sasl==0.2.1 # via pyhive, thrift-sasl
+tableschema==1.19.4 # via -r requirements/development.in
+tabulator==1.52.3 # via tableschema
+thrift-sasl==0.4.2 # via pyhive
+thrift==0.13.0 # via -r requirements/development.in, pyhive, thrift-sasl
+unicodecsv==0.14.1 # via tableschema, tabulator
+xlrd==1.2.0 # via tabulator
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/docker.txt b/requirements/docker.txt
index 65c2f93..dd2ff51 100644
--- a/requirements/docker.txt
+++ b/requirements/docker.txt
@@ -9,6 +9,7 @@
-e file:. # via -r requirements/base.in
gevent==20.6.2 # via -r requirements/docker.in
greenlet==0.4.16 # via gevent
+psycopg2-binary==2.8.6 # via -r requirements/docker.in
redis==3.5.3 # via -r requirements/docker.in
zope.event==4.4 # via gevent
zope.interface==5.1.0 # via gevent
diff --git a/requirements/local.in b/requirements/local.in
index 8a9ad70..bc67aed 100644
--- a/requirements/local.in
+++ b/requirements/local.in
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
--r base.in
+-r development.in
diff --git a/requirements/local.txt b/requirements/local.txt
index b88dd1b..8ab0756 100644
--- a/requirements/local.txt
+++ b/requirements/local.txt
@@ -1,11 +1,11 @@
-# SHA1:37fdd6cd1e7782cad40e1c59a0b7b6e1d9f73332
+# SHA1:4cc294ed9d355a099d37603d7e209d3b85e4f421
#
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile-multi
#
--r base.txt
+-r development.txt
-e file:. # via -r requirements/base.in
# The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/testing.in b/requirements/testing.in
index 45efac2..ec34891 100644
--- a/requirements/testing.in
+++ b/requirements/testing.in
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
--r base.in
+-r development.in
-r integration.in
flask-testing
docker
diff --git a/requirements/testing.txt b/requirements/testing.txt
index 6678af7..b3b3bc1 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -1,11 +1,11 @@
-# SHA1:f9f1fc59b48794bbb4512a857fd5b3c24c33aa1e
+# SHA1:0e68e30f4e1bc76d0ec05267a1e38451c3901384
#
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile-multi
#
--r base.txt
+-r development.txt
-r integration.txt
-e file:. # via -r requirements/base.in
appnope==0.1.0 # via ipython
@@ -31,7 +31,7 @@ pickleshare==0.7.5 # via ipython
prompt-toolkit==3.0.7 # via ipython
ptyprocess==0.6.0 # via pexpect
pygments==2.6.1 # via ipython
-pyhive[hive,presto]==0.6.3 # via -r requirements/testing.in, apache-superset
+pyhive[hive,presto]==0.6.3 # via -r requirements/development.in, -r requirements/testing.in
pylint==2.6.0 # via -r requirements/testing.in
pytest-cov==2.10.1 # via -r requirements/testing.in
pytest==6.0.1 # via -r requirements/testing.in, pytest-cov