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

chore: Bump to Python3.10 #24112

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
63b7edc
chore: Bump to Python3.10
EugeneTorap May 18, 2023
a6803a1
Remove 'sasl' lib
EugeneTorap May 18, 2023
11db1b4
Add 'sasl' lib in hive CI
EugeneTorap May 18, 2023
a961133
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Jul 15, 2023
affc394
Update python version
EugeneTorap Jul 15, 2023
0b371d0
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Jul 25, 2023
a5abd13
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Jul 31, 2023
c88087b
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Oct 8, 2023
8a432f8
Use python 3.10.13 in Dockerfile
EugeneTorap Oct 8, 2023
768bea6
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Feb 2, 2024
918cde7
Update python version
EugeneTorap Feb 2, 2024
bb2f849
Update python version
EugeneTorap Feb 2, 2024
fb91437
Revert changes
EugeneTorap Feb 2, 2024
f08c5b1
Remove exclude for arm64 docker building
EugeneTorap Feb 2, 2024
c885dde
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Mar 21, 2024
b6de4d4
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Mar 21, 2024
8c3c8cf
Update python version
EugeneTorap Mar 21, 2024
308690f
Fix python version
EugeneTorap Mar 21, 2024
b8371e9
Update python-ldap to 3.4.4
EugeneTorap Mar 21, 2024
0b5075f
Fix python version
EugeneTorap Mar 21, 2024
4538a7b
Update action.yml
mistercrunch Mar 22, 2024
7827265
Bump .asf.yaml
EugeneTorap Mar 22, 2024
1ffcc47
Revert no-op.yml
EugeneTorap Mar 22, 2024
2f8be00
Add a bunch of no-op checks for Py3.9
EugeneTorap Mar 22, 2024
1706d1d
Revert 'python_requires' to "~=3.9"
EugeneTorap Mar 22, 2024
275f129
Fix PY 3.11 docker image
EugeneTorap Mar 22, 2024
73f8a65
Add an entry on ./UPDATING.md
EugeneTorap Mar 22, 2024
5c4f697
Merge branch 'master' into chore/bump-to-python3.10
EugeneTorap Mar 29, 2024
45e2411
Revert "Revert 'python_requires' to "~=3.9""
EugeneTorap Mar 29, 2024
0651b6b
Revert "Update action.yml"
EugeneTorap Mar 30, 2024
13d5df4
Add python 3.9 support back in setup.py
mistercrunch Apr 2, 2024
e7a6e9b
Merge branch 'master' into chore/bump-to-python3.10
mistercrunch Apr 2, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/docker_build_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ docker build --target lean \
.

#
# Build the "lean310" image
# Build the "lean311" image
#
docker build --target lean \
-t "${REPO_NAME}:${SHA}-py310" \
-t "${REPO_NAME}:${REFSPEC}-py310" \
-t "${REPO_NAME}:${LATEST_TAG}-py310" \
--build-arg PY_VER="3.10-slim"\
-t "${REPO_NAME}:${SHA}-py311" \
-t "${REPO_NAME}:${REFSPEC}-py311" \
-t "${REPO_NAME}:${LATEST_TAG}-py311" \
--build-arg PY_VER="3.11-slim"\
--label "sha=${SHA}" \
--label "built_at=$(date)" \
--label "target=lean310" \
--label "target=lean311" \
--label "build_actor=${GITHUB_ACTOR}" \
.

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/superset-applitool-cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"
- name: OS dependencies
uses: ./.github/actions/cached-dependencies
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/superset-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
env:
PYTHONPATH: ${{ github.workspace }}
SUPERSET_CONFIG: tests.integration_tests.superset_test_config
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/superset-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
if: steps.check.outcome == 'failure'
uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"
- name: OS dependencies
if: steps.check.outcome == 'failure'
uses: ./.github/actions/cached-dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/superset-helm-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"

