ARROW-15100: [CI] Stop using Python 3.6 by default

Closes apache#11949 from pitrou/no-default-py36 Authored-by: Antoine Pitrou <[email protected]> Signed-off-by: Antoine Pitrou <[email protected]>
NetEase · Dec 14, 2021 · c3efcf6 · c3efcf6
1 parent 902b541
commit c3efcf6
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 29 deletions.
diff --git a/.env b/.env
@@ -66,7 +66,7 @@ MAVEN=3.5.4
 NODE=14
 NUMPY=latest
 PANDAS=latest
-PYTHON=3.6
+PYTHON=3.8
 R=4.1
 SPARK=master
 TURBODBC=latest

diff --git a/.github/workflows/archery.yml b/.github/workflows/archery.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
       - name: Install pygit2 binary wheel
         run: pip install pygit2 --only-binary pygit2
       - name: Install Archery, Crossbow- and Test Dependencies

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -81,7 +81,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/ci/docker/conda-python-dask.dockerfile b/ci/docker/conda-python-dask.dockerfile
@@ -17,9 +17,9 @@
 
 ARG repo
 ARG arch=amd64
-ARG python=3.6
+ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
 ARG dask=latest
 COPY ci/scripts/install_dask.sh /arrow/ci/scripts/
-RUN /arrow/ci/scripts/install_dask.sh ${dask}
+RUN /arrow/ci/scripts/install_dask.sh ${dask}
diff --git a/ci/docker/conda-python-hdfs.dockerfile b/ci/docker/conda-python-hdfs.dockerfile
@@ -17,7 +17,7 @@
 
 ARG repo
 ARG arch=amd64
-ARG python=3.6
+ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
 ARG jdk=8

diff --git a/ci/docker/conda-python-jpype.dockerfile b/ci/docker/conda-python-jpype.dockerfile
@@ -17,7 +17,7 @@
 
 ARG repo
 ARG arch=amd64
-ARG python=3.6
+ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
 ARG jdk=11

diff --git a/ci/docker/conda-python-kartothek.dockerfile b/ci/docker/conda-python-kartothek.dockerfile
@@ -17,7 +17,7 @@
 
 ARG repo
 ARG arch=amd64
-ARG python=3.6
+ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
 # install kartothek dependencies from conda-forge

diff --git a/ci/docker/conda-python-pandas.dockerfile b/ci/docker/conda-python-pandas.dockerfile
@@ -17,7 +17,7 @@
 
 ARG repo
 ARG arch=amd64
-ARG python=3.6
+ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
 ARG pandas=latest

diff --git a/ci/docker/conda-python-spark.dockerfile b/ci/docker/conda-python-spark.dockerfile
@@ -17,7 +17,7 @@
 
 ARG repo
 ARG arch=amd64
-ARG python=3.6
+ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
 ARG jdk=8

diff --git a/ci/docker/conda-python-turbodbc.dockerfile b/ci/docker/conda-python-turbodbc.dockerfile
@@ -17,7 +17,7 @@
 
 ARG repo
 ARG arch=amd64
-ARG python=3.6
+ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
 RUN export DEBIAN_FRONTEND=noninteractive && \

diff --git a/ci/docker/conda-python.dockerfile b/ci/docker/conda-python.dockerfile
@@ -20,7 +20,7 @@ ARG arch
 FROM ${repo}:${arch}-conda-cpp
 
 # install python specific packages
-ARG python=3.6
+ARG python=3.8
 COPY ci/conda_env_python.txt \
      ci/conda_env_sphinx.txt \
      /arrow/ci/

diff --git a/ci/docker/python-wheel-manylinux-201x.dockerfile b/ci/docker/python-wheel-manylinux-201x.dockerfile
@@ -97,7 +97,7 @@ RUN vcpkg install --clean-after-build \
         zlib \
         zstd
 
-ARG python=3.6
+ARG python=3.8
 ENV PYTHON_VERSION=${python}
 RUN PYTHON_ROOT=$(find /opt/python -name cp${PYTHON_VERSION/./}-*) && \
     echo "export PATH=$PYTHON_ROOT/bin:\$PATH" >> /etc/profile.d/python.sh

diff --git a/ci/docker/python-wheel-windows-vs2017.dockerfile b/ci/docker/python-wheel-windows-vs2017.dockerfile
@@ -86,7 +86,7 @@ RUN wmic product where "name like 'python%%'" call uninstall /nointeractive && \
     rm -rf Python*
 
 # Define the full version number otherwise choco falls back to patch number 0 (3.7 => 3.7.0)
-ARG python=3.6
+ARG python=3.8
 RUN (if "%python%"=="3.6" setx PYTHON_VERSION 3.6.8) & \
     (if "%python%"=="3.7" setx PYTHON_VERSION 3.7.4) & \
     (if "%python%"=="3.8" setx PYTHON_VERSION 3.8.6) & \

diff --git a/dev/archery/archery/docker/tests/test_docker.py b/dev/archery/archery/docker/tests/test_docker.py
@@ -145,7 +145,7 @@
       context: .
       dockerfile: ci/docker/conda-cpp.dockerfile
       args:
