Merge branch 'master' into py3.12

tsuru · Apr 24, 2024 · 2dcdff1 · 2dcdff1
2 parents 0b62d4c + 500fc07
commit 2dcdff1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/python/deploy b/python/deploy
@@ -20,10 +20,9 @@ LATEST_38="3.8.16"
 LATEST_37="3.7.16"
 LATEST_36="3.6.15"
 LATEST_35="3.5.10"
-LATEST_27="2.7.18"
 PYPY_36="pypy3.6-7.3.2"
 PYPY_27="pypy2.7-7.3.2"
-LATEST_PYTHON_VERSIONS=(${LATEST_312} ${LATEST_311} ${LATEST_310} ${LATEST_39} ${LATEST_38} ${LATEST_37} ${LATEST_36} ${LATEST_35} ${LATEST_27} ${PYPY_36} ${PYPY_27})
+LATEST_PYTHON_VERSIONS=(${LATEST_312} ${LATEST_311} ${LATEST_310} ${LATEST_39} ${LATEST_38} ${LATEST_37} ${LATEST_36} ${LATEST_35} ${PYPY_36} ${PYPY_27})
 PYTHON_VERSION_DEFAULT="${PYTHON_VERSION_DEFAULT:-${LATEST_312}}"
 VERSION_ORIGIN="default"
 PYTHON_BASE_DIR="/home/application/python"

diff --git a/tests/go/fixtures/vendored/go.mod b/tests/go/fixtures/vendored/go.mod
@@ -1,5 +1,5 @@
 module github.com/tsuru/blah
 
-go 1.13
+go 1.19
 
 require golang.org/x/net v0.0.0-20191105084925-a882066a44e0