- name: Set up chart-testing
uses: ./.github/actions/chart-testing-action
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/superset-python-integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
env:
PYTHONPATH: ${{ github.workspace }}
SUPERSET_CONFIG: tests.integration_tests.superset_test_config
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.10", "3.11"]
env:
PYTHONPATH: ${{ github.workspace }}
SUPERSET_CONFIG: tests.integration_tests.superset_test_config
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
env:
PYTHONPATH: ${{ github.workspace }}
SUPERSET_CONFIG: tests.integration_tests.superset_test_config
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/superset-python-misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v3
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v3
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v3
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/superset-python-presto-hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
env:
PYTHONPATH: ${{ github.workspace }}
SUPERSET_CONFIG: tests.integration_tests.superset_test_config
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
env:
PYTHONPATH: ${{ github.workspace }}
SUPERSET_CONFIG: tests.integration_tests.superset_test_config
Expand Down Expand Up @@ -150,6 +150,7 @@ jobs:
apt-get-install
pip-upgrade
pip install wheel
pip install sasl
pip install -r requirements/testing.txt
setup-postgres
- name: Run celery
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/superset-python-unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.10", "3.11"]
env:
PYTHONPATH: ${{ github.workspace }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/superset-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
######################################################################
# Node stage to deal with static asset construction
######################################################################
ARG PY_VER=3.9.16-slim
ARG PY_VER=3.10.11-slim

# if BUILDPLATFORM is null, set it to 'amd64' (or leave as is otherwise).
ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# limitations under the License.
#

# Python version installed; we need 3.9-3.11
PYTHON=`command -v python3.11 || command -v python3.10 || command -v python3.9`
# Python version installed; we need 3.10-3.11
PYTHON=`command -v python3.11 || command -v python3.10`

.PHONY: install superset venv pre-commit

Expand Down Expand Up @@ -70,7 +70,7 @@ update-js:

venv:
# Create a virtual environment and activate it (recommended)
if ! [ -x "${PYTHON}" ]; then echo "You need Python 3.9, 3.10 or 3.11 installed"; exit 1; fi
if ! [ -x "${PYTHON}" ]; then echo "You need Python 3.10 or 3.11 installed"; exit 1; fi
test -d venv || ${PYTHON} -m venv venv # setup a python3 virtualenv
. venv/bin/activate

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/contributing/local-backend.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version: 1
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.9 or 3.10, then proceed with:
Ensure that you are using Python version 3.10 or 3.11, then proceed with:

```bash
# Create a virtual environment and activate it (recommended)
Expand Down
4 changes: 1 addition & 3 deletions requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pure-sasl==0.6.2
# via thrift-sasl
pydruid==0.6.5
# via apache-superset
pyhive[hive]==0.6.5
pyhive==0.7.0.dev0
# via apache-superset
pyinstrument==4.4.0
# via -r requirements/development.in
Expand All @@ -103,8 +103,6 @@ rfc3986==2.0.0
# via tableschema
s3transfer==0.6.1
# via boto3
sasl==0.3.1
# via pyhive
sqloxide==0.1.33
# via -r requirements/development.in
stack-data==0.6.2
Expand Down
2 changes: 1 addition & 1 deletion requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pydata-google-auth==1.7.0
# via pandas-gbq
pyfakefs==5.2.2
# via -r requirements/testing.in
pyhive[presto]==0.6.5
pyhive==0.7.0.dev0
# via apache-superset
pytest==7.3.1
# via
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,12 @@ def get_git_sha() -> str:
"vertica": ["sqlalchemy-vertica-python>=0.5.9, < 0.6"],
"netezza": ["nzalchemy>=11.0.2"],
},
python_requires="~=3.9",
EugeneTorap marked this conversation as resolved.
Show resolved Hide resolved
python_requires="~=3.10",
mistercrunch marked this conversation as resolved.
Show resolved Hide resolved
author="Apache Software Foundation",
author_email="[email protected]",
url="https://superset.apache.org/",
download_url="https://www.apache.org/dist/superset/" + version_string,
classifiers=[
"Programming Language :: Python :: 3.9",
mistercrunch marked this conversation as resolved.
Show resolved Hide resolved
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
],
Expand Down