feat: bump python and xcode versions (#409)

* feat: do not jinja render when applying review app spec * feat: let yaml_spec decide whether to skip template rendering * feat: break up long lines * feat: bump circleci xcode to intel latest * feat: readme to instruct upgrading pip * feat: bump python to 3.10 for circleci builds * feat: bump kubectl version * fix: revert to 3.10.2 for integration test * feat: say python 3.10 on readme * feat: bump python to 3.10 for hokusai docker image * feat: remove review app related changes * feat: bump kubectl to 1.22
artsy · May 23, 2024 · 095659d · 095659d
1 parent c480867
commit 095659d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   test_linux:
     docker:
-      - image: python:3.9.10
+      - image: python:3.10
     steps:
       - checkout
       - run: make hokusai
@@ -13,7 +13,7 @@ jobs:
 
   test_macos:
     macos:
-      xcode: "13.4.1"
+      xcode: "15.3.0"
     steps:
       - checkout
       - run:
@@ -24,8 +24,8 @@ jobs:
       - run:
           name: install python
           command: |
-            pyenv install 3.9.10
-            pyenv local 3.9.10
+            pyenv install 3.10
+            pyenv local 3.10
             pip install --upgrade pip
       - run:
           name: install awscli
@@ -42,7 +42,7 @@ jobs:
     machine:
       image: ubuntu-2004:202201-02
     environment:
-      KUBECTL_VERSION: v1.20.15
+      KUBECTL_VERSION: v1.22.17
       K8S_VERSION: v1.22.17
       KUBECONFIG: /home/circleci/.kube/config
       MINIKUBE_VERSION: v1.31.2
@@ -141,7 +141,7 @@ jobs:
 
   test_docker_build:
     docker:
-      - image: python:3.9.10-alpine
+      - image: python:3.10-alpine
     steps:
       - checkout
       - setup_remote_docker
@@ -151,7 +151,7 @@ jobs:
 
   release_beta_s3_linux:
     docker:
-      - image: python:3.9.10
+      - image: python:3.10
     steps:
       - checkout
       - run: apt-get -qq update
@@ -163,7 +163,7 @@ jobs:
 
   release_beta_s3_macos:
     macos:
-      xcode: "13.4.1"
+      xcode: "15.3.0"
     steps:
       - checkout
       - run:
@@ -174,8 +174,8 @@ jobs:
       - run:
           name: install python
           command: |
-            pyenv install 3.9.10
-            pyenv local 3.9.10
+            pyenv install 3.10
+            pyenv local 3.10
             pip install --upgrade pip
       - run:
           name: install awscli
@@ -190,7 +190,7 @@ jobs:
 
   release_beta_dockerhub:
     docker:
-      - image: python:3.9.10-alpine
+      - image: python:3.10-alpine
     steps:
       - checkout
       - setup_remote_docker
@@ -252,7 +252,7 @@ jobs:
 
   release_s3_linux:
     docker:
-      - image: python:3.9.10
+      - image: python:3.10
     steps:
       - checkout
       - run: apt-get -qq update
@@ -266,7 +266,7 @@ jobs:
 
   release_s3_macos:
     macos:
-      xcode: "13.4.1"
+      xcode: "15.3.0"
     steps:
       - checkout
       - run:
@@ -277,8 +277,8 @@ jobs:
       - run:
           name: install python
           command: |
-            pyenv install 3.9.10
-            pyenv local 3.9.10
+            pyenv install 3.10
+            pyenv local 3.10
             pip install --upgrade pip
       - run:
           name: install awscli
@@ -295,7 +295,7 @@ jobs:
 
   release_dockerhub:
     docker:
-      - image: python:3.9.10-alpine
+      - image: python:3.10-alpine
     steps:
       - checkout
       - setup_remote_docker
@@ -319,7 +319,7 @@ jobs:
 
   release_pip:
     docker:
-      - image: python:3.9.10
+      - image: python:3.10
     steps:
       - checkout
       - run: make hokusai

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.10-alpine
+FROM python:3.10-alpine
 
 ARG COMPOSE_VERSION=2.20.3
 ARG AUTHENTICATOR_VERSION=0.4.0

diff --git a/README.md b/README.md
@@ -135,30 +135,28 @@ echo 'export PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig"' >> ~/.b
 
 ### Python
 
-Hokusai is currently tested on Python 3.9.10 so we recommend using that Python version.
+Hokusai is currently tested on Python 3.10 so we recommend using that Python version.
 
 If you use Pyenv to install Python, you should see an output similar to this:
 
 ```
-pyenv install 3.9.10
-
-    python-build: use openssl from homebrew
-    python-build: use readline from homebrew
-
-    Downloading Python-3.9.10.tar.xz...
-    -> https://www.python.org/ftp/python/3.9.10/Python-3.9.10.tar.xz
-    Installing Python-3.9.10...
-    python-build: use tcl-tk from homebrew
-    python-build: use readline from homebrew
-    python-build: use zlib from xcode sdk
-
-    Installed Python-3.9.10 to $HOME/.pyenv/versions/3.9.10
+$ pyenv install 3.10
+python-build: use openssl@1.1 from homebrew
+python-build: use readline from homebrew
+Downloading Python-3.10.13.tar.xz...
+-> https://www.python.org/ftp/python/3.10.13/Python-3.10.13.tar.xz
+Installing Python-3.10.13...
+python-build: use tcl-tk from homebrew
+python-build: use readline from homebrew
+python-build: use ncurses from homebrew
+python-build: use zlib from xcode sdk
+Installed Python-3.10.13 to /Users/jxu/.pyenv/versions/3.10.13
 ```
 
 With the desired Python version installed, activate it globally:
 
 ```
-pyenv global 3.9.10
+pyenv global 3.10
 ```
 
 Note: If you want to create a PyInstaller distribution, Python must be installed with development libraries. Use the environment variable `PYTHON_CONFIGURE_OPTS="--enable-framework"` on Darwin and `PYTHON_CONFIGURE_OPTS="--enable-shared"` on Linux when running `pyenv install`.
@@ -176,6 +174,7 @@ Use [Poetry](https://python-poetry.org/) to install Hokusai's dependencies as we
 Install Poetry:
 
 ```
+pip install --upgrade pip
 pip install poetry
 ```