-        python: 3.6
+        python: 3.8
   conda-python-pandas:
     image: org/conda-python-pandas
     build:
@@ -176,7 +176,7 @@
 
 arrow_compose_env = {
     'UBUNTU': '20.04',  # overridden below
-    'PYTHON': '3.6',
+    'PYTHON': '3.8',
     'PANDAS': 'latest',
     'DASK': 'latest',  # overridden below
 }
@@ -313,7 +313,7 @@ def test_compose_pull_params(arrow_compose_path):
         "pull --ignore-pull-failures conda-python",
     ]
     compose = DockerCompose(arrow_compose_path, params=dict(UBUNTU='18.04'))
-    expected_env = PartialEnv(PYTHON='3.6', PANDAS='latest')
+    expected_env = PartialEnv(PYTHON='3.8', PANDAS='latest')
     with assert_compose_calls(compose, expected_calls, env=expected_env):
         compose.clear_pull_memory()
         compose.pull('conda-python-pandas', pull_leaf=False)
@@ -392,7 +392,7 @@ def test_compose_build_params(arrow_compose_path):
         "build --no-cache conda-python-pandas",
     ]
     compose = DockerCompose(arrow_compose_path, params=dict(UBUNTU='18.04'))
-    expected_env = PartialEnv(PYTHON='3.6', PANDAS='latest')
+    expected_env = PartialEnv(PYTHON='3.8', PANDAS='latest')
     with assert_compose_calls(compose, expected_calls, env=expected_env):
         compose.build('conda-python-pandas', use_cache=False)
 
@@ -408,21 +408,21 @@ def test_compose_run(arrow_compose_path):
     expected_calls = [
         format_run("conda-python")
     ]
-    expected_env = PartialEnv(PYTHON='3.6')
+    expected_env = PartialEnv(PYTHON='3.8')
     with assert_compose_calls(compose, expected_calls, env=expected_env):
         compose.run('conda-python')
 
-    compose = DockerCompose(arrow_compose_path, params=dict(PYTHON='3.8'))
-    expected_env = PartialEnv(PYTHON='3.8')
+    compose = DockerCompose(arrow_compose_path, params=dict(PYTHON='3.9'))
+    expected_env = PartialEnv(PYTHON='3.9')
     with assert_compose_calls(compose, expected_calls, env=expected_env):
         compose.run('conda-python')
 
-    compose = DockerCompose(arrow_compose_path, params=dict(PYTHON='3.8'))
+    compose = DockerCompose(arrow_compose_path, params=dict(PYTHON='3.9'))
     for command in ["bash", "echo 1"]:
         expected_calls = [
             format_run(["conda-python", command]),
         ]
-        expected_env = PartialEnv(PYTHON='3.8')
+        expected_env = PartialEnv(PYTHON='3.9')
         with assert_compose_calls(compose, expected_calls, env=expected_env):
             compose.run('conda-python', command)
 
@@ -433,7 +433,7 @@ def test_compose_run(arrow_compose_path):
         )
     ]
     compose = DockerCompose(arrow_compose_path)
-    expected_env = PartialEnv(PYTHON='3.6')
+    expected_env = PartialEnv(PYTHON='3.8')
     with assert_compose_calls(compose, expected_calls, env=expected_env):
         env = collections.OrderedDict([
             ("CONTAINER_ENV_VAR_A", "a"),
@@ -468,8 +468,8 @@ def test_compose_run_with_resource_limits(arrow_compose_path):
 
 
 def test_compose_push(arrow_compose_path):
-    compose = DockerCompose(arrow_compose_path, params=dict(PYTHON='3.8'))
-    expected_env = PartialEnv(PYTHON="3.8")
+    compose = DockerCompose(arrow_compose_path, params=dict(PYTHON='3.9'))
+    expected_env = PartialEnv(PYTHON="3.9")
     expected_calls = [
         mock.call(["docker", "login", "-u", "user", "-p", "pass"], check=True),
     ]

diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat
@@ -37,7 +37,7 @@ wget --no-check-certificate -O %_TARBALL% %_DIST_URL%/apache-arrow-%1-rc%2/%_TAR
 
 tar xf %_TARBALL% -C %_VERIFICATION_DIR_UNIX%
 
-set PYTHON=3.6
+set PYTHON=3.8
 
 @rem Using call with conda.bat seems necessary to avoid terminating the batch
 @rem script execution

diff --git a/dev/tasks/docker-tests/azure.linux.yml b/dev/tasks/docker-tests/azure.linux.yml
@@ -38,7 +38,7 @@ jobs:
 
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '3.8'
 
   - script: |
       git clone --no-checkout {{ arrow.remote }} arrow

diff --git a/dev/tasks/docker-tests/circle.linux.yml b/dev/tasks/docker-tests/circle.linux.yml
@@ -39,7 +39,7 @@ jobs:
           name: Execute Docker Build
           command: |
             pyenv versions
-            pyenv global 3.6.10
+            pyenv global 3.8.12
             pip install -e arrow/dev/archery[docker]
             archery docker run -e SETUPTOOLS_SCM_PRETEND_VERSION="{{ arrow.no_rc_version }}" {{ run }}
           no_output_timeout: "1h"