diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 816309174f..dde9a65316 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -420,7 +420,7 @@ Commits to `master` trigger a rebuild and redeploy of the documentation site. Su Make sure your machine meets the [OS dependencies](https://superset.apache.org/docs/installation/installing-superset-from-scratch#os-dependencies) before following these steps. You also need to install MySQL or [MariaDB](https://mariadb.com/downloads). -Ensure that you are using Python version 3.8, 3.9 or 3.10, then proceed with: +Ensure that you are using Python version 3.8, 3.9, 3.10 or 3.11, then proceed with: ```bash # Create a virtual environment and activate it (recommended) diff --git a/Makefile b/Makefile index 3caac1b559..fbe0fc8bfc 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ # limitations under the License. # -# Python version installed; we need 3.8-3.10 -PYTHON=`command -v python3.10 || command -v python3.9 || command -v python3.8` +# Python version installed; we need 3.8-3.11 +PYTHON=`command -v python3.11 || command -v python3.10 || command -v python3.9 || command -v python3.8` .PHONY: install superset venv pre-commit @@ -70,7 +70,7 @@ update-js: venv: # Create a virtual environment and activate it (recommended) - if ! [ -x "${PYTHON}" ]; then echo "You need Python 3.8, 3.9 or 3.10 installed"; exit 1; fi + if ! [ -x "${PYTHON}" ]; then echo "You need Python 3.8, 3.9, 3.10 or 3.11 installed"; exit 1; fi test -d venv || ${PYTHON} -m venv venv # setup a python3 virtualenv . venv/bin/activate diff --git a/requirements/base.txt b/requirements/base.txt index 30dc9c0a91..d1e1eb6d38 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -29,7 +29,7 @@ cachelib==0.4.1 # via apache-superset celery==5.2.2 # via apache-superset -cffi==1.14.6 +cffi==1.15.1 # via cryptography click==8.0.4 # via @@ -156,7 +156,7 @@ marshmallow-sqlalchemy==0.23.1 # via flask-appbuilder msgpack==1.0.2 # via apache-superset -numpy==1.22.1 +numpy==1.23.5 # via # apache-superset # pandas @@ -165,7 +165,7 @@ packaging==21.3 # via # bleach # deprecation -pandas==1.4.4 +pandas==1.5.2 # via apache-superset parsedatetime==2.6 # via apache-superset @@ -177,7 +177,7 @@ prison==0.2.1 # via flask-appbuilder prompt-toolkit==3.0.28 # via click-repl -pyarrow==6.0.1 +pyarrow==10.0.1 # via apache-superset pycparser==2.20 # via cffi diff --git a/requirements/development.txt b/requirements/development.txt index 1bce530eab..f9115c3000 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -70,7 +70,7 @@ pillow==9.1.1 # via apache-superset progress==1.6 # via -r requirements/development.in -psycopg2-binary==2.9.1 +psycopg2-binary==2.9.5 # via apache-superset ptyprocess==0.7.0 # via pexpect diff --git a/requirements/docker.txt b/requirements/docker.txt index 307064dbde..0338f43fd8 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -14,7 +14,7 @@ gevent==21.8.0 # via -r requirements/docker.in greenlet==1.1.3.post0 # via gevent -psycopg2-binary==2.9.1 +psycopg2-binary==2.9.5 # via apache-superset zope-event==4.5.0 # via gevent diff --git a/requirements/testing.txt b/requirements/testing.txt index 219b8c3ed0..bd8a54e990 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -18,6 +18,10 @@ cachetools==5.2.0 # via google-auth coverage==5.5 # via pytest-cov +db-dtypes @ git+https://git@github.com/googleapis/python-db-dtypes-pandas.git@388e082a47d9515a14e20ffd87705c71712087ab + # via + # apache-superset + # pandas-gbq docker==5.0.0 # via -r requirements/testing.in flask-testing==0.8.1 @@ -29,6 +33,7 @@ google-api-core[grpc]==2.11.0 # google-cloud-bigquery # google-cloud-bigquery-storage # google-cloud-core + # pandas-gbq # sqlalchemy-bigquery google-auth==2.14.1 # via @@ -36,8 +41,8 @@ google-auth==2.14.1 # google-auth-oauthlib # google-cloud-core # pandas-gbq - # sqlalchemy-bigquery # pydata-google-auth + # sqlalchemy-bigquery google-auth-oauthlib==0.7.1 # via # pandas-gbq @@ -48,7 +53,10 @@ google-cloud-bigquery[bqstorage,pandas]==3.4.0 # pandas-gbq # sqlalchemy-bigquery google-cloud-bigquery-storage==2.16.2 - # via google-cloud-bigquery + # via + # google-cloud-bigquery + # pandas-gbq + # sqlalchemy-bigquery google-cloud-core==2.3.2 # via google-cloud-bigquery google-crc32c==1.5.0 @@ -72,12 +80,8 @@ isort==5.9.3 # via pylint lazy-object-proxy==1.6.0 # via astroid -libcst==0.4.9 - # via google-cloud-bigquery-storage mccabe==0.6.1 # via pylint -mypy-extensions==0.4.3 - # via typing-inspect oauthlib==3.2.2 # via requests-oauthlib openapi-schema-validator==0.1.5 @@ -96,6 +100,7 @@ protobuf==4.21.10 # via # google-api-core # google-cloud-bigquery + # google-cloud-bigquery-storage # googleapis-common-protos # grpcio-status # proto-plus @@ -105,8 +110,6 @@ pyasn1==0.4.8 # rsa pyasn1-modules==0.2.8 # via google-auth -sqlalchemy-bigquery==1.5.0 - # via apache-superset pydata-google-auth==1.4.0 # via pandas-gbq pyfakefs==4.5.6 @@ -128,12 +131,12 @@ requests-oauthlib==1.3.1 # via google-auth-oauthlib rsa==4.9 # via google-auth +sqlalchemy-bigquery==1.5.0 + # via apache-superset statsd==3.3.0 # via -r requirements/testing.in trino==0.319.0 # via apache-superset -typing-inspect==0.7.1 - # via libcst websocket-client==1.2.0 # via docker wrapt==1.12.1 diff --git a/setup.py b/setup.py index 969cb215ae..a89d376614 100644 --- a/setup.py +++ b/setup.py @@ -99,8 +99,8 @@ setup( "isodate", "markdown>=3.0", "msgpack>=1.0.0, <1.1", - "numpy==1.22.1", - "pandas>=1.4.4, <1.5", + "numpy==1.23.5", + "pandas>=1.5.2, <1.6", "parsedatetime", "pgsanity", "polyline", @@ -108,7 +108,7 @@ setup( "python-dateutil", "python-dotenv", "python-geohash", - "pyarrow>=6.0.1, <7", + "pyarrow>=10.0.1, <11", "pyyaml>=5.4", "PyJWT>=2.4.0, <3.0", "redis", @@ -126,6 +126,7 @@ setup( "athena": ["pyathena[pandas]>=2, <3"], "aurora-data-api": ["preset-sqlalchemy-aurora-data-api>=0.2.8,<0.3"], "bigquery": [ + "db-dtypes @ git+https://git@github.com/googleapis/python-db-dtypes-pandas.git@388e082a47d9515a14e20ffd87705c71712087ab#egg=db-dtypes", "pandas-gbq>=0.18.1", "sqlalchemy-bigquery>=1.5.0", "google-cloud-bigquery>=3.4.0", @@ -159,7 +160,7 @@ setup( "mysql": ["mysqlclient>=2.1.0, <3"], "oracle": ["cx-Oracle>8.0.0, <8.1"], "pinot": ["pinotdb>=0.3.3, <0.4"], - "postgres": ["psycopg2-binary==2.9.1"], + "postgres": ["psycopg2-binary==2.9.5"], "presto": ["pyhive[presto]>=0.6.5"], "trino": ["trino>=0.319.0"], "prophet": ["prophet>=1.0.1, <1.1", "pystan<3.0"], @@ -184,5 +185,6 @@ setup( "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ], )